INCOMPATIBLE CHANGE to the SSH2 private key file format. There is

[u/mdw/putty] / puttygen.c

diff --git a/puttygen.c b/puttygen.c
index 7c3ef0d..689a383 100644 (file)
--- a/puttygen.c
+++ b/puttygen.c
@@ -44,6 +44,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 +305,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 +406,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;
@@ -519,7 +544,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 +555,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);
@@ -561,7 +586,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
                       IDC_BITSSTATIC, IDC_BITS, 20);
            endbox(&cp);
        }
-       CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2RSA, IDC_KEYSSH1);
+       CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2DSA, IDC_KEYSSH1);
        SetDlgItemInt(hwnd, IDC_BITS, DEFAULT_KEYSIZE, FALSE);
 
        /*
@@ -683,6 +708,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
                EnableWindow(GetDlgItem(hwnd, IDC_SAVEPUB), 0);
                EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH1), 0);
                EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 0);
+               EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 0);
                EnableWindow(GetDlgItem(hwnd, IDC_BITS), 0);
                state->key_exists = FALSE;
                SetDlgItemText(hwnd, IDC_GENERATING, entropy_msg);
@@ -868,6 +894,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
                        EnableWindow(GetDlgItem(hwnd, IDC_SAVEPUB), 1);
                        EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH1), 1);
                        EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 1);
+                       EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 1);
                        EnableWindow(GetDlgItem(hwnd, IDC_BITS), 1);
                        /*
                         * Now update the key controls with all the
@@ -956,6 +983,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg,
        EnableWindow(GetDlgItem(hwnd, IDC_SAVEPUB), 1);
        EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH1), 1);
        EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 1);
+       EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 1);
        EnableWindow(GetDlgItem(hwnd, IDC_BITS), 1);
        if (state->ssh2) {
            if (state->is_dsa) {