diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2010-11-29 18:57:05 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2010-11-29 18:57:05 +0000 |
| commit | 616b9d5305655dff5883a67b13b936ac5d6db4ca (patch) | |
| tree | 71cce181317130f74220fbd9e5d7a86c2c78d226 /usr.bin | |
| parent | 0d0f9c65dc9b4322ef47435a68f7da39795b7590 (diff) | |
correctly load comment for encrypted rsa1 keys;
report/fix Joachim Schipper; ok djm@
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/authfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/authfile.c b/usr.bin/ssh/authfile.c index 0f9d326008f..edf6a5982db 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -1,4 +1,4 @@ -/* $OpenBSD: authfile.c,v 1.86 2010/11/21 10:57:07 djm Exp $ */ +/* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -694,8 +694,9 @@ key_load_private(const char *filename, const char *passphrase, *commentp = xstrdup(filename); } else { key_free(pub); + /* key_parse_public_rsa1() has already loaded the comment */ prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, - commentp); + NULL); } buffer_free(&buffer); return prv; |