diff options
| author | Damien Miller <djm@mindrot.org> | 2010-12-01 12:03:39 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2010-12-01 12:03:39 +1100 |
| commit | 03c0e533de56a1fc55ec1885d35c3197fdefbf94 (patch) | |
| tree | d7a26befe2be3dcda1a6f2c62f21817ad9f481b6 /authfile.c | |
| parent | 87dc0a4188191f5de738e61b3cd1cfc90582329a (diff) | |
- markus@cvs.openbsd.org 2010/11/29 18:57:04
[authfile.c]
correctly load comment for encrypted rsa1 keys;
report/fix Joachim Schipper; ok djm@
Diffstat (limited to 'authfile.c')
| -rw-r--r-- | authfile.c | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -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 @@ -710,8 +710,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; |