diff options
Diffstat (limited to 'ssh-keygen.c')
-rw-r--r-- | ssh-keygen.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh-keygen.c b/ssh-keygen.c index 8b0b4d8dd..003357321 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" |
15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.72 2001/07/02 22:40:18 markus Exp $"); | 15 | RCSID("$OpenBSD: ssh-keygen.c,v 1.73 2001/07/26 20:04:27 rees Exp $"); |
16 | 16 | ||
17 | #include <openssl/evp.h> | 17 | #include <openssl/evp.h> |
18 | #include <openssl/pem.h> | 18 | #include <openssl/pem.h> |
@@ -400,7 +400,6 @@ do_upload(struct passwd *pw, int reader) | |||
400 | struct stat st; | 400 | struct stat st; |
401 | u_char *elements[NUM_RSA_KEY_ELEMENTS]; | 401 | u_char *elements[NUM_RSA_KEY_ELEMENTS]; |
402 | u_char key_fid[2]; | 402 | u_char key_fid[2]; |
403 | u_char atr[256]; | ||
404 | u_char AUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63}; | 403 | u_char AUT0[] = {0xad, 0x9f, 0x61, 0xfe, 0xfa, 0x20, 0xce, 0x63}; |
405 | int len, status = 1, i, fd = -1, ret; | 404 | int len, status = 1, i, fd = -1, ret; |
406 | int sw = 0, cla = 0x00; | 405 | int sw = 0, cla = 0x00; |
@@ -425,12 +424,12 @@ do_upload(struct passwd *pw, int reader) | |||
425 | COPY_RSA_KEY(dmp1, 4); | 424 | COPY_RSA_KEY(dmp1, 4); |
426 | COPY_RSA_KEY(n, 5); | 425 | COPY_RSA_KEY(n, 5); |
427 | len = BN_num_bytes(prv->rsa->n); | 426 | len = BN_num_bytes(prv->rsa->n); |
428 | fd = sectok_open(reader, 0, NULL); | 427 | fd = sectok_open(reader, 0, &sw); |
429 | if (fd < 0) { | 428 | if (fd < 0) { |
430 | error("sectok_open failed"); | 429 | error("sectok_open failed"); |
431 | goto done; | 430 | goto done; |
432 | } | 431 | } |
433 | ret = sectok_reset(fd, 0, atr, &sw); | 432 | ret = sectok_reset(fd, 0, NULL, &sw); |
434 | if (ret <= 0) { | 433 | if (ret <= 0) { |
435 | error("sectok_reset failed"); | 434 | error("sectok_reset failed"); |
436 | goto done; | 435 | goto done; |