Did Pope Francis declare that according to the teaching of the Catholic Church capital punishment is intrinsically evil?

The Internet is full of news that Pope Francis has amended the Catechism of the Catholic Church to forbid capital punishment under all circumstances. One thing remains unclear for me, however: * Did Pope Francis indeed declare the capital punishment to be intrisincally evil, that is, sinful under any and all circumstances, even if / when effective incarcerination is impossible? * Or did he (merely?) state that since in contemporary times effective incarcerination is possible, it should always be used instead of capital punishment? That second interpretation seems to be hinted by these words: > Lastly, more effective systems of detention have been developed, which ensure the due protection of citizens but, at the same time, do not definitively deprive the guilty of the possibility of redemption. However, these words seem to hint the first interpretation: > the Church teaches, in the light of the Gospel, that “the death penalty is inadmissible because it is an attack on the inviolability and dignity of the person” The distinction seems to matter because the question whether in contemporary times the States can, in all, even most extreme cases, effectively protect the lives of their citizens without capital punishment seems to not belong to the scope of "morals and faith", which is the scope of the teaching of the Church. In particular, I feel, this seems dubious in states where there is war or where the influences of organized crime are beyond control. Context that I still feel belongs to the question: The way I used to be getting this (maybe wrongly) the Church was teaching that physical violence, while undesireable, was a rightful response to someone's unjust aggresion, whether the threat posed by this unjust aggression was immediate (as if, someone is shooting at innocent people) or recurrent (as if, an enemy state is preparing an invasion against us - hence even preventive war may be morally acceptable in certain cases; or as if a Mafia boss cannot be guaranteed to be succesfully imprisoned for a prolonged time because of his out of control influences, so the State sentences him to capital punishment before his men rescue him from prison or a corrupt judge frees him, either would most likely happen if he hasn't been executed already). However, I have feeling, in many cases, including this one, Pope Francis amends this part of the teaching of the Church, saying that physical violence may only be permissible as a response to immediate threat, but never to a recurring threat. Which is why it may still be permissible for a police officer to shoot down a Mafia hitman if in any other case this Mafia hitman would shoot down the police officer instead; but it is not permissible to sentence said hitman to capital punishment even if because of the ongoing war with Mafia rebels he cannot be effectively imprisoned for a prolonged time. Is this interpretation correct?