X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/d1622aed96258feca49be59e4459f4b29027492a..fe50e8140a2dbb3ba357a0ab777f34e07d568c23:/winstore.c

diff --git a/winstore.c b/winstore.c
index 48d4f6cd..51f4ee7a 100644
--- a/winstore.c
+++ b/winstore.c
@@ -4,6 +4,13 @@
  */
 
 #include <windows.h>
+#ifndef AUTO_WINSOCK
+#ifdef WINSOCK_TWO
+#include <winsock2.h>
+#else
+#include <winsock.h>
+#endif
+#endif
 #include <stdio.h>
 #include "putty.h"
 #include "storage.h"
@@ -154,12 +161,6 @@ void del_settings (char *sessionname) {
     RegCloseKey(subkey1);
 }
 
-static void hostkey_regname(char *buffer, char *hostname, char *keytype) {
-    strcpy(buffer, keytype);
-    strcat(buffer, "@");
-    mungestr(hostname, buffer + strlen(buffer));
-}
-
 struct enumsettings {
     HKEY key;
     int i;
@@ -201,7 +202,17 @@ void enum_settings_finish(void *handle) {
     free(e);
 }
 
-int verify_host_key(char *hostname, char *keytype, char *key) {
+static void hostkey_regname(char *buffer, char *hostname,
+                            int port, char *keytype) {
+    int len;
+    strcpy(buffer, keytype);
+    strcat(buffer, "@");
+    len = strlen(buffer);
+    len += sprintf(buffer+len, "%d:", port);
+    mungestr(hostname, buffer + strlen(buffer));
+}
+
+int verify_host_key(char *hostname, int port, char *keytype, char *key) {
     char *otherstr, *regname;
     int len;
     HKEY rkey;
@@ -216,11 +227,9 @@ int verify_host_key(char *hostname, char *keytype, char *key) {
      * says.
      */
     otherstr = smalloc(len);
-    regname = smalloc(3*(strlen(hostname)+strlen(keytype))+5);
-    if (!otherstr || !regname)
-	fatalbox("Out of memory");
+    regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
 
-    hostkey_regname(regname, hostname, keytype);
+    hostkey_regname(regname, hostname, port, keytype);
 
     if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
 		     &rkey) != ERROR_SUCCESS)
@@ -236,7 +245,7 @@ int verify_host_key(char *hostname, char *keytype, char *key) {
          * another trick, which is to look up the _old_ key format
          * under just the hostname and translate that.
          */
-        char *justhost = regname + 1 + strlen(keytype);
+        char *justhost = regname + 1 + strcspn(regname, ":");
         char *oldstyle = smalloc(len + 10);   /* safety margin */
         readlen = len;
         ret = RegQueryValueEx(rkey, justhost, NULL, &type,
@@ -306,15 +315,13 @@ int verify_host_key(char *hostname, char *keytype, char *key) {
         return 0;                      /* key matched OK in registry */
 }
 
-void store_host_key(char *hostname, char *keytype, char *key) {
+void store_host_key(char *hostname, int port, char *keytype, char *key) {
     char *regname;
     HKEY rkey;
 
-    regname = smalloc(3*(strlen(hostname)+strlen(keytype))+5);
-    if (!regname)
-	fatalbox("Out of memory");
+    regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
 
-    hostkey_regname(regname, hostname, keytype);
+    hostkey_regname(regname, hostname, port, keytype);
 
     if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
 		     &rkey) != ERROR_SUCCESS)