Attachment #3459 for bug #2879

Lines 53-58 Link Here

(-)ssh-keygen.1 (+9 lines)
53	.Op Fl O Ar option	53	.Op Fl O Ar option
54	.Op Fl t Cm dsa \| ecdsa \| ecdsa-sk \| ed25519 \| ed25519-sk \| rsa	54	.Op Fl t Cm dsa \| ecdsa \| ecdsa-sk \| ed25519 \| ed25519-sk \| rsa
55	.Op Fl w Ar provider	55	.Op Fl w Ar provider
		56	.Op Fl Z Ar cipher
56	.Nm ssh-keygen	57	.Nm ssh-keygen
57	.Fl p	58	.Fl p
58	.Op Fl a Ar rounds	59	.Op Fl a Ar rounds
Lines 60-65 Link Here
60	.Op Fl m Ar format	61	.Op Fl m Ar format
61	.Op Fl N Ar new_passphrase	62	.Op Fl N Ar new_passphrase
62	.Op Fl P Ar old_passphrase	63	.Op Fl P Ar old_passphrase
		64	.Op Fl Z Ar cipher
63	.Nm ssh-keygen	65	.Nm ssh-keygen
64	.Fl i	66	.Fl i
65	.Op Fl f Ar input_keyfile	67	.Op Fl f Ar input_keyfile
Lines 740-745 returning a zero exit status. Link Here
740	.It Fl y	742	.It Fl y
741	This option will read a private	743	This option will read a private
742	OpenSSH format file and print an OpenSSH public key to stdout.	744	OpenSSH format file and print an OpenSSH public key to stdout.
		745	.It Fl Z Ar cipher
		746	Specifies the cipher to use for encryption when writing an OpenSSH-format
		747	private key file.
		748	The list of available ciphers may be obtained using
		749	.Qq ssh -Q cipher .
		750	The default is
		751	.Dq aes256-ctr .
743	.It Fl z Ar serial_number	752	.It Fl z Ar serial_number
744	Specifies a serial number to be embedded in the certificate to distinguish	753	Specifies a serial number to be embedded in the certificate to distinguish
745	this certificate from others from the same CA.	754	this certificate from others from the same CA.

Lines 3044-3052 usage(void) Link Here

(-)ssh-keygen.c (-2 / +5 lines)
3044	"usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n"	3044	"usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n"
3045	" [-m format] [-N new_passphrase] [-O option]\n"	3045	" [-m format] [-N new_passphrase] [-O option]\n"
3046	" [-t dsa \| ecdsa \| ecdsa-sk \| ed25519 \| ed25519-sk \| rsa]\n"	3046	" [-t dsa \| ecdsa \| ecdsa-sk \| ed25519 \| ed25519-sk \| rsa]\n"
3047	" [-w provider]\n"	3047	" [-w provider] [-Z cipher]\n"
3048	" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n"	3048	" ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n"
3049	" [-P old_passphrase]\n"	3049	" [-P old_passphrase] [-Z cipher]\n"
3050	" ssh-keygen -i [-f input_keyfile] [-m key_format]\n"	3050	" ssh-keygen -i [-f input_keyfile] [-m key_format]\n"
3051	" ssh-keygen -e [-f input_keyfile] [-m key_format]\n"	3051	" ssh-keygen -e [-f input_keyfile] [-m key_format]\n"
3052	" ssh-keygen -y [-f input_keyfile]\n"	3052	" ssh-keygen -y [-f input_keyfile]\n"
Lines 3234-3239 main(int argc, char **argv) Link Here
3234	break;	3234	break;
3235	case 'Z':	3235	case 'Z':
3236	openssh_format_cipher = optarg;	3236	openssh_format_cipher = optarg;
		3237	if (cipher_by_name(openssh_format_cipher) == NULL)
		3238	fatal("Invalid OpenSSH-format cipher '%s'",
		3239	openssh_format_cipher);
3237	break;	3240	break;
3238	case 'C':	3241	case 'C':
3239	identity_comment = optarg;	3242	identity_comment = optarg;

Return to bug 2879