[ssh-keygen.c]
     change -u (upload smartcard key) to -U. ok markus@
This commit is contained in:
Ben Lindstrom 2001-08-06 21:46:54 +00:00
parent 8282d6a82f
commit f19578c447
2 changed files with 7 additions and 4 deletions

View File

@ -107,6 +107,9 @@
add -D readerid option (download, i.e. print public RSA key to stdout). add -D readerid option (download, i.e. print public RSA key to stdout).
check for card present when uploading keys. check for card present when uploading keys.
use strings instead of ints for smartcard reader ids, too. use strings instead of ints for smartcard reader ids, too.
- jakob@cvs.openbsd.org 2001/08/02 08:58:35
[ssh-keygen.c]
change -u (upload smartcard key) to -U. ok markus@
20010803 20010803
- (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@ -6217,4 +6220,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.1453 2001/08/06 21:44:05 mouring Exp $ $Id: ChangeLog,v 1.1454 2001/08/06 21:46:54 mouring Exp $

View File

@ -12,7 +12,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/pem.h> #include <openssl/pem.h>
@ -831,7 +831,7 @@ main(int ac, char **av)
exit(1); 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) { switch (opt) {
case 'b': case 'b':
bits = atoi(optarg); bits = atoi(optarg);
@ -893,7 +893,7 @@ main(int ac, char **av)
break; break;
case 'D': case 'D':
download = 1; download = 1;
case 'u': case 'U':
reader_id = optarg; reader_id = optarg;
break; break;
case '?': case '?':