Control of 'addr' is now handed over to {platform_,}new_connection() and

[u/mdw/putty] / console.c

diff --git a/console.c b/console.c
index b51e7e7..039716c 100644 (file)
--- a/console.c
+++ b/console.c
@@ -47,14 +47,14 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        "The server's host key is not cached in the registry. You\n"
        "have no guarantee that the server is the computer you\n"
        "think it is.\n"
        "The server's host key is not cached in the registry. You\n"
        "have no guarantee that the server is the computer you\n"
        "think it is.\n"

-       "The server's key fingerprint is:\n"
+       "The server's %s key fingerprint is:\n"

        "%s\n"
        "Connection abandoned.\n";
     static const char absentmsg[] =
        "The server's host key is not cached in the registry. You\n"
        "have no guarantee that the server is the computer you\n"
        "think it is.\n"
        "%s\n"
        "Connection abandoned.\n";
     static const char absentmsg[] =
        "The server's host key is not cached in the registry. You\n"
        "have no guarantee that the server is the computer you\n"
        "think it is.\n"

-       "The server's key fingerprint is:\n"
+       "The server's %s key fingerprint is:\n"

        "%s\n"
        "If you trust this host, enter \"y\" to add the key to\n"
        "PuTTY's cache and carry on connecting.\n"
        "%s\n"
        "If you trust this host, enter \"y\" to add the key to\n"
        "PuTTY's cache and carry on connecting.\n"


@@ -71,7 +71,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        "server administrator has changed the host key, or you\n"
        "have actually connected to another computer pretending\n"
        "to be the server.\n"
        "server administrator has changed the host key, or you\n"
        "have actually connected to another computer pretending\n"
        "to be the server.\n"

-       "The new key fingerprint is:\n"
+       "The new %s key fingerprint is:\n"

        "%s\n"
        "Connection abandoned.\n";
     static const char wrongmsg[] =
        "%s\n"
        "Connection abandoned.\n";
     static const char wrongmsg[] =


@@ -81,7 +81,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        "server administrator has changed the host key, or you\n"
        "have actually connected to another computer pretending\n"
        "to be the server.\n"
        "server administrator has changed the host key, or you\n"
        "have actually connected to another computer pretending\n"
        "to be the server.\n"

-       "The new key fingerprint is:\n"
+       "The new %s key fingerprint is:\n"

        "%s\n"
        "If you were expecting this change and trust the new key,\n"
        "enter \"y\" to update PuTTY's cache and continue connecting.\n"
        "%s\n"
        "If you were expecting this change and trust the new key,\n"
        "enter \"y\" to update PuTTY's cache and continue connecting.\n"


@@ -106,18 +106,18 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
 
     if (ret == 2) {                   /* key was different */
        if (console_batch_mode) {
 
     if (ret == 2) {                   /* key was different */
        if (console_batch_mode) {

-           fprintf(stderr, wrongmsg_batch, fingerprint);
+           fprintf(stderr, wrongmsg_batch, keytype, fingerprint);

            cleanup_exit(1);
        }
            cleanup_exit(1);
        }

-       fprintf(stderr, wrongmsg, fingerprint);
+       fprintf(stderr, wrongmsg, keytype, fingerprint);

        fflush(stderr);
     }
     if (ret == 1) {                   /* key was absent */
        if (console_batch_mode) {
        fflush(stderr);
     }
     if (ret == 1) {                   /* key was absent */
        if (console_batch_mode) {

-           fprintf(stderr, absentmsg_batch, fingerprint);
+           fprintf(stderr, absentmsg_batch, keytype, fingerprint);

            cleanup_exit(1);
        }
            cleanup_exit(1);
        }

-       fprintf(stderr, absentmsg, fingerprint);
+       fprintf(stderr, absentmsg, keytype, fingerprint);

        fflush(stderr);
     }
 
        fflush(stderr);
     }
 


@@ -137,6 +137,10 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     }
 }
 
     }
 }
 

+void update_specials_menu(void *frontend)
+{
+}
+

 /*
  * Ask whether the selected cipher is acceptable (since it was
  * below the configured 'warn' threshold).
 /*
  * Ask whether the selected cipher is acceptable (since it was
  * below the configured 'warn' threshold).


@@ -266,7 +270,7 @@ void console_provide_logctx(void *logctx)
     console_logctx = logctx;
 }
 
     console_logctx = logctx;
 }
 

-void logevent(void *frontend, char *string)
+void logevent(void *frontend, const char *string)

 {
     if (console_logctx)
        log_eventlog(console_logctx, string);
 {
     if (console_logctx)
        log_eventlog(console_logctx, string);