Ahem. Fix my hostkey dialog fix so that storing the host key doesn't

[u/mdw/putty] / windows / windlg.c

diff --git a/windows/windlg.c b/windows/windlg.c
index 8903871..3a04689 100644 (file)
--- a/windows/windlg.c
+++ b/windows/windlg.c
@@ -723,8 +723,9 @@ static VOID CALLBACK verify_ssh_host_key_help(LPHELPINFO lpHelpInfo)
     }
 }
 
-void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
-                        char *keystr, char *fingerprint)
+int verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
+                        char *keystr, char *fingerprint,
+                        void (*callback)(void *ctx, int result), void *ctx)
 {
     int ret;
 
@@ -768,6 +769,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
      * callback function for the Help button.
      */
     mbox.cbSize = sizeof(mbox);
+    mbox.hInstance = hinst;
     mbox.hwndOwner = hwnd;
     mbox.lpfnMsgBoxCallback = &verify_ssh_host_key_help;
     mbox.dwLanguageId = LANG_NEUTRAL;
@@ -782,7 +784,7 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
     ret = verify_host_key(host, port, keytype, keystr);
 
     if (ret == 0)                     /* success - key matched OK */
-       return;
+       return 1;
     if (ret == 2) {                   /* key was different */
        int mbret;
        mbox.lpszText = dupprintf(wrongmsg, appname, keytype, fingerprint,
@@ -792,12 +794,15 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        mbox.dwStyle = MB_ICONWARNING | MB_YESNOCANCEL | MB_DEFBUTTON3 |
            help_button;
        mbret = MessageBoxIndirect(&mbox);
+       assert(mbret==IDYES || mbret==IDNO || mbret==IDCANCEL);
        sfree((void *)mbox.lpszText);
        sfree((void *)mbox.lpszCaption);
-       if (mbret == IDYES)
+       if (mbret == IDYES) {
            store_host_key(host, port, keytype, keystr);
-       if (mbret == IDCANCEL)
-           cleanup_exit(0);
+           return 1;
+       } else if (mbret == IDNO)
+           return 1;
+        return 0;
     }
     if (ret == 1) {                   /* key was absent */
        int mbret;
@@ -807,12 +812,14 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
        mbox.dwStyle = MB_ICONWARNING | MB_YESNOCANCEL | MB_DEFBUTTON3 |
            help_button;
        mbret = MessageBoxIndirect(&mbox);
+       assert(mbret==IDYES || mbret==IDNO || mbret==IDCANCEL);
        sfree((void *)mbox.lpszText);
        sfree((void *)mbox.lpszCaption);
        if (mbret == IDYES)
            store_host_key(host, port, keytype, keystr);
-       if (mbret == IDCANCEL)
-           cleanup_exit(0);
+       if (mbret == IDNO)
+           return 1;
+        return 0;
     }
 }
 
@@ -820,7 +827,8 @@ void verify_ssh_host_key(void *frontend, char *host, int port, char *keytype,
  * Ask whether the selected algorithm is acceptable (since it was
  * below the configured 'warn' threshold).
  */
-void askalg(void *frontend, const char *algtype, const char *algname)
+int askalg(void *frontend, const char *algtype, const char *algname,
+          void (*callback)(void *ctx, int result), void *ctx)
 {
     static const char mbtitle[] = "%s Security Alert";
     static const char msg[] =
@@ -838,16 +846,17 @@ void askalg(void *frontend, const char *algtype, const char *algname)
     sfree(message);
     sfree(title);
     if (mbret == IDYES)
-       return;
+       return 1;
     else
-       cleanup_exit(0);
+       return 0;
 }
 
 /*
  * Ask whether to wipe a session log file before writing to it.
  * Returns 2 for wipe, 1 for append, 0 for cancel (don't log).
  */
-int askappend(void *frontend, Filename filename)
+int askappend(void *frontend, Filename filename,
+             void (*callback)(void *ctx, int result), void *ctx)
 {
     static const char msgtemplate[] =
        "The session log file \"%.*s\" already exists.\n"