tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-25 14:54:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
[scard.c scard.h ssh-agent.c ssh.c]
     add sc_get_key_label; larsch at trustcenter.de; bugzilla#591
This commit is contained in:
Damien Miller 2003-06-18 20:28:40 +10:00
parent b2cdcb50a2
commit 56a0bb07c4
5 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -9,6 +9,9 @@
- nino@cvs.openbsd.org 2003/06/12 15:34:09 - nino@cvs.openbsd.org 2003/06/12 15:34:09
[scp.c] [scp.c]
Typo. Ok markus@. 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 20030614
- (djm) Update license on fake-rfc2553.[ch]; ok itojun@ - (djm) Update license on fake-rfc2553.[ch]; ok itojun@
@ -524,4 +527,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

9
scard.c
View File

@ -24,7 +24,7 @@
#include "includes.h" #include "includes.h"
#if defined(SMARTCARD) && defined(USE_SECTOK) #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 <openssl/evp.h>
#include <sectok.h> #include <sectok.h>
@ -554,4 +554,11 @@ done:
sectok_close(fd); sectok_close(fd);
return (status); return (status);
} }
char *
sc_get_key_label(Key *key)
{
return xstrdup("smartcard key");
}
#endif /* SMARTCARD && USE_SECTOK */ #endif /* SMARTCARD && USE_SECTOK */

3
scard.h
View File

@ -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. * Copyright (c) 2001 Markus Friedl. All rights reserved.
@ -36,5 +36,6 @@
Key **sc_get_keys(const char *, const char *); Key **sc_get_keys(const char *, const char *);
void sc_close(void); void sc_close(void);
int sc_put_key(Key *, const char *); int sc_put_key(Key *, const char *);
char *sc_get_key_label(Key *);
#endif #endif

4
ssh-agent.c
View File

@ -35,7 +35,7 @@
#include "includes.h" #include "includes.h"
#include "openbsd-compat/sys-queue.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/evp.h>
#include <openssl/md5.h> #include <openssl/md5.h>
@ -618,7 +618,7 @@ process_add_smartcard_key (SocketEntry *e)
if (lookup_identity(k, version) == NULL) { if (lookup_identity(k, version) == NULL) {
id = xmalloc(sizeof(Identity)); id = xmalloc(sizeof(Identity));
id->key = k; id->key = k;
id->comment = xstrdup("smartcard key"); id->comment = sc_get_key_label(k);
id->death = death; id->death = death;
id->confirm = confirm; id->confirm = confirm;
TAILQ_INSERT_TAIL(&tab->idlist, id, next); TAILQ_INSERT_TAIL(&tab->idlist, id, next);

4
ssh.c
View File

@ -40,7 +40,7 @@
*/ */
#include "includes.h" #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/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -1180,7 +1180,7 @@ load_public_identity_files(void)
sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1)); sizeof(Key *) * (SSH_MAX_IDENTITY_FILES - 1));
options.num_identity_files++; options.num_identity_files++;
options.identity_keys[0] = keys[i]; 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) if (options.num_identity_files > SSH_MAX_IDENTITY_FILES)
options.num_identity_files = SSH_MAX_IDENTITY_FILES; options.num_identity_files = SSH_MAX_IDENTITY_FILES;