summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ssh-keygen.c6
2 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 054dfe4d2..1c3beb03d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -107,6 +107,9 @@
107 add -D readerid option (download, i.e. print public RSA key to stdout). 107 add -D readerid option (download, i.e. print public RSA key to stdout).
108 check for card present when uploading keys. 108 check for card present when uploading keys.
109 use strings instead of ints for smartcard reader ids, too. 109 use strings instead of ints for smartcard reader ids, too.
110 - jakob@cvs.openbsd.org 2001/08/02 08:58:35
111 [ssh-keygen.c]
112 change -u (upload smartcard key) to -U. ok markus@
110 113
11120010803 11420010803
112 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on 115 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6217,4 +6220,4 @@
6217 - Wrote replacements for strlcpy and mkdtemp 6220 - Wrote replacements for strlcpy and mkdtemp
6218 - Released 1.0pre1 6221 - Released 1.0pre1
6219 6222
6220$Id: ChangeLog,v 1.1453 2001/08/06 21:44:05 mouring Exp $ 6223$Id: ChangeLog,v 1.1454 2001/08/06 21:46:54 mouring Exp $
diff --git a/ssh-keygen.c b/ssh-keygen.c
index 096908f3b..beffa928c 100644
--- a/ssh-keygen.c
+++ b/ssh-keygen.c
@@ -12,7 +12,7 @@
12 */ 12 */
13 13
14#include "includes.h" 14#include "includes.h"
15RCSID("$OpenBSD: ssh-keygen.c,v 1.75 2001/08/02 00:10:17 markus Exp $"); 15RCSID("$OpenBSD: ssh-keygen.c,v 1.76 2001/08/02 08:58:35 jakob Exp $");
16 16
17#include <openssl/evp.h> 17#include <openssl/evp.h>
18#include <openssl/pem.h> 18#include <openssl/pem.h>
@@ -831,7 +831,7 @@ main(int ac, char **av)
831 exit(1); 831 exit(1);
832 } 832 }
833 833
834 while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:u:D:P:N:C:")) != -1) { 834 while ((opt = getopt(ac, av, "deiqpclBRxXyb:f:t:U:D:P:N:C:")) != -1) {
835 switch (opt) { 835 switch (opt) {
836 case 'b': 836 case 'b':
837 bits = atoi(optarg); 837 bits = atoi(optarg);
@@ -893,7 +893,7 @@ main(int ac, char **av)
893 break; 893 break;
894 case 'D': 894 case 'D':
895 download = 1; 895 download = 1;
896 case 'u': 896 case 'U':
897 reader_id = optarg; 897 reader_id = optarg;
898 break; 898 break;
899 case '?': 899 case '?':