diff options
Diffstat (limited to 'scard.c')
-rw-r--r-- | scard.c | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -24,7 +24,7 @@ | |||
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | #if defined(SMARTCARD) && defined(USE_SECTOK) | 26 | #if defined(SMARTCARD) && defined(USE_SECTOK) |
27 | RCSID("$OpenBSD: scard.c,v 1.26 2002/06/23 03:30:17 deraadt Exp $"); | 27 | RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $"); |
28 | 28 | ||
29 | #include <openssl/evp.h> | 29 | #include <openssl/evp.h> |
30 | #include <sectok.h> | 30 | #include <sectok.h> |
@@ -526,7 +526,7 @@ sc_put_key(Key *prv, const char *id) | |||
526 | } | 526 | } |
527 | if (!sectok_swOK(sw)) | 527 | if (!sectok_swOK(sw)) |
528 | goto done; | 528 | goto done; |
529 | log("cyberflex_load_rsa_priv done"); | 529 | logit("cyberflex_load_rsa_priv done"); |
530 | key_fid[0] = 0x73; | 530 | key_fid[0] = 0x73; |
531 | key_fid[1] = 0x68; | 531 | key_fid[1] = 0x68; |
532 | if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5], | 532 | if (cyberflex_load_rsa_pub(fd, cla, key_fid, len, elements[5], |
@@ -536,7 +536,7 @@ sc_put_key(Key *prv, const char *id) | |||
536 | } | 536 | } |
537 | if (!sectok_swOK(sw)) | 537 | if (!sectok_swOK(sw)) |
538 | goto done; | 538 | goto done; |
539 | log("cyberflex_load_rsa_pub done"); | 539 | logit("cyberflex_load_rsa_pub done"); |
540 | status = 0; | 540 | status = 0; |
541 | 541 | ||
542 | done: | 542 | done: |
@@ -554,4 +554,11 @@ done: | |||
554 | sectok_close(fd); | 554 | sectok_close(fd); |
555 | return (status); | 555 | return (status); |
556 | } | 556 | } |
557 | |||
558 | char * | ||
559 | sc_get_key_label(Key *key) | ||
560 | { | ||
561 | return xstrdup("smartcard key"); | ||
562 | } | ||
563 | |||
557 | #endif /* SMARTCARD && USE_SECTOK */ | 564 | #endif /* SMARTCARD && USE_SECTOK */ |