Consistently use a single notation to refer to SSH protocol versions, as

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

diff --git a/windows/windlg.c b/windows/windlg.c
index 04470cd..0fd1acb 100644 (file)
--- a/windows/windlg.c
+++ b/windows/windlg.c
@@ -40,8 +40,6 @@ static struct dlgparam dp;
 static char **events = NULL;
 static int nevents = 0, negsize = 0;
 
-static int requested_help;
-
 extern Config cfg;                    /* defined in window.c */
 
 struct sesslist sesslist;             /* exported to window.c */
@@ -229,6 +227,57 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg,
     return 0;
 }
 
+static int SaneDialogBox(HINSTANCE hinst,
+                        LPCTSTR tmpl,
+                        HWND hwndparent,
+                        DLGPROC lpDialogFunc)
+{
+    WNDCLASS wc;
+    HWND hwnd;
+    MSG msg;
+    int flags;
+    int ret;
+    int gm;
+
+    wc.style = CS_DBLCLKS | CS_SAVEBITS | CS_BYTEALIGNWINDOW;
+    wc.lpfnWndProc = DefDlgProc;
+    wc.cbClsExtra = 0;
+    wc.cbWndExtra = DLGWINDOWEXTRA + 8;
+    wc.hInstance = hinst;
+    wc.hIcon = NULL;
+    wc.hCursor = LoadCursor(NULL, IDC_ARROW);
+    wc.hbrBackground = (HBRUSH) (COLOR_BACKGROUND +1);
+    wc.lpszMenuName = NULL;
+    wc.lpszClassName = "PuTTYConfigBox";
+    RegisterClass(&wc);
+
+    hwnd = CreateDialog(hinst, tmpl, hwndparent, lpDialogFunc);
+
+    SetWindowLong(hwnd, BOXFLAGS, 0); /* flags */
+    SetWindowLong(hwnd, BOXRESULT, 0); /* result from SaneEndDialog */
+
+    while ((gm=GetMessage(&msg, NULL, 0, 0)) > 0) {
+       flags=GetWindowLong(hwnd, BOXFLAGS);
+       if (!(flags & DF_END) && !IsDialogMessage(hwnd, &msg))
+           DispatchMessage(&msg);
+       if (flags & DF_END)
+           break;
+    }
+
+    if (gm == 0)
+        PostQuitMessage(msg.wParam); /* We got a WM_QUIT, pass it on */
+
+    ret=GetWindowLong(hwnd, BOXRESULT);
+    DestroyWindow(hwnd);
+    return ret;
+}
+
+static void SaneEndDialog(HWND hwnd, int ret)
+{
+    SetWindowLong(hwnd, BOXRESULT, ret);
+    SetWindowLong(hwnd, BOXFLAGS, DF_END);
+}
+
 /*
  * Null dialog procedure.
  */
@@ -701,8 +750,9 @@ void showabout(HWND hwnd)
     DialogBox(hinst, MAKEINTRESOURCE(IDD_ABOUTBOX), hwnd, AboutProc);
 }
 
-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;
 
@@ -744,34 +794,41 @@ 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;
-       char *message, *title;
-       message = dupprintf(wrongmsg, appname, keytype, fingerprint, appname);
-       title = dupprintf(mbtitle, appname);
-       mbret = MessageBox(NULL, message, title,
-                          MB_ICONWARNING | MB_YESNOCANCEL | MB_DEFBUTTON3);
-       sfree(message);
-       sfree(title);
-       if (mbret == IDYES)
+       char *text = dupprintf(wrongmsg, appname, keytype, fingerprint,
+                              appname);
+       char *caption = dupprintf(mbtitle, appname);
+       mbret = message_box(text, caption,
+                           MB_ICONWARNING | MB_YESNOCANCEL | MB_DEFBUTTON3,
+                           HELPCTXID(errors_hostkey_changed));
+       assert(mbret==IDYES || mbret==IDNO || mbret==IDCANCEL);
+       sfree(text);
+       sfree(caption);
+       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;
-       char *message, *title;
-       message = dupprintf(absentmsg, keytype, fingerprint, appname);
-       title = dupprintf(mbtitle, appname);
-       mbret = MessageBox(NULL, message, title,
-                          MB_ICONWARNING | MB_YESNOCANCEL | MB_DEFBUTTON3);
-       sfree(message);
-       sfree(title);
-       if (mbret == IDYES)
+       char *text = dupprintf(absentmsg, keytype, fingerprint, appname);
+       char *caption = dupprintf(mbtitle, appname);
+       mbret = message_box(text, caption,
+                           MB_ICONWARNING | MB_YESNOCANCEL | MB_DEFBUTTON3,
+                           HELPCTXID(errors_hostkey_absent));
+       assert(mbret==IDYES || mbret==IDNO || mbret==IDCANCEL);
+       sfree(text);
+       sfree(caption);
+       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;
     }
 }
 
@@ -779,7 +836,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[] =
@@ -797,16 +855,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"
@@ -850,7 +909,7 @@ void old_keyfile_warning(void)
 {
     static const char mbtitle[] = "%s Key File Warning";
     static const char message[] =
-       "You are loading an SSH 2 private key which has an\n"
+       "You are loading an SSH-2 private key which has an\n"
        "old version of the file format. This means your key\n"
        "file is not fully tamperproof. Future versions of\n"
        "%s may stop supporting this private key format,\n"