X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/bdea0743e4f42352a813c2da3c267dcca6d6871c..3b4c589946c888bfee8bc84a75dd3a8cd249396c:/puttygen.c diff --git a/puttygen.c b/puttygen.c index 9b360905..8ce44b4a 100644 --- a/puttygen.c +++ b/puttygen.c @@ -5,10 +5,8 @@ #include #include #include -#ifndef NO_SECURITY -#include -#endif #include +#include #define PUTTY_DO_GLOBALS @@ -18,13 +16,7 @@ #define WM_DONEKEY (WM_XUSER + 1) -#define KEYSIZE 1024 - -/* - * TODO: - * - test the generated keys for actual working-RSA-key-hood - * - variable key size - */ +#define DEFAULT_KEYSIZE 1024 /* ---------------------------------------------------------------------- * Progress report code. This is really horrible :-) @@ -109,6 +101,21 @@ static int CALLBACK PassphraseProc(HWND hwnd, UINT msg, SetForegroundWindow(hwnd); SetWindowPos (hwnd, HWND_TOP, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE | SWP_SHOWWINDOW); + + /* + * Centre the window. + */ + { /* centre the window */ + RECT rs, rd; + HWND hw; + + hw = GetDesktopWindow(); + if (GetWindowRect (hw, &rs) && GetWindowRect (hwnd, &rd)) + MoveWindow (hwnd, (rs.right + rs.left + rd.left - rd.right)/2, + (rs.bottom + rs.top + rd.top - rd.bottom)/2, + rd.right-rd.left, rd.bottom-rd.top, TRUE); + } + p = (struct PassphraseProcStruct *)lParam; passphrase = p->passphrase; if (p->comment) @@ -184,6 +191,20 @@ static int CALLBACK LicenceProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case WM_INITDIALOG: + /* + * Centre the window. + */ + { /* centre the window */ + RECT rs, rd; + HWND hw; + + hw = GetDesktopWindow(); + if (GetWindowRect (hw, &rs) && GetWindowRect (hwnd, &rd)) + MoveWindow (hwnd, (rs.right + rs.left + rd.left - rd.right)/2, + (rs.bottom + rs.top + rd.top - rd.bottom)/2, + rd.right-rd.left, rd.bottom-rd.top, TRUE); + } + return 1; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -206,6 +227,20 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { case WM_INITDIALOG: + /* + * Centre the window. + */ + { /* centre the window */ + RECT rs, rd; + HWND hw; + + hw = GetDesktopWindow(); + if (GetWindowRect (hw, &rs) && GetWindowRect (hwnd, &rd)) + MoveWindow (hwnd, (rs.right + rs.left + rd.left - rd.right)/2, + (rs.bottom + rs.top + rd.top - rd.bottom)/2, + rd.right-rd.left, rd.bottom-rd.top, TRUE); + } + SetDlgItemText (hwnd, 100, ver); return 1; case WM_COMMAND: @@ -234,8 +269,8 @@ static int CALLBACK AboutProc (HWND hwnd, UINT msg, struct rsa_key_thread_params { HWND progressbar; /* notify this with progress */ HWND dialog; /* notify this on completion */ + int keysize; /* bits in key */ struct RSAKey *key; - struct RSAAux *aux; }; static DWORD WINAPI generate_rsa_key_thread(void *param) { struct rsa_key_thread_params *params = @@ -243,11 +278,11 @@ static DWORD WINAPI generate_rsa_key_thread(void *param) { struct progress prog; prog.progbar = params->progressbar; - rsa_generate(params->key, params->aux, KEYSIZE, progress_update, &prog); + rsa_generate(params->key, params->keysize, progress_update, &prog); PostMessage(params->dialog, WM_DONEKEY, 0, 0); - free(params); + sfree(params); return 0; } @@ -256,9 +291,12 @@ struct MainDlgState { int generation_thread_exists; int key_exists; int entropy_got, entropy_required, entropy_size; + int keysize; + int ssh2; + char **commentptr; /* points to key.comment or ssh2key.comment */ + struct ssh2_userkey ssh2key; unsigned *entropy; struct RSAKey key; - struct RSAAux aux; }; static void hidemany(HWND hwnd, const int *ids, int hideit) { @@ -267,21 +305,47 @@ static void hidemany(HWND hwnd, const int *ids, int hideit) { } } -static void setupbigedit(HWND hwnd, int id, struct RSAKey *key) { +static void setupbigedit1(HWND hwnd, int id, struct RSAKey *key) { char *buffer; char *dec1, *dec2; dec1 = bignum_decimal(key->exponent); dec2 = bignum_decimal(key->modulus); - buffer = malloc(strlen(dec1)+strlen(dec2)+ - strlen(key->comment)+30); + buffer = smalloc(strlen(dec1)+strlen(dec2)+ + strlen(key->comment)+30); sprintf(buffer, "%d %s %s %s", ssh1_bignum_bitcount(key->modulus), dec1, dec2, key->comment); SetDlgItemText(hwnd, id, buffer); - free(dec1); - free(dec2); - free(buffer); + sfree(dec1); + sfree(dec2); + sfree(buffer); +} + +static void setupbigedit2(HWND hwnd, int id, struct ssh2_userkey *key) { + unsigned char *pub_blob; + char *buffer, *p; + int pub_len, buflen; + int i; + + pub_blob = key->alg->public_blob(key->data, &pub_len); + buffer = smalloc(strlen(key->alg->name) + 4*((pub_len+2)/3) + + strlen(key->comment) + 3); + strcpy(buffer, key->alg->name); + p = buffer + strlen(buffer); + *p++ = ' '; + i = 0; + while (i < pub_len) { + int n = (pub_len-i < 3 ? pub_len-i : 3); + base64_encode_atom(pub_blob+i, n, p); + i += n; + p += 4; + } + *p++ = ' '; + strcpy(p, key->comment); + SetDlgItemText(hwnd, id, buffer); + sfree(pub_blob); + sfree(buffer); } /* @@ -292,7 +356,7 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, enum { controlidstart = 100, IDC_TITLE, - IDC_BOX_KEY, IDC_BOXT_KEY, + IDC_BOX_KEY, IDC_NOKEY, IDC_GENERATING, IDC_PROGRESS, @@ -301,10 +365,13 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, IDC_COMMENTSTATIC, IDC_COMMENTEDIT, IDC_PASSPHRASE1STATIC, IDC_PASSPHRASE1EDIT, IDC_PASSPHRASE2STATIC, IDC_PASSPHRASE2EDIT, - IDC_BOX_ACTIONS, IDC_BOXT_ACTIONS, + IDC_BOX_ACTIONS, IDC_GENSTATIC, IDC_GENERATE, IDC_LOADSTATIC, IDC_LOAD, IDC_SAVESTATIC, IDC_SAVE, + IDC_BOX_PARAMS, + IDC_TYPESTATIC, IDC_KEYSSH1, IDC_KEYSSH2RSA, + IDC_BITSSTATIC, IDC_BITS, IDC_ABOUT, }; static const int nokey_ids[] = { IDC_NOKEY, 0 }; @@ -318,13 +385,29 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, static const char generating_msg[] = "Please wait while a key is generated..."; static const char entropy_msg[] = - "Please move the mouse in this window to generate randomness"; + "Please generate some randomness by moving the mouse over the blank area."; struct MainDlgState *state; switch (msg) { case WM_INITDIALOG: - state = malloc(sizeof(*state)); + /* + * Centre the window. + */ + { /* centre the window */ + RECT rs, rd; + HWND hw; + + hw = GetDesktopWindow(); + if (GetWindowRect (hw, &rs) && GetWindowRect (hwnd, &rd)) + MoveWindow (hwnd, (rs.right + rs.left + rd.left - rd.right)/2, + (rs.bottom + rs.top + rd.top - rd.bottom)/2, + rd.right-rd.left, rd.bottom-rd.top, TRUE); + } + + state = smalloc(sizeof(*state)); state->generation_thread_exists = FALSE; + state->collecting_entropy = FALSE; + state->entropy = NULL; state->key_exists = FALSE; SetWindowLong(hwnd, GWL_USERDATA, (LONG)state); { @@ -336,7 +419,7 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, bartitle(&cp, "Public and private key generation for PuTTY", IDC_TITLE); beginbox(&cp, "Key", - IDC_BOX_KEY, IDC_BOXT_KEY); + IDC_BOX_KEY); cp2 = cp; statictext(&cp2, "No key.", IDC_NOKEY); cp2 = cp; @@ -348,17 +431,17 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, IDC_PKSTATIC, IDC_KEYDISPLAY, 7); SendDlgItemMessage(hwnd, IDC_KEYDISPLAY, EM_SETREADONLY, 1, 0); staticedit(&cp, "Key fingerprint:", IDC_FPSTATIC, - IDC_FINGERPRINT, 70); + IDC_FINGERPRINT, 75); SendDlgItemMessage(hwnd, IDC_FINGERPRINT, EM_SETREADONLY, 1, 0); staticedit(&cp, "Key &comment:", IDC_COMMENTSTATIC, - IDC_COMMENTEDIT, 70); + IDC_COMMENTEDIT, 75); staticpassedit(&cp, "Key p&assphrase:", IDC_PASSPHRASE1STATIC, - IDC_PASSPHRASE1EDIT, 70); + IDC_PASSPHRASE1EDIT, 75); staticpassedit(&cp, "C&onfirm passphrase:", IDC_PASSPHRASE2STATIC, - IDC_PASSPHRASE2EDIT, 70); + IDC_PASSPHRASE2EDIT, 75); endbox(&cp); beginbox(&cp, "Actions", - IDC_BOX_ACTIONS, IDC_BOXT_ACTIONS); + IDC_BOX_ACTIONS); staticbtn(&cp, "Generate a public/private key pair", IDC_GENSTATIC, "&Generate", IDC_GENERATE); staticbtn(&cp, "Load an existing private key file", @@ -366,7 +449,18 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, staticbtn(&cp, "Save the generated key to a new file", IDC_SAVESTATIC, "&Save", IDC_SAVE); endbox(&cp); + beginbox(&cp, "Parameters", + IDC_BOX_PARAMS); + radioline(&cp, "Type of key to generate:", IDC_TYPESTATIC, 2, + "SSH&1 (RSA)", IDC_KEYSSH1, + "SSH2 &RSA", IDC_KEYSSH2RSA, NULL); + staticedit(&cp, "Number of &bits in a generated key:", + IDC_BITSSTATIC, IDC_BITS, 20); + endbox(&cp); } + CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2RSA, IDC_KEYSSH1); + SetDlgItemInt(hwnd, IDC_BITS, DEFAULT_KEYSIZE, FALSE); + /* * Initially, hide the progress bar and the key display, * and show the no-key display. Also disable the Save @@ -381,7 +475,9 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, return 1; case WM_MOUSEMOVE: state = (struct MainDlgState *)GetWindowLong(hwnd, GWL_USERDATA); - if (state->collecting_entropy) { + if (state->collecting_entropy && + state->entropy && + state->entropy_got < state->entropy_required) { state->entropy[state->entropy_got++] = lParam; state->entropy[state->entropy_got++] = GetMessageTime(); SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, @@ -395,28 +491,28 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, */ random_add_heavynoise(state->entropy, state->entropy_size); memset(state->entropy, 0, state->entropy_size); - free(state->entropy); + sfree(state->entropy); + state->collecting_entropy = FALSE; SetDlgItemText(hwnd, IDC_GENERATING, generating_msg); SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, PROGRESSRANGE)); SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETPOS, 0, 0); - params = malloc(sizeof(*params)); + params = smalloc(sizeof(*params)); params->progressbar = GetDlgItem(hwnd, IDC_PROGRESS); params->dialog = hwnd; + params->keysize = state->keysize; params->key = &state->key; - params->aux = &state->aux; if (!CreateThread(NULL, 0, generate_rsa_key_thread, params, 0, &threadid)) { MessageBox(hwnd, "Out of thread resources", "Key generation error", MB_OK | MB_ICONERROR); - free(params); + sfree(params); } else { state->generation_thread_exists = TRUE; - state->collecting_entropy = FALSE; } } } @@ -430,10 +526,10 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, if (state->key_exists) { HWND editctl = GetDlgItem(hwnd, IDC_COMMENTEDIT); int len = GetWindowTextLength(editctl); - if (state->key.comment) - free(state->key.comment); - state->key.comment = malloc(len+1); - GetWindowText(editctl, state->key.comment, len+1); + if (*state->commentptr) + sfree(*state->commentptr); + *state->commentptr = smalloc(len+1); + GetWindowText(editctl, *state->commentptr, len+1); } } break; @@ -446,6 +542,24 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, case IDC_GENERATE: state = (struct MainDlgState *)GetWindowLong(hwnd, GWL_USERDATA); if (!state->generation_thread_exists) { + BOOL ok; + state->keysize = GetDlgItemInt(hwnd, IDC_BITS, + &ok, FALSE); + if (!ok) state->keysize = DEFAULT_KEYSIZE; + /* If we ever introduce a new key type, check it here! */ + state->ssh2 = !IsDlgButtonChecked(hwnd, IDC_KEYSSH1); + if (state->keysize < 256) { + int ret = MessageBox(hwnd, + "PuTTYgen will not generate a key" + " smaller than 256 bits.\n" + "Key length reset to 256. Continue?", + "PuTTYgen Warning", + MB_ICONWARNING | MB_OKCANCEL); + if (ret != IDOK) + break; + state->keysize = 256; + SetDlgItemInt(hwnd, IDC_BITS, 256, FALSE); + } hidemany(hwnd, nokey_ids, TRUE); hidemany(hwnd, generating_ids, FALSE); hidemany(hwnd, gotkey_ids, TRUE); @@ -458,20 +572,22 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, /* * My brief statistical tests on mouse movements - * suggest that there are about 5 bits of - * randomness in the x position, 5 in the y + * suggest that there are about 2.5 bits of + * randomness in the x position, 2.5 in the y * position, and 1.7 in the message time, making - * 11.7 bits of unpredictability per mouse - * movement. However, other people have told me - * it's far less than that, so I'm going to be - * stupidly cautious and knock that down to a nice - * round 4. + * 5.7 bits of unpredictability per mouse movement. + * However, other people have told me it's far less + * than that, so I'm going to be stupidly cautious + * and knock that down to a nice round 2. With this + * method, we require two words per mouse movement, + * so with 2 bits per mouse movement we expect 2 + * bits every 2 words. */ - state->entropy_required = (KEYSIZE / 4) * 2; + state->entropy_required = (state->keysize/2) * 2; state->entropy_got = 0; state->entropy_size = (state->entropy_required * sizeof(*state->entropy)); - state->entropy = malloc(state->entropy_size); + state->entropy = smalloc(state->entropy_size); SendDlgItemMessage(hwnd, IDC_PROGRESS, PBM_SETRANGE, 0, MAKELPARAM(0, state->entropy_required)); @@ -519,8 +635,13 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, if (ret != IDYES) break; } - ret = saversakey(filename, &state->key, &state->aux, - *passphrase ? passphrase : NULL); + if (state->ssh2) { + ret = ssh2_save_userkey(filename, &state->ssh2key, + *passphrase ? passphrase : NULL); + } else { + ret = saversakey(filename, &state->key, + *passphrase ? passphrase : NULL); + } if (ret <= 0) { MessageBox(hwnd, "Unable to save key file", "PuTTYgen Error", @@ -537,13 +658,25 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, filename, 0)) { char passphrase[PASSPHRASE_MAXLEN]; int needs_pass; + int ver; int ret; char *comment; struct PassphraseProcStruct pps; - struct RSAKey newkey; - struct RSAAux newaux; + struct RSAKey newkey1; + struct ssh2_userkey *newkey2; + + ver = keyfile_version(filename); + if (ver == 0) { + MessageBox(NULL, "Couldn't load private key.", + "PuTTYgen Error", MB_OK | MB_ICONERROR); + break; + } - needs_pass = rsakey_encrypted(filename, &comment); + comment = NULL; + if (ver == 1) + needs_pass = rsakey_encrypted(filename, &comment); + else + needs_pass = ssh2_userkey_encrypted(filename, &comment); pps.passphrase = passphrase; pps.comment = comment; do { @@ -559,17 +692,23 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, } } else *passphrase = '\0'; - ret = loadrsakey(filename, &newkey, &newaux, - passphrase); + if (ver == 1) + ret = loadrsakey(filename, &newkey1, passphrase); + else { + newkey2 = ssh2_load_userkey(filename, passphrase); + if (newkey2 == SSH2_WRONG_PASSPHRASE) + ret = -1; + else if (!newkey2) + ret = 0; + else + ret = 1; + } } while (ret == -1); - if (comment) free(comment); + if (comment) sfree(comment); if (ret == 0) { MessageBox(NULL, "Couldn't load private key.", "PuTTYgen Error", MB_OK | MB_ICONERROR); } else if (ret == 1) { - state->key = newkey; - state->aux = newaux; - EnableWindow(GetDlgItem(hwnd, IDC_GENERATE), 1); EnableWindow(GetDlgItem(hwnd, IDC_LOAD), 1); EnableWindow(GetDlgItem(hwnd, IDC_SAVE), 1); @@ -578,29 +717,55 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, * key data. */ { - char buf[128]; SetDlgItemText(hwnd, IDC_PASSPHRASE1EDIT, passphrase); SetDlgItemText(hwnd, IDC_PASSPHRASE2EDIT, passphrase); - SetDlgItemText(hwnd, IDC_COMMENTEDIT, - state->key.comment); - /* - * Set the key fingerprint. - */ - { - char *savecomment = state->key.comment; + if (ver == 1) { + char buf[128]; + char *savecomment; + + state->ssh2 = FALSE; + state->commentptr = &state->key.comment; + state->key = newkey1; + + /* + * Set the key fingerprint. + */ + savecomment = state->key.comment; state->key.comment = NULL; rsa_fingerprint(buf, sizeof(buf), &state->key); state->key.comment = savecomment; - } - SetDlgItemText(hwnd, IDC_FINGERPRINT, buf); - /* - * Construct a decimal representation - * of the key, for pasting into - * .ssh/authorized_keys on a Unix box. - */ - setupbigedit(hwnd, IDC_KEYDISPLAY, &state->key); + + SetDlgItemText(hwnd, IDC_FINGERPRINT, buf); + /* + * Construct a decimal representation + * of the key, for pasting into + * .ssh/authorized_keys on a Unix box. + */ + setupbigedit1(hwnd, IDC_KEYDISPLAY, &state->key); + } else { + char *fp; + char *savecomment; + + state->ssh2 = TRUE; + state->commentptr = &state->ssh2key.comment; + state->ssh2key = *newkey2; /* structure copy */ + sfree(newkey2); + + savecomment = state->ssh2key.comment; + state->ssh2key.comment = NULL; + fp = state-> + ssh2key.alg->fingerprint(state->ssh2key.data); + state->ssh2key.comment = savecomment; + + SetDlgItemText(hwnd, IDC_FINGERPRINT, fp); + sfree(fp); + + setupbigedit2(hwnd, IDC_KEYDISPLAY, &state->ssh2key); + } + SetDlgItemText(hwnd, IDC_COMMENTEDIT, + *state->commentptr); } /* * Finally, hide the progress bar and show @@ -624,26 +789,33 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, EnableWindow(GetDlgItem(hwnd, IDC_GENERATE), 1); EnableWindow(GetDlgItem(hwnd, IDC_LOAD), 1); EnableWindow(GetDlgItem(hwnd, IDC_SAVE), 1); + if (state->ssh2) { + state->ssh2key.data = &state->key; + state->ssh2key.alg = &ssh_rsa; + state->commentptr = &state->ssh2key.comment; + } else { + state->commentptr = &state->key.comment; + } /* * Invent a comment for the key. We'll do this by including * the date in it. This will be so horrifyingly ugly that * the user will immediately want to change it, which is * what we want :-) */ - state->key.comment = malloc(30); + *state->commentptr = smalloc(30); { time_t t; struct tm *tm; time(&t); tm = localtime(&t); - strftime(state->key.comment, 30, "rsa-key-%Y%m%d", tm); + strftime(*state->commentptr, 30, "rsa-key-%Y%m%d", tm); } /* * Now update the key controls with all the key data. */ { - char buf[128]; + char *savecomment; /* * Blank passphrase, initially. This isn't dangerous, * because we will warn (Are You Sure?) before allowing @@ -654,22 +826,32 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, /* * Set the comment. */ - SetDlgItemText(hwnd, IDC_COMMENTEDIT, state->key.comment); + SetDlgItemText(hwnd, IDC_COMMENTEDIT, *state->commentptr); /* * Set the key fingerprint. */ - { - char *savecomment = state->key.comment; - state->key.comment = NULL; + savecomment = *state->commentptr; + *state->commentptr = NULL; + if (state->ssh2) { + char *fp; + fp = state->ssh2key.alg->fingerprint(state->ssh2key.data); + SetDlgItemText(hwnd, IDC_FINGERPRINT, fp); + sfree(fp); + } else { + char buf[128]; rsa_fingerprint(buf, sizeof(buf), &state->key); - state->key.comment = savecomment; + SetDlgItemText(hwnd, IDC_FINGERPRINT, buf); } - SetDlgItemText(hwnd, IDC_FINGERPRINT, buf); + *state->commentptr = savecomment; /* * Construct a decimal representation of the key, for * pasting into .ssh/authorized_keys on a Unix box. */ - setupbigedit(hwnd, IDC_KEYDISPLAY, &state->key); + if (state->ssh2) { + setupbigedit2(hwnd, IDC_KEYDISPLAY, &state->ssh2key); + } else { + setupbigedit1(hwnd, IDC_KEYDISPLAY, &state->key); + } } /* * Finally, hide the progress bar and show the key data. @@ -680,7 +862,7 @@ static int CALLBACK MainDlgProc (HWND hwnd, UINT msg, break; case WM_CLOSE: state = (struct MainDlgState *)GetWindowLong(hwnd, GWL_USERDATA); - free(state); + sfree(state); EndDialog(hwnd, 1); return 0; }