[originally from svn r643]
void logevent (char *);
void showeventlog (HWND);
void showabout (HWND);
void logevent (char *);
void showeventlog (HWND);
void showabout (HWND);
-void verify_ssh_host_key(char *host, char *keytype,
+void verify_ssh_host_key(char *host, int port, char *keytype,
char *keystr, char *fingerprint);
void get_sesslist(int allocate);
void registry_cleanup(void);
char *keystr, char *fingerprint);
void get_sesslist(int allocate);
void registry_cleanup(void);
int (*ssh_get_password)(const char *prompt, char *str, int maxlen) = NULL;
static char *savedhost;
int (*ssh_get_password)(const char *prompt, char *str, int maxlen) = NULL;
static char *savedhost;
static int ssh_send_ok;
/*
static int ssh_send_ok;
/*
if (port < 0)
port = 22; /* default ssh port */
if (port < 0)
port = 22; /* default ssh port */
#ifdef FWHACK
FWhost = host;
#ifdef FWHACK
FWhost = host;
fatalbox("Out of memory");
rsastr_fmt(keystr, &hostkey);
rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey);
fatalbox("Out of memory");
rsastr_fmt(keystr, &hostkey);
rsa_fingerprint(fingerprint, sizeof(fingerprint), &hostkey);
- verify_ssh_host_key(savedhost, "rsa", keystr, fingerprint);
+ verify_ssh_host_key(savedhost, savedport, "rsa", keystr, fingerprint);
*/
keystr = hostkey->fmtkey();
fingerprint = hostkey->fingerprint();
*/
keystr = hostkey->fmtkey();
fingerprint = hostkey->fingerprint();
- verify_ssh_host_key(savedhost, hostkey->keytype, keystr, fingerprint);
+ verify_ssh_host_key(savedhost, savedport, hostkey->keytype,
+ keystr, fingerprint);
logevent("Host key fingerprint is:");
logevent(fingerprint);
free(fingerprint);
logevent("Host key fingerprint is:");
logevent(fingerprint);
free(fingerprint);
* be 0 (entry matches database), 1 (entry is absent in database),
* or 2 (entry exists in database and is different).
*/
* be 0 (entry matches database), 1 (entry is absent in database),
* or 2 (entry exists in database and is different).
*/
-int verify_host_key(char *hostname, char *keytype, char *key);
+int verify_host_key(char *hostname, int port, char *keytype, char *key);
/*
* Write a host key into the database, overwriting any previous
* entry that might have been there.
*/
/*
* Write a host key into the database, overwriting any previous
* entry that might have been there.
*/
-void store_host_key(char *hostname, char *keytype, char *key);
+void store_host_key(char *hostname, int port, char *keytype, char *key);
/* ----------------------------------------------------------------------
* Functions to access PuTTY's random number seed file.
/* ----------------------------------------------------------------------
* Functions to access PuTTY's random number seed file.
-void verify_ssh_host_key(char *host, char *keytype,
+void verify_ssh_host_key(char *host, int port, char *keytype,
char *keystr, char *fingerprint) {
int ret;
char *keystr, char *fingerprint) {
int ret;
/*
* Verify the key against the registry.
*/
/*
* Verify the key against the registry.
*/
- ret = verify_host_key(host, keytype, keystr);
+ ret = verify_host_key(host, port, keytype, keystr);
if (ret == 0) /* success - key matched OK */
return;
if (ret == 0) /* success - key matched OK */
return;
mbret = MessageBox(NULL, message, mbtitle,
MB_ICONWARNING | MB_YESNOCANCEL);
if (mbret == IDYES)
mbret = MessageBox(NULL, message, mbtitle,
MB_ICONWARNING | MB_YESNOCANCEL);
if (mbret == IDYES)
- store_host_key(host, keytype, keystr);
+ store_host_key(host, port, keytype, keystr);
if (mbret == IDCANCEL)
exit(0);
}
if (mbret == IDCANCEL)
exit(0);
}
MB_ICONWARNING | MB_YESNO);
if (mbret == IDNO)
exit(0);
MB_ICONWARNING | MB_YESNO);
if (mbret == IDNO)
exit(0);
- store_host_key(host, keytype, keystr);
+ store_host_key(host, port, keytype, keystr);
-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;
struct enumsettings {
HKEY key;
int i;
-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;
char *otherstr, *regname;
int len;
HKEY rkey;
* says.
*/
otherstr = smalloc(len);
* says.
*/
otherstr = smalloc(len);
- regname = smalloc(3*(strlen(hostname)+strlen(keytype))+5);
+ regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
if (!otherstr || !regname)
fatalbox("Out of memory");
if (!otherstr || !regname)
fatalbox("Out of memory");
- hostkey_regname(regname, hostname, keytype);
+ hostkey_regname(regname, hostname, port, keytype);
if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
&rkey) != ERROR_SUCCESS)
if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
&rkey) != ERROR_SUCCESS)
* another trick, which is to look up the _old_ key format
* under just the hostname and translate that.
*/
* 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,
char *oldstyle = smalloc(len + 10); /* safety margin */
readlen = len;
ret = RegQueryValueEx(rkey, justhost, NULL, &type,
return 0; /* key matched OK in registry */
}
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;
char *regname;
HKEY rkey;
- regname = smalloc(3*(strlen(hostname)+strlen(keytype))+5);
+ regname = smalloc(3*(strlen(hostname)+strlen(keytype))+15);
if (!regname)
fatalbox("Out of memory");
if (!regname)
fatalbox("Out of memory");
- hostkey_regname(regname, hostname, keytype);
+ hostkey_regname(regname, hostname, port, keytype);
if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
&rkey) != ERROR_SUCCESS)
if (RegCreateKey(HKEY_CURRENT_USER, PUTTY_REG_POS "\\SshHostKeys",
&rkey) != ERROR_SUCCESS)