diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2001-05-17 03:17:55 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2001-05-17 03:17:55 +0000 |
commit | 06b08018ef12d8bdf86b0ad3c2508666b789df70 (patch) | |
tree | 17754d8e1bb7c6a031ce805c71922db6deb77829 /authfile.c | |
parent | 7121507b19b7e634c3f5aecbd5beb68690e4ca35 (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.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/authfile.c b/authfile.c index 8234ba078..2715bdef8 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.33 2001/05/16 20:51:57 markus Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -558,7 +558,8 @@ key_load_private(const char *filename, const char *passphrase, | |||
558 | lseek(fd, (off_t) 0, SEEK_SET); /* rewind */ | 558 | lseek(fd, (off_t) 0, SEEK_SET); /* rewind */ |
559 | if (pub == NULL) { | 559 | if (pub == NULL) { |
560 | /* closes fd */ | 560 | /* closes fd */ |
561 | return key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL); | 561 | return key_load_private_pem(fd, KEY_UNSPEC, passphrase, |
562 | commentp); | ||
562 | } else { | 563 | } else { |
563 | /* it's a SSH v1 key if the public key part is readable */ | 564 | /* it's a SSH v1 key if the public key part is readable */ |
564 | key_free(pub); | 565 | key_free(pub); |