summaryrefslogtreecommitdiff
path: root/authfile.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-05-17 03:17:55 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-05-17 03:17:55 +0000
commit06b08018ef12d8bdf86b0ad3c2508666b789df70 (patch)
tree17754d8e1bb7c6a031ce805c71922db6deb77829 /authfile.c
parent7121507b19b7e634c3f5aecbd5beb68690e4ca35 (diff)
- markus@cvs.openbsd.org 2001/05/16 20:51:57
[authfile.c] return comments for private pem files, too; report from nolan@naic.edu
Diffstat (limited to 'authfile.c')
-rw-r--r--authfile.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c
index 8234ba07..2715bdef 100644
--- a/authfile.c
+++ b/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>
@@ -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);