X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/00060c727dbea5a1d510703df216447511c9ddc8..3ca5c28cafade2c9e0ada4d5b30c1d9b1be32f4c:/puttygen.c

diff --git a/puttygen.c b/puttygen.c
index 8a5c3c99..330176c6 100644
--- a/puttygen.c
+++ b/puttygen.c
@@ -18,6 +18,8 @@
 
 #define DEFAULT_KEYSIZE 1024
 
+static int requested_help;
+
 /* ----------------------------------------------------------------------
  * Progress report code. This is really horrible :-)
  */
@@ -44,6 +46,9 @@ static void progress_update(void *param, int action, int phase, int iprogress)
     if (action < PROGFN_READY && p->nphases < phase)
 	p->nphases = phase;
     switch (action) {
+      case PROGFN_INITIALISE:
+	p->nphases = 0;
+	break;
       case PROGFN_LIN_PHASE:
 	p->phases[phase-1].exponential = 0;
 	p->phases[phase-1].mult = p->phases[phase].total / progress;
@@ -302,6 +307,8 @@ static DWORD WINAPI generate_rsa_key_thread(void *param)
     struct progress prog;
     prog.progbar = params->progressbar;
 
+    progress_update(&prog, PROGFN_INITIALISE, 0, 0);
+
     if (params->is_dsa)
 	dsa_generate(params->dsskey, params->keysize, progress_update, &prog);
     else
@@ -401,6 +408,26 @@ static int save_ssh1_pubkey(char *filename, struct RSAKey *key)
     return 1;
 }
 
+/*
+ * Warn about the obsolescent key file format.
+ */
+void old_keyfile_warning(void)
+{
+    static const char mbtitle[] = "PuTTY Key File Warning";
+    static const char message[] =
+	"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"
+	"PuTTY may stop supporting this private key format,\n"
+	"so we recommend you convert your key to the new\n"
+	"format.\n"
+	"\n"
+	"Once the key is loaded into PuTTYgen, you can perform\n"
+	"this conversion simply by saving it again.";
+
+    MessageBox(NULL, message, mbtitle, MB_OK);
+}
+
 static int save_ssh2_pubkey(char *filename, struct ssh2_userkey *key)
 {
     unsigned char *pub_blob;
@@ -493,6 +520,17 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 
     switch (msg) {
       case WM_INITDIALOG:
+        if (help_path)
+            SetWindowLong(hwnd, GWL_EXSTYLE,
+                          GetWindowLong(hwnd, GWL_EXSTYLE) | WS_EX_CONTEXTHELP);
+        else {
+            /*
+             * If we add a Help button, this is where we destroy it
+             * if the help file isn't present.
+             */
+        }
+        requested_help = FALSE;
+
 	/*
 	 * Centre the window.
 	 */
@@ -519,7 +557,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 
 	    /* Accelerators used: acglops1rbd */
 
-	    ctlposinit(&cp, hwnd, 10, 10, 10);
+	    ctlposinit(&cp, hwnd, 4, 4, 4);
 	    bartitle(&cp, "Public and private key generation for PuTTY",
 		     IDC_TITLE);
 	    beginbox(&cp, "Key", IDC_BOX_KEY);
@@ -530,7 +568,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 	    progressbar(&cp2, IDC_PROGRESS);
 	    bigeditctrl(&cp,
 			"&Public key for pasting into authorized_keys file:",
-			IDC_PKSTATIC, IDC_KEYDISPLAY, 7);
+			IDC_PKSTATIC, IDC_KEYDISPLAY, 5);
 	    SendDlgItemMessage(hwnd, IDC_KEYDISPLAY, EM_SETREADONLY, 1, 0);
 	    staticedit(&cp, "Key fingerprint:", IDC_FPSTATIC,
 		       IDC_FINGERPRINT, 75);
@@ -1042,9 +1080,62 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
 	hidemany(hwnd, generating_ids, TRUE);
 	hidemany(hwnd, gotkey_ids, FALSE);
 	break;
+      case WM_HELP:
+        if (help_path) {
+            int id = ((LPHELPINFO)lParam)->iCtrlId;
+            char *cmd = NULL;
+            switch (id) {
+              case IDC_GENERATING:
+              case IDC_PROGRESS:
+              case IDC_GENSTATIC:
+              case IDC_GENERATE:
+                cmd = "JI(`',`puttygen.generate')"; break;
+              case IDC_PKSTATIC:
+              case IDC_KEYDISPLAY:
+                cmd = "JI(`',`puttygen.pastekey')"; break;
+              case IDC_FPSTATIC:
+              case IDC_FINGERPRINT:
+                cmd = "JI(`',`puttygen.fingerprint')"; break;
+              case IDC_COMMENTSTATIC:
+              case IDC_COMMENTEDIT:
+                cmd = "JI(`',`puttygen.comment')"; break;
+              case IDC_PASSPHRASE1STATIC:
+              case IDC_PASSPHRASE1EDIT:
+              case IDC_PASSPHRASE2STATIC:
+              case IDC_PASSPHRASE2EDIT:
+                cmd = "JI(`',`puttygen.passphrase')"; break;
+              case IDC_LOADSTATIC:
+              case IDC_LOAD:
+                cmd = "JI(`',`puttygen.load')"; break;
+              case IDC_SAVESTATIC:
+              case IDC_SAVE:
+                cmd = "JI(`',`puttygen.savepriv')"; break;
+              case IDC_SAVEPUB:
+                cmd = "JI(`',`puttygen.savepub')"; break;
+              case IDC_TYPESTATIC:
+              case IDC_KEYSSH1:
+              case IDC_KEYSSH2RSA:
+              case IDC_KEYSSH2DSA:
+                cmd = "JI(`',`puttygen.keytype')"; break;
+              case IDC_BITSSTATIC:
+              case IDC_BITS:
+                cmd = "JI(`',`puttygen.bits')"; break;
+            }
+            if (cmd) {
+                WinHelp(hwnd, help_path, HELP_COMMAND, (DWORD)cmd);
+                requested_help = TRUE;
+            } else {
+                MessageBeep(0);
+            }
+        }
+        break;
       case WM_CLOSE:
 	state = (struct MainDlgState *) GetWindowLong(hwnd, GWL_USERDATA);
 	sfree(state);
+        if (requested_help) {
+            WinHelp(hwnd, help_path, HELP_QUIT, 0);
+            requested_help = FALSE;
+        }
 	EndDialog(hwnd, 1);
 	return 0;
     }
@@ -1055,6 +1146,27 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
     InitCommonControls();
     hinst = inst;
+
+    /*
+     * See if we can find our Help file.
+     */
+    {
+        char b[2048], *p, *q, *r;
+        FILE *fp;
+        GetModuleFileName(NULL, b, sizeof(b) - 1);
+        r = b;
+        p = strrchr(b, '\\');
+        if (p && p >= r) r = p+1;
+        q = strrchr(b, ':');
+        if (q && q >= r) r = q+1;
+        strcpy(r, "putty.hlp");
+        if ( (fp = fopen(b, "r")) != NULL) {
+            help_path = dupstr(b);
+            fclose(fp);
+        } else
+            help_path = NULL;
+    }
+
     random_init();
     return DialogBox(hinst, MAKEINTRESOURCE(201), NULL,
 		     MainDlgProc) != IDOK;