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
diff --git a/authfile.c b/authfile.c index f75c273fc..f2aec267a 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: authfile.c,v 1.86 2010/11/21 10:57:07 djm Exp $ */ | 1 | /* $OpenBSD: authfile.c,v 1.87 2010/11/29 18:57:04 markus Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -710,8 +710,9 @@ key_load_private(const char *filename, const char *passphrase, | |||
710 | *commentp = xstrdup(filename); | 710 | *commentp = xstrdup(filename); |
711 | } else { | 711 | } else { |
712 | key_free(pub); | 712 | key_free(pub); |
713 | /* key_parse_public_rsa1() has already loaded the comment */ | ||
713 | prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, | 714 | prv = key_parse_private_type(&buffer, KEY_RSA1, passphrase, |
714 | commentp); | 715 | NULL); |
715 | } | 716 | } |
716 | buffer_free(&buffer); | 717 | buffer_free(&buffer); |
717 | return prv; | 718 | return prv; |