summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-04-19 20:47:10 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-04-19 20:47:10 +0000
commit648772faf5ed2ee182af0c4a031014edd7a89978 (patch)
tree5bf959b020901a2f9eb015d27d313a665da9fc7a
parent671388f2338ddb335b01f1c3cf545caa9f90649e (diff)
- markus@cvs.openbsd.org 2001/04/18 23:44:51
[authfile.c] error->debug; noted by fries@
-rw-r--r--ChangeLog5
-rw-r--r--authfile.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 488b1e6a..3d774848 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,9 @@
[auth2.c compat.c sshconnect2.c]
more ssh v2 hostbased-auth interop: ssh.com >= 2.1.0 works now
(however the 2.1.0 server seems to work only if debug is enabled...)
+ - markus@cvs.openbsd.org 2001/04/18 23:44:51
+ [authfile.c]
+ error->debug; noted by fries@
20010418
- OpenBSD CVS Sync
@@ -5178,4 +5181,4 @@
- Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1
-$Id: ChangeLog,v 1.1144 2001/04/19 20:40:45 mouring Exp $
+$Id: ChangeLog,v 1.1145 2001/04/19 20:47:10 mouring Exp $
diff --git a/authfile.c b/authfile.c
index 2e51785a..8234ba07 100644
--- a/authfile.c
+++ b/authfile.c
@@ -36,7 +36,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: authfile.c,v 1.31 2001/04/15 16:58:03 markus Exp $");
+RCSID("$OpenBSD: authfile.c,v 1.32 2001/04/18 23:44:51 markus Exp $");
#include <openssl/err.h>
#include <openssl/evp.h>
@@ -447,7 +447,7 @@ key_load_private_pem(int fd, int type, const char *passphrase,
}
pk = PEM_read_PrivateKey(fp, NULL, NULL, (char *)passphrase);
if (pk == NULL) {
- error("PEM_read_PrivateKey failed");
+ debug("PEM_read_PrivateKey failed");
(void)ERR_get_error();
} else if (pk->type == EVP_PKEY_RSA &&
(type == KEY_UNSPEC||type==KEY_RSA)) {