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 

make "ssh-add -d" properly remove a corresponding
 certificate, and also not whine and fail if there is none

ok djm@
This commit is contained in:
halex@openbsd.org 2015-02-21 21:46:57 +00:00 committed by Damien Miller
parent 7faaa32da8
commit 1797f49b1b
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssh-add.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.119 2015/02/03 00:34:14 halex Exp $ */ /* $OpenBSD: ssh-add.c,v 1.120 2015/02/21 21:46:57 halex 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
@ -128,18 +128,24 @@ delete_file(int agent_fd, const char *filename, int key_only)
free(comment); free(comment);
comment = NULL; comment = NULL;
xasprintf(&certpath, "%s-cert.pub", filename); xasprintf(&certpath, "%s-cert.pub", filename);
if ((r = sshkey_load_public(certpath, &cert, &comment)) == 0) if ((r = sshkey_load_public(certpath, &cert, &comment)) != 0) {
if (r != SSH_ERR_SYSTEM_ERROR || errno != ENOENT)
error("Failed to load certificate \"%s\": %s",
certpath, ssh_err(r));
goto out; goto out;
}
if (!sshkey_equal_public(cert, public)) if (!sshkey_equal_public(cert, public))
fatal("Certificate %s does not match private key %s", fatal("Certificate %s does not match private key %s",
certpath, filename); certpath, filename);
if (ssh_remove_identity(agent_fd, cert)) { if ((r = ssh_remove_identity(agent_fd, cert)) == 0) {
fprintf(stderr, "Identity removed: %s (%s)\n", certpath, fprintf(stderr, "Identity removed: %s (%s)\n", certpath,
comment); comment);
ret = 0; ret = 0;
} else } else
fprintf(stderr, "Could not remove identity: %s\n", certpath); fprintf(stderr, "Could not remove identity \"%s\": %s\n",
certpath, ssh_err(r));
out: out:
if (cert != NULL) if (cert != NULL)