diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | authfile.c | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -6,6 +6,9 @@ - deraadt@cvs.openbsd.org 2001/05/15 22:04:01 [ssh.1] X11 forwarding details improved + - markus@cvs.openbsd.org 2001/05/16 20:51:57 + [authfile.c] + return comments for private pem files, too; report from nolan@naic.edu 20010512 - OpenBSD CVS Sync @@ -5411,4 +5414,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1220 2001/05/17 03:16:18 mouring Exp $ +$Id: ChangeLog,v 1.1221 2001/05/17 03:17:55 mouring Exp $ @@ -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> @@ -558,7 +558,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); |