From 818659a163197153d511dad9fa524266df5bb86e Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Fri, 22 Mar 2002 03:38:35 +0000 Subject: [PATCH] - rees@cvs.openbsd.org 2002/03/21 18:08:15 [scard.c] In sc_put_key(), sc_reader_id should be id. --- ChangeLog | 6 ++++-- scard.c | 8 ++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index af8cfb640..eed8676ad 100644 --- a/ChangeLog +++ b/ChangeLog @@ -127,7 +127,9 @@ - markus@cvs.openbsd.org 2002/03/21 16:58:13 [clientloop.c] remove unused - + - rees@cvs.openbsd.org 2002/03/21 18:08:15 + [scard.c] + In sc_put_key(), sc_reader_id should be id. 20020317 - (tim) [configure.ac] Assume path given with --with-pid-dir=PATH is wanted, warn if directory does not exist. Put system directories in front of @@ -7973,4 +7975,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1960 2002/03/22 03:35:48 mouring Exp $ +$Id: ChangeLog,v 1.1961 2002/03/22 03:38:35 mouring Exp $ diff --git a/scard.c b/scard.c index 7bd72d8ec..9d044acb9 100644 --- a/scard.c +++ b/scard.c @@ -24,7 +24,8 @@ #include "includes.h" #ifdef SMARTCARD -RCSID("$OpenBSD: scard.c,v 1.20 2002/03/21 16:57:15 markus Exp $"); +RCSID("$OpenBSD: scard.c,v 1.21 2002/03/21 18:08:15 rees Exp $"); + #include #include #include @@ -413,14 +414,13 @@ sc_put_key(Key *prv, const char *id) COPY_RSA_KEY(dmp1, 4); COPY_RSA_KEY(n, 5); len = BN_num_bytes(prv->rsa->n); - fd = sectok_friendly_open(sc_reader_id, STONOWAIT, &sw); + fd = sectok_friendly_open(id, STONOWAIT, &sw); if (fd < 0) { error("sectok_open failed: %s", sectok_get_sw(sw)); goto done; } if (! sectok_cardpresent(fd)) { - error("smartcard in reader %s not present", - sc_reader_id); + error("smartcard in reader %s not present", id); goto done; } ret = sectok_reset(fd, 0, NULL, &sw);