For those interested in knowing what the Catholic Church has always taught on BoD and BoB, you can find nearly a page and a half discussion on the matter in Ott's
Fundamentals of Catholic Dogma. Ott's summary formulation of the doctrine is:
In case of emergency, Baptism by water can be replaced by Baptism of desire or Baptism by blood [sententia fide proxima]
In Ott's introduction, he discusses the hierarchical ordering of Catholic doctrine from highest to lowest certainty: 1)
de fide definita, 2)
fides ecclesiastica, 3)
sententia fide proxima, 4)
sententia ad fide pertinens, 5)
sententia communis, 6)
sententia probabilis. So BoD and BoB are considered to be the third highest level of certainty behind only divine revelation and the precepts of the Church.
Ott summarizes the teaching thus:
Baptism of desire works ex opere operantis. It bestows sanctifying grace, which remits original sin, all actual sins, and the eternal punishments for sin. Venial sins and temporal punishments for sins are remitted according to the intensity of the subjective disposition. The baptismal character is not imprinted, nor is it the gateway to the other sacraments.
Scripture verses quoted by Ott relevant to the doctrine are Luke 7:47, John 14:21, Luke 23:43.
Defenders of the above doctrine include St. Ambrose, St. Augustine, St. Bernard of Clairvaux, and Hugh of St. Victor.
On the other side of the argument was Peter Abelard (note there is no "St." in front of Abelard's name).
Finally, Ott says the following:
The Council of Trent teaches that justification from original sin is not possible "without the bath of regeneration or the desire for it (sine lavacro regenerationis aut eius voto). DH 1524. Cf 1604, 741.
I'm honestly confused how people who claim to be traditional Catholics can presume to question settled doctrine that has the Council of Trent and at least three Doctors of the Church behind it.