What should be crystal clear:Council of TrentSession 7: Decree on the SacramentsCanons on the Sacrament of BaptismCanon 2: If anyone says that true and natural water is not necessary for baptism and therefore reduces to some sort of metaphor the words of our Lord Jesus Christ: "Unless one is reborn of water and the Spirit," let him be anathema.
Canon 5: If anyone says that baptism is optional, that is, not necessary for salvation, let him be anathema.
So, according to Trent, "salvation" absolutely dogmatically requires water baptism, according to the Canons of Trent. Trent, then, supports the most rigid interpretation of EENS. Baptism of Desire alone will not effect "salvation."
What seems to be unclear:Council of TrentSession 6: Decree on JustificationChapter 4: A brief description of the sinner's justification: its manner under the dispensation of grace.In these words a description is outlined of the justification of the sinner as being a transition from the state in which man is born a son of the first Adam to the state of grace and adoption as sons of God through the second Adam, Jesus Christ our Savior. After the promulgation of the gospel, this transition cannot take place without the laver of regeneration or the desire for it, as it is written "Unless one is reborn of water and the Spirit, he cannot enter the kingdom of God."
Read carefully the title of Chapter 4. That whole section (quoted above) only refers to the concept of "justification." Nothing else. It says nothing about "salvation."
My opinion on a resolution:I believe the solution to the apparent confusion is that people are failing to understand that "salvation" and "justification" are not the same thing. Session 6 of Trent is discussion of "justification" not "salvation."
A sinner can be "justified" by "
a desire for the laver of regeneration" (my paraphrase of Session 6, chap.4). But sinner cannot be "saved" without the Sacrament of Baptism (Session 7, canon 5).
Justification removes the impediment preventing sanctifying grace. Salvation is the result of a life lived in the "state of sanctifying grace." The former (justification) is at the beginning of the earthly pilgrimage. The latter (salvation) is the reward at the end of the earthly pilgrimage. Salvation only comes to those who persevere in that state of grace until the end of their life. Since "even the best man sins seven times a day," those who continue to live their life after "justification" will need access to the Sacrament of Penance to be "restored to grace" (Session 6, chapter 14).
Since those outside the Church are not baptized with the Sacrament, they cannot access the Sacrament of Penance. Those people are dependent on a miraculous, extra-Sacramental gift of God for their justification or restoration to a "state of grace." God can do anything, but it would be presumptuous to expect God to do it. Much better to follow the instructions of His Church.
I believe, Stubborn is simply reading the latin phrase from Session 6, Chapter 4 incorrectly. But I agree totally with Stubborn's argument that Trent says that "salvation" requires the Sacrament of Baptism by water and the Spirit. There is no need to massacre the phrase "laver of regeneration or the desire thereof" to preserve the EENS dogma against the false claim that BoD effects "salvation." BoD effects something, but not "salvation."