Attachment 3458 Details for Bug 2879 – Document ssh-keygen -Z and provide better error on incorrect arg.

[patch] Document ssh-keygen -Z and provide better error on incorrect arg.

ssh-keygen-Z.patch (text/plain), 2.45 KB, created by Darren Tucker on 2020-11-27 14:07:47 AEDT

(hide)

Description:

Filename:

MIME Type:

Creator: Darren Tucker

Created: 2020-11-27 14:07:47 AEDT

Size: 2.45 KB

patch

obsolete

>Index: ssh-keygen.1
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh-keygen.1,v
>retrieving revision 1.211
>diff -u -p -r1.211 ssh-keygen.1
>--- ssh-keygen.1	17 Nov 2020 11:23:58 -0000	1.211
>+++ ssh-keygen.1	27 Nov 2020 03:06:33 -0000
>@@ -53,6 +53,7 @@
> .Op Fl O Ar option
> .Op Fl t Cm dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa
> .Op Fl w Ar provider
>+.Op Fl Z Ar cipher
> .Nm ssh-keygen
> .Fl p
> .Op Fl a Ar rounds
>@@ -60,6 +61,7 @@
> .Op Fl m Ar format
> .Op Fl N Ar new_passphrase
> .Op Fl P Ar old_passphrase
>+.Op Fl Z Ar cipher
> .Nm ssh-keygen
> .Fl i
> .Op Fl f Ar input_keyfile
>@@ -740,6 +742,13 @@ returning a zero exit status.
> .It Fl y
> This option will read a private
> OpenSSH format file and print an OpenSSH public key to stdout.
>+.It Fl Z Ar cipher
>+Specifies the cipher to use for encryption when writing an OpenSSH-format
>+private key file.
>+The list of available ciphers may be obtained using
>+.Qq ssh -Q cipher .
>+The default is
>+.Dq aes256-ctr .
> .It Fl z Ar serial_number
> Specifies a serial number to be embedded in the certificate to distinguish
> this certificate from others from the same CA.
>Index: ssh-keygen.c
>===================================================================
>RCS file: /cvs/src/usr.bin/ssh/ssh-keygen.c,v
>retrieving revision 1.424
>diff -u -p -r1.424 ssh-keygen.c
>--- ssh-keygen.c	8 Nov 2020 22:37:24 -0000	1.424
>+++ ssh-keygen.c	27 Nov 2020 03:06:33 -0000
>@@ -3044,9 +3044,9 @@ usage(void)
> 	    "usage: ssh-keygen [-q] [-a rounds] [-b bits] [-C comment] [-f output_keyfile]\n"
> 	    "                  [-m format] [-N new_passphrase] [-O option]\n"
> 	    "                  [-t dsa | ecdsa | ecdsa-sk | ed25519 | ed25519-sk | rsa]\n"
>-	    "                  [-w provider]\n"
>+	    "                  [-w provider] [-Z cipher]\n"
> 	    "       ssh-keygen -p [-a rounds] [-f keyfile] [-m format] [-N new_passphrase]\n"
>-	    "                   [-P old_passphrase]\n"
>+	    "                   [-P old_passphrase] [-z cipher]\n"
> 	    "       ssh-keygen -i [-f input_keyfile] [-m key_format]\n"
> 	    "       ssh-keygen -e [-f input_keyfile] [-m key_format]\n"
> 	    "       ssh-keygen -y [-f input_keyfile]\n"
>@@ -3234,6 +3234,9 @@ main(int argc, char **argv)
> 			break;
> 		case 'Z':
> 			openssh_format_cipher = optarg;
>+			if (cipher_by_name(openssh_format_cipher) == NULL)
>+				fatal("Invalid OpenSSH-format cipher '%s'",
>+				    openssh_format_cipher);
> 			break;
> 		case 'C':
> 			identity_comment = optarg;

Actions: View | Diff

Attachments on bug 2879: 3458 | 3459