parent
80c6d77085
commit
2d0356f7de
|
@ -75,6 +75,9 @@
|
||||||
- markus@cvs.openbsd.org 2001/05/28 23:58:35
|
- markus@cvs.openbsd.org 2001/05/28 23:58:35
|
||||||
[packet.c packet.h sshconnect.c sshd.c]
|
[packet.c packet.h sshconnect.c sshd.c]
|
||||||
remove some lines, simplify.
|
remove some lines, simplify.
|
||||||
|
- markus@cvs.openbsd.org 2001/05/29 12:31:27
|
||||||
|
[authfile.c]
|
||||||
|
typo
|
||||||
|
|
||||||
20010528
|
20010528
|
||||||
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
|
- (tim) [conifgure.in] add setvbuf test needed for sftp-int.c
|
||||||
|
@ -5505,4 +5508,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1245 2001/06/05 21:09:18 mouring Exp $
|
$Id: ChangeLog,v 1.1246 2001/06/05 21:13:57 mouring Exp $
|
||||||
|
|
|
@ -36,7 +36,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
RCSID("$OpenBSD: authfile.c,v 1.34 2001/05/28 10:08:55 markus Exp $");
|
RCSID("$OpenBSD: authfile.c,v 1.35 2001/05/29 12:31:27 markus Exp $");
|
||||||
|
|
||||||
#include <openssl/err.h>
|
#include <openssl/err.h>
|
||||||
#include <openssl/evp.h>
|
#include <openssl/evp.h>
|
||||||
|
@ -561,7 +561,7 @@ key_load_private(const char *filename, const char *passphrase,
|
||||||
prv = key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL);
|
prv = key_load_private_pem(fd, KEY_UNSPEC, passphrase, NULL);
|
||||||
/* use the filename as a comment for PEM */
|
/* use the filename as a comment for PEM */
|
||||||
if (commentp && prv)
|
if (commentp && prv)
|
||||||
commentp = xstrdup(filename);
|
*commentp = xstrdup(filename);
|
||||||
} else {
|
} else {
|
||||||
/* it's a SSH v1 key if the public key part is readable */
|
/* it's a SSH v1 key if the public key part is readable */
|
||||||
key_free(pub);
|
key_free(pub);
|
||||||
|
|
Loading…
Reference in New Issue