summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--authfile.c5
2 files changed, 7 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 857139117..9abaa26ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,9 @@
6 - deraadt@cvs.openbsd.org 2001/05/15 22:04:01 6 - deraadt@cvs.openbsd.org 2001/05/15 22:04:01
7 [ssh.1] 7 [ssh.1]
8 X11 forwarding details improved 8 X11 forwarding details improved
9 - markus@cvs.openbsd.org 2001/05/16 20:51:57
10 [authfile.c]
11 return comments for private pem files, too; report from nolan@naic.edu
9 12
1020010512 1320010512
11 - OpenBSD CVS Sync 14 - OpenBSD CVS Sync
@@ -5411,4 +5414,4 @@
5411 - Wrote replacements for strlcpy and mkdtemp 5414 - Wrote replacements for strlcpy and mkdtemp
5412 - Released 1.0pre1 5415 - Released 1.0pre1
5413 5416
5414$Id: ChangeLog,v 1.1220 2001/05/17 03:16:18 mouring Exp $ 5417$Id: ChangeLog,v 1.1221 2001/05/17 03:17:55 mouring Exp $
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"
39RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $"); 39RCSID("$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);