RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-28 04:52:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2001/04/18 23:44:51

Browse Source 
[authfile.c]
     error->debug; noted by fries@
This commit is contained in:
Ben Lindstrom 2001-04-19 20:47:10 +00:00
parent 671388f233
commit 648772faf5
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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 $

4
authfile.c
View File

@ -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)) {