From d558092522153caa627e33e4a76c6f64332bc609 Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 14 May 2003 13:40:06 +1000 Subject: - (djm) RCSID sync w/ OpenBSD --- scard.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scard.c') diff --git a/scard.c b/scard.c index d23aa5b52..65f8bff14 100644 --- 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.26 2002/06/23 03:30:17 deraadt Exp $"); +RCSID("$OpenBSD: scard.c,v 1.27 2003/04/08 20:21:29 itojun Exp $"); #include #include -- cgit v1.2.3 From 56a0bb07c47285fe78268c95650032ab0ea667cd Mon Sep 17 00:00:00 2001 From: Damien Miller Date: Wed, 18 Jun 2003 20:28:40 +1000 Subject: - 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 --- ChangeLog | 5 ++++- scard.c | 9 ++++++++- scard.h | 3 ++- ssh-agent.c | 4 ++-- ssh.c | 4 ++-- 5 files changed, 18 insertions(+), 7 deletions(-) (limited to 'scard.c') diff --git a/ChangeLog b/ChangeLog index f5d3b36f0..2ccd501ab 100644 --- 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@ @@ -524,4 +527,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.2804 2003/06/18 10:26:34 djm Exp $ +$Id: ChangeLog,v 1.2805 2003/06/18 10:28:40 djm Exp $ diff --git a/scard.c b/scard.c index 65f8bff14..906287ba2 100644 --- 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 #include @@ -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 00999cb09..9ba20a361 100644 --- 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 61ea34580..6c8ff30dd 100644 --- 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 #include @@ -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 480bd85e6..0142e7fad 100644 --- 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 #include @@ -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; -- cgit v1.2.3