- markus@cvs.openbsd.org 2003/06/12 19:12:03

     [scard.c scard.h ssh-agent.c ssh.c]
     add sc_get_key_label; larsch at trustcenter.de; bugzilla#591

diff --git a/ChangeLog b/ChangeLog
index cad1f3d1e31d87c5afb39e895d2df60d66bf24ed..05acfd4c207dce1ae739a76e1f0376af8cd93c6f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
    - nino@cvs.openbsd.org 2003/06/12 15:34:09
      [scp.c]
      Typo. Ok markus@.
+   - markus@cvs.openbsd.org 2003/06/12 19:12:03
+     [scard.c scard.h ssh-agent.c ssh.c]
+     add sc_get_key_label; larsch at trustcenter.de; bugzilla#591
 
 20030614
  - (djm) Update license on fake-rfc2553.[ch]; ok itojun@

diff --git a/scard.c b/scard.c
index 65f8bff14de170409320a302c008c3b9884b78f6..906287ba20fb28f4d8303ef9398fb66125b3bf7d 100644 (file)
--- a/scard.c
+++ b/scard.c
@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #if defined(SMARTCARD) && defined(USE_SECTOK)
-RCSID("$OpenBSD: scard.c,v 1.27 2003/04/08 20:21:29 itojun Exp $");
+RCSID("$OpenBSD: scard.c,v 1.28 2003/06/12 19:12:02 markus Exp $");
 
 #include <openssl/evp.h>
 #include <sectok.h>
@@ -554,4 +554,11 @@ done:
                sectok_close(fd);
        return (status);
 }
+
+char *
+sc_get_key_label(Key *key)
+{
+       return xstrdup("smartcard key");
+}
+
 #endif /* SMARTCARD && USE_SECTOK */

diff --git a/scard.h b/scard.h
index 00999cb09debac04a57bf5ad73e14d856f68641a..9ba20a361ba027eeda291c3e287988e26adf69cc 100644 (file)
--- a/scard.h
+++ b/scard.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: scard.h,v 1.11 2002/06/30 21:59:45 deraadt Exp $      */
+/*     $OpenBSD: scard.h,v 1.12 2003/06/12 19:12:03 markus Exp $       */
 
 /*
  * Copyright (c) 2001 Markus Friedl.  All rights reserved.
@@ -36,5 +36,6 @@
 Key    **sc_get_keys(const char *, const char *);
 void    sc_close(void);
 int     sc_put_key(Key *, const char *);
+char   *sc_get_key_label(Key *);
 
 #endif

diff --git a/ssh-agent.c b/ssh-agent.c
index 61ea3458007aadb897f14689f5b671443cebd0ee..6c8ff30dddc469b39167eeda2c6803eb22390a63 100644 (file)
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
 
 #include "includes.h"
 #include "openbsd-compat/sys-queue.h"
-RCSID("$OpenBSD: ssh-agent.c,v 1.110 2003/06/11 11:18:38 djm Exp $");
+RCSID("$OpenBSD: ssh-agent.c,v 1.111 2003/06/12 19:12:03 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/md5.h>
@@ -618,7 +618,7 @@ process_add_smartcard_key (SocketEntry *e)
                if (lookup_identity(k, version) == NULL) {
                        id = xmalloc(sizeof(Identity));
                        id->key = k;
-                       id->comment = xstrdup("smartcard key");
+                       id->comment = sc_get_key_label(k);
                        id->death = death;
                        id->confirm = confirm;
                        TAILQ_INSERT_TAIL(&tab->idlist, id, next);

diff --git a/ssh.c b/ssh.c
index 480bd85e670d6b64e7e3d6a8d809809f1f144abd..0142e7fad8409ba0ca661ffdd54086472275a3be 100644 (file)
--- a/ssh.c
+++ b/ssh.c
@@ -40,7 +40,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: ssh.c,v 1.193 2003/05/15 13:52:10 djm Exp $");
+RCSID("$OpenBSD: ssh.c,v 1.194 2003/06/12 19:12:03 markus Exp $");
 
 #include <openssl/evp.h>
 #include <openssl/err.h>
@@ -1180,7 +1180,7 @@ load_public_identity_files(void)
                            sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
                        options.num_identity_files++;
                        options.identity_keys[0] = keys[i];
-                       options.identity_files[0] = xstrdup("smartcard key");;
+                       options.identity_files[0] = sc_get_key_label(keys[i]);
                }
                if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
                        options.num_identity_files = SSH_MAX_IDENTITY_FILES;