The WinSock library is now loaded at run-time, which means we can

[u/mdw/putty] / console.c

diff --git a/console.c b/console.c
index fe20134..c589a45 100644 (file)
--- a/console.c
+++ b/console.c
@@ -3,8 +3,6 @@
  * the console PuTTY tools
  */
 
  * the console PuTTY tools
  */
 

-#include <windows.h>
-

 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <stdarg.h>


@@ -26,7 +24,6 @@ void cleanup_exit(int code)
      * Clean up.
      */
     sk_cleanup();
      * Clean up.
      */
     sk_cleanup();

-    WSACleanup();

 
     random_save_seed();
 #ifdef MSCRYPTOAPI
 
     random_save_seed();
 #ifdef MSCRYPTOAPI


@@ -47,14 +44,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 +68,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 +78,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 +103,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);
     }