- markus@cvs.openbsd.org 2001/10/06 11:18:19

     [sshconnect1.c sshconnect2.c sshconnect.c]
     unify hostkey check error messages, simplify prompt.

diff --git a/ChangeLog b/ChangeLog
index 20a86d1d8ba4517d3a51e037fe250330a640ffb5..863868db1239d1a6698a48a49eeb1bfa7801b2d7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -15,6 +15,9 @@
    - markus@cvs.openbsd.org 2001/10/06 00:36:42
      [session.c]
      fix typo in error message, sync with do_exec_nopty
+   - markus@cvs.openbsd.org 2001/10/06 11:18:19
+     [sshconnect1.c sshconnect2.c sshconnect.c]
+     unify hostkey check error messages, simplify prompt.
 
 20011007
  - (bal) ssh-copy-id corrected permissions for .ssh/ and authorized_keys.

diff --git a/sshconnect.c b/sshconnect.c
index ed2125230dee86569556bf6399b04d2957959914..76b1a27038a422cbee62d64311f02d5e9fb90d00 100644 (file)
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.112 2001/10/06 00:14:50 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.113 2001/10/06 11:18:19 markus Exp $");
 
 #include <openssl/bn.h>
 
@@ -506,8 +506,8 @@ confirm(const char *prompt)
        if (f == NULL)
                return 0;
        fflush(stdout);
+       fprintf(stderr, "%s", prompt);
        while (1) {
-               fprintf(stderr, "%s", prompt);
                if (fgets(buf, sizeof(buf), f) == NULL) {
                        fprintf(stderr, "\n");
                        strlcpy(buf, "no", sizeof buf);
@@ -520,7 +520,7 @@ confirm(const char *prompt)
                else if (strcmp(buf, "no") == 0)
                        retval = 0;
                else
-                       fprintf(stderr, "Please type 'yes' or 'no'.\n");
+                       fprintf(stderr, "Please type 'yes' or 'no': ");
 
                if (retval != -1) {
                        if (f != stdin)
@@ -703,7 +703,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                            "(yes/no)? ", host, ip, type, fp);
                        xfree(fp);
                        if (!confirm(prompt)) {
-                               log("Aborted by user!");
                                goto fail;
                        }
                }
@@ -821,7 +820,6 @@ check_host_key(char *host, struct sockaddr *hostaddr, Key *host_key,
                } else if (options.strict_host_key_checking == 2) {
                        if (!confirm("Are you sure you want " 
                            "to continue connecting (yes/no)? ")) {
-                               log("Aborted by user!");
                                goto fail;
                        }
                }

diff --git a/sshconnect1.c b/sshconnect1.c
index 05cd9f6d688d603ad52c31989a0dcc5ee1253a7a..d6b862352963d6759972b0c147eea9e8e84e7fcc 100644 (file)
--- a/sshconnect1.c
+++ b/sshconnect1.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect1.c,v 1.40 2001/09/27 15:31:17 markus Exp $");
+RCSID("$OpenBSD: sshconnect1.c,v 1.41 2001/10/06 11:18:19 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/evp.h>
@@ -982,7 +982,7 @@ ssh_kex(char *host, struct sockaddr *hostaddr)
        k.type = KEY_RSA1;
        k.rsa = host_key;
        if (verify_host_key(host, hostaddr, &k) == -1)
-               fatal("host_key verification failed");
+               fatal("Host key verification failed.");
 
        client_flags = SSH_PROTOFLAG_SCREEN_NUMBER | SSH_PROTOFLAG_HOST_IN_FWD_OPEN;
 

diff --git a/sshconnect2.c b/sshconnect2.c
index a7beb3600eb28dc1fba8c26c1e8c02007a3b4261..705aa4561ae03cc53759fa9a5ac0726b8beb30d6 100644 (file)
--- a/sshconnect2.c
+++ b/sshconnect2.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect2.c,v 1.82 2001/08/31 11:46:39 markus Exp $");
+RCSID("$OpenBSD: sshconnect2.c,v 1.83 2001/10/06 11:18:19 markus Exp $");
 
 #include <openssl/bn.h>
 #include <openssl/md5.h>
@@ -75,7 +75,7 @@ static int
 verify_host_key_callback(Key *hostkey)
 {
        if (verify_host_key(xxx_host, xxx_hostaddr, hostkey) == -1)
-               fatal("verify_host_key failed");
+               fatal("Host key verification failed.");
        return 0;
 }