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

- OpenBSD CVS Sync 

- benno@cvs.openbsd.org 2014/07/09 14:15:56
     [ssh-add.c]
     fix ssh-add crash while loading more than one key
     ok markus@
This commit is contained in:
Damien Miller 2014-07-11 09:19:04 +10:00
parent 7a57eb3d10
commit 1d0df3249c
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
20140711
- OpenBSD CVS Sync
- benno@cvs.openbsd.org 2014/07/09 14:15:56
[ssh-add.c]
fix ssh-add crash while loading more than one key
ok markus@
20140709 20140709
- OpenBSD CVS Sync - OpenBSD CVS Sync
- djm@cvs.openbsd.org 2014/07/07 08:19:12 - djm@cvs.openbsd.org 2014/07/07 08:19:12

6
ssh-add.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-add.c,v 1.112 2014/07/03 03:15:01 djm Exp $ */ /* $OpenBSD: ssh-add.c,v 1.113 2014/07/09 14:15:56 benno 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
@ -205,8 +205,6 @@ add_file(AuthenticationConnection *ac, const char *filename, int key_only)
if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename, if ((r = sshkey_parse_private_fileblob(&keyblob, "", filename,
&private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE) &private, &comment)) != 0 && r != SSH_ERR_KEY_WRONG_PASSPHRASE)
fatal("Cannot parse %s: %s", filename, ssh_err(r)); fatal("Cannot parse %s: %s", filename, ssh_err(r));
if (comment == NULL)
comment = xstrdup(filename);
/* try last */ /* try last */
if (private == NULL && pass != NULL) { if (private == NULL && pass != NULL) {
if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename, if ((r = sshkey_parse_private_fileblob(&keyblob, pass, filename,
@ -214,6 +212,8 @@ add_file(AuthenticationConnection *ac, const char *filename, int key_only)
r != SSH_ERR_KEY_WRONG_PASSPHRASE) r != SSH_ERR_KEY_WRONG_PASSPHRASE)
fatal("Cannot parse %s: %s", filename, ssh_err(r)); fatal("Cannot parse %s: %s", filename, ssh_err(r));
} }
if (comment == NULL)
comment = xstrdup(filename);
if (private == NULL) { if (private == NULL) {
/* clear passphrase since it did not work */ /* clear passphrase since it did not work */
clear_pass(); clear_pass();