summaryrefslogtreecommitdiff
path: root/usr.bin/ssh
diff options
context:
space:
mode:
authorJakob Schlyter <jakob@cvs.openbsd.org>2001-08-02 08:58:36 +0000
committerJakob Schlyter <jakob@cvs.openbsd.org>2001-08-02 08:58:36 +0000
commitfbd8f42c023153d6a13fe0062aab8e748f26e332 (patch)
treea9d8c0801a9d8f4657f9d4cfb731ebdab00536e2 /usr.bin/ssh
parent6732cda1ea303c664c4057fda36878cbc2eb83eb (diff)
change -u (upload smartcard key) to -U. ok markus@
Diffstat (limited to 'usr.bin/ssh')
-rw-r--r--usr.bin/ssh/README.smartcard2
-rw-r--r--usr.bin/ssh/ssh-keygen.c6
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/README.smartcard b/usr.bin/ssh/README.smartcard
index a44401c35c4..499dc8ed620 100644
--- a/usr.bin/ssh/README.smartcard
+++ b/usr.bin/ssh/README.smartcard
@@ -31,7 +31,7 @@ need to:
with the current version of sectok/ssh-keygen
the private key file is still readable
- $ ssh-keygen -f /path/to/rsakey -u 1
+ $ ssh-keygen -f /path/to/rsakey -U 1
(where 1 is the reader number, you can also try 0)
In spite of the name, this does not generate a key.
diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index c3763f4ccc8..dde70ac4092 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -12,7 +12,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: ssh-keygen.c,v 1.75 2001/08/02 00:10:17 markus Exp $");
+RCSID("$OpenBSD: ssh-keygen.c,v 1.76 2001/08/02 08:58:35 jakob Exp $");
#include <openssl/evp.h>
#include <openssl/pem.h>
@@ -823,7 +823,7 @@ main(int ac, char **av)
exit(1);
}
- while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:u:D:P:N:C:")) != -1) {
+ while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:U:D:P:N:C:")) != -1) {
switch (opt) {
case 'b':
bits = atoi(optarg);
@@ -885,7 +885,7 @@ main(int ac, char **av)
break;
case 'D':
download = 1;
- case 'u':
+ case 'U':
reader_id = optarg;
break;
case '?':