diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | authfile.c | 4 |
2 files changed, 6 insertions, 3 deletions
@@ -75,6 +75,9 @@ | |||
75 | - markus@cvs.openbsd.org 2001/05/28 23:58:35 | 75 | - markus@cvs.openbsd.org 2001/05/28 23:58:35 |
76 | [packet.c packet.h sshconnect.c sshd.c] | 76 | [packet.c packet.h sshconnect.c sshd.c] |
77 | remove some lines, simplify. | 77 | remove some lines, simplify. |
78 | - markus@cvs.openbsd.org 2001/05/29 12:31:27 | ||
79 | [authfile.c] | ||
80 | typo | ||
78 | 81 | ||
79 | 20010528 | 82 | 20010528 |
80 | - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c | 83 | - (tim) [conifgure.in] add setvbuf test needed for sftp-int.c |
@@ -5505,4 +5508,4 @@ | |||
5505 | - Wrote replacements for strlcpy and mkdtemp | 5508 | - Wrote replacements for strlcpy and mkdtemp |
5506 | - Released 1.0pre1 | 5509 | - Released 1.0pre1 |
5507 | 5510 | ||
5508 | $Id: ChangeLog,v 1.1245 2001/06/05 21:09:18 mouring Exp $ | 5511 | $Id: ChangeLog,v 1.1246 2001/06/05 21:13:57 mouring Exp $ |
diff --git a/authfile.c b/authfile.c index e1a9a21a1..db6aed83e 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.34 2001/05/28 10:08:55 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.35 2001/05/29 12:31:27 markus Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -561,7 +561,7 @@ key_load_private(const char *filename, const char *passphrase, | |||
561 | prv = key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL); | 561 | prv = key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL); |
562 | /* use the filename as a comment for PEM */ | 562 | /* use the filename as a comment for PEM */ |
563 | if (commentp && prv) | 563 | if (commentp && prv) |
564 | commentp = xstrdup(filename); | 564 | *commentp = xstrdup(filename); |
565 | } else { | 565 | } else { |
566 | /* it's a SSH v1 key if the public key part is readable */ | 566 | /* it's a SSH v1 key if the public key part is readable */ |
567 | key_free(pub); | 567 | key_free(pub); |