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

upstream commit 

fix regression in 7.4: deletion of PKCS#11-hosted keys
would fail unless they were specified by full physical pathname. Report and
fix from Jakub Jelen via bz#2682; ok dtucker@

Upstream-ID: 5b5bc20ca11cacb5d5eb29c3f93fd18425552268
This commit is contained in:
djm@openbsd.org 2017-03-15 02:25:09 +00:00 committed by Damien Miller
parent a8c5eeacf0
commit 25f837646b
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ssh-agent.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-agent.c,v 1.216 2017/01/04 02:21:43 djm Exp $ */ /* $OpenBSD: ssh-agent.c,v 1.217 2017/03/15 02:25:09 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
@ -821,7 +821,7 @@ send:
static void static void
process_remove_smartcard_key(SocketEntry *e) process_remove_smartcard_key(SocketEntry *e)
{ {
char *provider = NULL, *pin = NULL; char *provider = NULL, *pin = NULL, canonical_provider[PATH_MAX];
int r, version, success = 0; int r, version, success = 0;
Identity *id, *nxt; Identity *id, *nxt;
Idtab *tab; Idtab *tab;
@ -831,6 +831,13 @@ process_remove_smartcard_key(SocketEntry *e)
fatal("%s: buffer error: %s", __func__, ssh_err(r)); fatal("%s: buffer error: %s", __func__, ssh_err(r));
free(pin); free(pin);
if (realpath(provider, canonical_provider) == NULL) {
verbose("failed PKCS#11 add of \"%.100s\": realpath: %s",
provider, strerror(errno));
goto send;
}
debug("%s: remove %.100s", __func__, canonical_provider);
for (version = 1; version < 3; version++) { for (version = 1; version < 3; version++) {
tab = idtab_lookup(version); tab = idtab_lookup(version);
for (id = TAILQ_FIRST(&tab->idlist); id; id = nxt) { for (id = TAILQ_FIRST(&tab->idlist); id; id = nxt) {
@ -838,14 +845,14 @@ process_remove_smartcard_key(SocketEntry *e)
/* Skip file--based keys */ /* Skip file--based keys */
if (id->provider == NULL) if (id->provider == NULL)
continue; continue;
if (!strcmp(provider, id->provider)) { if (!strcmp(canonical_provider, id->provider)) {
TAILQ_REMOVE(&tab->idlist, id, next); TAILQ_REMOVE(&tab->idlist, id, next);
free_identity(id); free_identity(id);
tab->nentries--; tab->nentries--;
} }
} }
} }
if (pkcs11_del_provider(provider) == 0) if (pkcs11_del_provider(canonical_provider) == 0)
success = 1; success = 1;
else else
error("process_remove_smartcard_key:" error("process_remove_smartcard_key:"