From https://www.ssh.com/ssh/keygen/: -N "New" Provides a new passphrase for the key. -P "Passphrase" Provides the (old) passphrase when reading a key. Change Iba3a674f8 did this for RSA keys, but not for other key types. Also do it for the other types. Change-Id: Ied6d8d97d2333a313a0abf215bbdba5e1bba51bc