summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog8
-rw-r--r--sshconnect2.c7
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4b5c54014..d4c6453d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
120010311
2 - OpenBSD CVS Sync
3 - markus@cvs.openbsd.org 2001/03/10 12:48:27
4 [sshconnect2.c]
5 ignore nonexisting private keys; report rjmooney@mediaone.net
6
120010310 720010310
2 - OpenBSD CVS Sync 8 - OpenBSD CVS Sync
3 - deraadt@cvs.openbsd.org 2001/03/09 03:14:39 9 - deraadt@cvs.openbsd.org 2001/03/09 03:14:39
@@ -4468,4 +4474,4 @@
4468 - Wrote replacements for strlcpy and mkdtemp 4474 - Wrote replacements for strlcpy and mkdtemp
4469 - Released 1.0pre1 4475 - Released 1.0pre1
4470 4476
4471$Id: ChangeLog,v 1.933 2001/03/09 19:48:37 mouring Exp $ 4477$Id: ChangeLog,v 1.934 2001/03/10 17:08:59 mouring Exp $
diff --git a/sshconnect2.c b/sshconnect2.c
index 81e1aef93..646bb18f3 100644
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: sshconnect2.c,v 1.51 2001/03/08 21:42:33 markus Exp $"); 26RCSID("$OpenBSD: sshconnect2.c,v 1.52 2001/03/10 12:48:27 markus Exp $");
27 27
28#include <openssl/bn.h> 28#include <openssl/bn.h>
29#include <openssl/md5.h> 29#include <openssl/md5.h>
@@ -895,7 +895,12 @@ load_identity_file(char *filename)
895 Key *private; 895 Key *private;
896 char prompt[300], *passphrase; 896 char prompt[300], *passphrase;
897 int success = 0, quit, i; 897 int success = 0, quit, i;
898 struct stat st;
898 899
900 if (stat(filename, &st) < 0) {
901 debug3("no such identity: %s", filename);
902 return NULL;
903 }
899 private = key_new(KEY_UNSPEC); 904 private = key_new(KEY_UNSPEC);
900 if (!load_private_key(filename, "", private, NULL)) { 905 if (!load_private_key(filename, "", private, NULL)) {
901 if (options.batch_mode) { 906 if (options.batch_mode) {