diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-05-16 20:51:58 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-05-16 20:51:58 +0000 |
| commit | fc5817c0d91a998066968759cf1bfcf9ae705d98 (patch) | |
| tree | 80cec66db1ef9fa2c9cd0f4c1f693bebe7177153 | |
| parent | f316a10f1f9b574a9cd1fd53b1cd8bb5245da1dc (diff) | |
return comments for private pem files, too; report from nolan@naic.edu
| -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 46a5bb92c2d..d292d5b9fd9 100644 --- a/usr.bin/ssh/authfile.c +++ b/usr.bin/ssh/authfile.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.33 2001/05/16 20:51:57 markus Exp $"); #include <openssl/err.h> #include <openssl/evp.h> @@ -555,7 +555,8 @@ key_load_private(const char *filename, const char *passphrase, lseek(fd, (off_t) 0, SEEK_SET); /* rewind */ if (pub == NULL) { /* closes fd */ - return key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL); + return key_load_private_pem(fd, KEY_UNSPEC, passphrase, + commentp); } else { /* it's a SSH v1 key if the public key part is readable */ key_free(pub); |