summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--authfile.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 488b1e6a4..3d7748486 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
16 [auth2.c compat.c sshconnect2.c] 16 [auth2.c compat.c sshconnect2.c]
17 more ssh v2 hostbased-auth interop: ssh.com >= 2.1.0 works now 17 more ssh v2 hostbased-auth interop: ssh.com >= 2.1.0 works now
18 (however the 2.1.0 server seems to work only if debug is enabled...) 18 (however the 2.1.0 server seems to work only if debug is enabled...)
19 - markus@cvs.openbsd.org 2001/04/18 23:44:51
20 [authfile.c]
21 error->debug; noted by fries@
19 22
2020010418 2320010418
21 - OpenBSD CVS Sync 24 - OpenBSD CVS Sync
@@ -5178,4 +5181,4 @@
5178 - Wrote replacements for strlcpy and mkdtemp 5181 - Wrote replacements for strlcpy and mkdtemp
5179 - Released 1.0pre1 5182 - Released 1.0pre1
5180 5183
5181$Id: ChangeLog,v 1.1144 2001/04/19 20:40:45 mouring Exp $ 5184$Id: ChangeLog,v 1.1145 2001/04/19 20:47:10 mouring Exp $
diff --git a/authfile.c b/authfile.c
index 2e51785a6..8234ba078 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.31 2001/04/15 16:58:03 markus Exp $"); 39RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $");
40 40
41#include <openssl/err.h> 41#include <openssl/err.h>
42#include <openssl/evp.h> 42#include <openssl/evp.h>
@@ -447,7 +447,7 @@ key_load_private_pem(int fd, int type, const char *passphrase,
447 } 447 }
448 pk = PEM_read_PrivateKey(fp, NULL, NULL, (char *)passphrase); 448 pk = PEM_read_PrivateKey(fp, NULL, NULL, (char *)passphrase);
449 if (pk == NULL) { 449 if (pk == NULL) {
450 error("PEM_read_PrivateKey failed"); 450 debug("PEM_read_PrivateKey failed");
451 (void)ERR_get_error(); 451 (void)ERR_get_error();
452 } else if (pk->type == EVP_PKEY_RSA && 452 } else if (pk->type == EVP_PKEY_RSA &&
453 (type == KEY_UNSPEC||type==KEY_RSA)) { 453 (type == KEY_UNSPEC||type==KEY_RSA)) {