1 files changed, 34 insertions, 16 deletions

diff --git a/sshconnect1.c b/sshconnect1.c
index 440d7c5bd..fd07bbf74 100644
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: sshconnect1.c,v 1.70 2006/11/06 21:25:28 markus Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -13,28 +14,38 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.62 2005/10/30 08:52:18 djm Exp $");
+
+#include <sys/types.h>
+#include <sys/socket.h>
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
 
+#include <stdarg.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <pwd.h>
+
+#include "xmalloc.h"
 #include "ssh.h"
 #include "ssh1.h"
-#include "xmalloc.h"
 #include "rsa.h"
 #include "buffer.h"
 #include "packet.h"
+#include "key.h"
+#include "cipher.h"
 #include "kex.h"
 #include "uidswap.h"
 #include "log.h"
 #include "readconf.h"
-#include "key.h"
 #include "authfd.h"
 #include "sshconnect.h"
 #include "authfile.h"
 #include "misc.h"
-#include "cipher.h"
 #include "canohost.h"
+#include "hostfile.h"
 #include "auth.h"
 
 /* Session id for the current session. */
@@ -197,7 +208,7 @@ try_rsa_authentication(int idx)
         BIGNUM *challenge;
         Key *public, *private;
         char buf[300], *passphrase, *comment, *authfile;
-        int i, type, quit;
+        int i, perm_ok = 1, type, quit;
 
         public = options.identity_keys[idx];
         authfile = options.identity_files[idx];
@@ -243,15 +254,16 @@ try_rsa_authentication(int idx)
         if (public->flags & KEY_FLAG_EXT)
                 private = public;
         else
-                private = key_load_private_type(KEY_RSA1, authfile, "", NULL);
-        if (private == NULL && !options.batch_mode) {
+                private = key_load_private_type(KEY_RSA1, authfile, "", NULL,
+                    &perm_ok);
+        if (private == NULL && !options.batch_mode && perm_ok) {
                 snprintf(buf, sizeof(buf),
                     "Enter passphrase for RSA key '%.100s': ", comment);
                 for (i = 0; i < options.number_of_password_prompts; i++) {
                         passphrase = read_passphrase(buf, 0);
                         if (strcmp(passphrase, "") != 0) {
                                 private = key_load_private_type(KEY_RSA1,
-                                    authfile, passphrase, NULL);
+                                    authfile, passphrase, NULL, NULL);
                                 quit = 0;
                         } else {
                                 debug2("no passphrase given, try next key");
@@ -268,7 +280,7 @@ try_rsa_authentication(int idx)
         xfree(comment);
 
         if (private == NULL) {
-                if (!options.batch_mode)
+                if (!options.batch_mode && perm_ok)
                         error("Bad passphrase.");
 
                 /* Send a dummy response packet to avoid protocol error. */
@@ -551,14 +563,20 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
          * the first 16 bytes of the session id.
          */
         if ((key = BN_new()) == NULL)
-                fatal("respond_to_rsa_challenge: BN_new failed");
-        BN_set_word(key, 0);
+                fatal("ssh_kex: BN_new failed");
+        if (BN_set_word(key, 0) == 0)
+                fatal("ssh_kex: BN_set_word failed");
         for (i = 0; i < SSH_SESSION_KEY_LENGTH; i++) {
-                BN_lshift(key, key, 8);
-                if (i < 16)
-                        BN_add_word(key, session_key[i] ^ session_id[i]);
-                else
-                        BN_add_word(key, session_key[i]);
+                if (BN_lshift(key, key, 8) == 0)
+                        fatal("ssh_kex: BN_lshift failed");
+                if (i < 16) {
+                        if (BN_add_word(key, session_key[i] ^ session_id[i])
+                            == 0)
+                                fatal("ssh_kex: BN_add_word failed");
+                } else {
+                        if (BN_add_word(key, session_key[i]) == 0)
+                                fatal("ssh_kex: BN_add_word failed");
+                }
         }
 
         /*