Somebody mentioned that your patch forces people to type password even when the certificate isn't encrypted. How was this issue addressed?
It would be ideal if you can inspect the certificate and decide if you need to ask for decrypting password before using it (and otherwise you don't ask). If you can't do that, probably you can introduce a config var that says "this certificate is encrypted", and bypass your new code if that config var isn't set.
That way, people who are used to the old behavior don't have to change anything in their set-up.
If people didn't have to type password at all, and after your patch if they are forced to do something else to keep the old set-up working, that isn't nice.