tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- djm@cvs.openbsd.org 2013/12/19 00:10:30 

[ssh-add.c]
     skip requesting smartcard PIN when removing keys from agent; bz#2187
     patch from jay AT slushpupie.com; ok dtucker
This commit is contained in:
Damien Miller 2013-12-29 17:44:07 +11:00
parent 7d97fd9a1c
commit ef275ead3d
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,6 +1,11 @@
20131229 20131229
- (djm) [loginrec.c] Check for username truncation when looking up lastlog - (djm) [loginrec.c] Check for username truncation when looking up lastlog
entries entries
- (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2013/12/19 00:10:30
[ssh-add.c]
skip requesting smartcard PIN when removing keys from agent; bz#2187
patch from jay AT slushpupie.com; ok dtucker
20131221 20131221
- (dtucker) [regress/keytype.sh] Actually test ecdsa key types. - (dtucker) [regress/keytype.sh] Actually test ecdsa key types.

13
ssh-add.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.107 2013/12/15 18:17:26 pascal Exp $ */ /* $OpenBSD: ssh-add.c,v 1.108 2013/12/19 00:10:30 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -293,14 +293,17 @@ add_file(AuthenticationConnection *ac, const char *filename, int key_only)
static int static int
update_card(AuthenticationConnection *ac, int add, const char *id) update_card(AuthenticationConnection *ac, int add, const char *id)
{ {
char *pin; char *pin = NULL;
int ret = -1; int ret = -1;
pin = read_passphrase("Enter passphrase for PKCS#11: ", RP_ALLOW_STDIN); if (add) {
if (pin == NULL) if ((pin = read_passphrase("Enter passphrase for PKCS#11: ",
RP_ALLOW_STDIN)) == NULL)
return -1; return -1;
}
if (ssh_update_card(ac, add, id, pin, lifetime, confirm)) { if (ssh_update_card(ac, add, id, pin == NULL ? "" : pin,
lifetime, confirm)) {
fprintf(stderr, "Card %s: %s\n", fprintf(stderr, "Card %s: %s\n",
add ? "added" : "removed", id); add ? "added" : "removed", id);
ret = 0; ret = 0;