X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinpgen.c;h=612692b4e669c1e77a5216f1e538720eda1e1a48;hb=2eb952ca31aa13d1f6f429305fbb6f43a9a28c56;hp=8806d75f933b972bd17e675585fb7e86a8366c79;hpb=eef0235a0f79e92f25f34782fc486c101fa703ee;p=PuTTY.git diff --git a/windows/winpgen.c b/windows/winpgen.c index 8806d75f..612692b4 100644 --- a/windows/winpgen.c +++ b/windows/winpgen.c @@ -27,7 +27,7 @@ static char *cmdline_keyfile = NULL; /* * Print a modal (Really Bad) message box and perform a fatal exit. */ -void modalfatalbox(char *fmt, ...) +void modalfatalbox(const char *fmt, ...) { va_list ap; char *stuff; @@ -44,7 +44,7 @@ void modalfatalbox(char *fmt, ...) /* * Print a non-fatal message box and do not exit. */ -void nonfatal(char *fmt, ...) +void nonfatal(const char *fmt, ...) { va_list ap; char *stuff; @@ -141,7 +141,7 @@ struct PassphraseProcStruct { /* * Dialog-box function for the passphrase box. */ -static int CALLBACK PassphraseProc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK PassphraseProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static char **passphrase = NULL; @@ -233,7 +233,7 @@ static int prompt_keyfile(HWND hwnd, char *dlgtitle, /* * Dialog-box function for the Licence box. */ -static int CALLBACK LicenceProc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK LicenceProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -253,6 +253,36 @@ static int CALLBACK LicenceProc(HWND hwnd, UINT msg, rd.right - rd.left, rd.bottom - rd.top, TRUE); } + SetDlgItemText(hwnd, 1000, + "Copyright 1997-2015 Simon Tatham.\r\n\r\n" + + "Portions copyright Robert de Bath, Joris van Rantwijk, Delian " + "Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas " + "Barry, Justin Bradford, Ben Harris, Malcolm Smith, Ahmad Khalifa, " + "Markus Kuhn, Colin Watson, Christopher Staite, and CORE SDI S.A.\r\n\r\n" + + "Permission is hereby granted, free of charge, to any person " + "obtaining a copy of this software and associated documentation " + "files (the ""Software""), to deal in the Software without restriction, " + "including without limitation the rights to use, copy, modify, merge, " + "publish, distribute, sublicense, and/or sell copies of the Software, " + "and to permit persons to whom the Software is furnished to do so, " + "subject to the following conditions:\r\n\r\n" + + "The above copyright notice and this permission notice shall be " + "included in all copies or substantial portions of the Software.\r\n\r\n" + + "THE SOFTWARE IS PROVIDED ""AS IS"", WITHOUT " + "WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, " + "INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF " + "MERCHANTABILITY, FITNESS FOR A PARTICULAR " + "PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE " + "COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES " + "OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, " + "TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN " + "CONNECTION WITH THE SOFTWARE OR THE USE OR " + "OTHER DEALINGS IN THE SOFTWARE." +); return 1; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -272,7 +302,7 @@ static int CALLBACK LicenceProc(HWND hwnd, UINT msg, /* * Dialog-box function for the About box. */ -static int CALLBACK AboutProc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK AboutProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { switch (msg) { @@ -292,7 +322,14 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg, rd.right - rd.left, rd.bottom - rd.top, TRUE); } - SetDlgItemText(hwnd, 100, ver); + { + char *text = dupprintf + ("Pageant\r\n\r\n%s\r\n\r\n%s", + ver, + "\251 1997-2015 Simon Tatham. All rights reserved."); + SetDlgItemText(hwnd, 1000, text); + sfree(text); + } return 1; case WM_COMMAND: switch (LOWORD(wParam)) { @@ -420,53 +457,6 @@ void old_keyfile_warning(void) MessageBox(NULL, message, mbtitle, MB_OK); } -static int save_ssh2_pubkey(char *filename, struct ssh2_userkey *key) -{ - unsigned char *pub_blob; - char *p; - int pub_len; - int i, column; - FILE *fp; - - pub_blob = key->alg->public_blob(key->data, &pub_len); - - fp = fopen(filename, "wb"); - if (!fp) - return 0; - - fprintf(fp, "---- BEGIN SSH2 PUBLIC KEY ----\n"); - - fprintf(fp, "Comment: \""); - for (p = key->comment; *p; p++) { - if (*p == '\\' || *p == '\"') - fputc('\\', fp); - fputc(*p, fp); - } - fprintf(fp, "\"\n"); - - i = 0; - column = 0; - while (i < pub_len) { - char buf[5]; - int n = (pub_len - i < 3 ? pub_len - i : 3); - base64_encode_atom(pub_blob + i, n, buf); - i += n; - buf[4] = '\0'; - fputs(buf, fp); - if (++column >= 16) { - fputc('\n', fp); - column = 0; - } - } - if (column > 0) - fputc('\n', fp); - - fprintf(fp, "---- END SSH2 PUBLIC KEY ----\n"); - fclose(fp); - sfree(pub_blob); - return 1; -} - enum { controlidstart = 100, IDC_QUIT, @@ -753,9 +743,7 @@ void load_key_file(HWND hwnd, struct MainDlgState *state, savecomment = state->ssh2key.comment; state->ssh2key.comment = NULL; - fp = - state->ssh2key.alg-> - fingerprint(state->ssh2key.data); + fp = ssh2_fingerprint(state->ssh2key.alg, state->ssh2key.data); state->ssh2key.comment = savecomment; SetDlgItemText(hwnd, IDC_FINGERPRINT, fp); @@ -798,7 +786,7 @@ void load_key_file(HWND hwnd, struct MainDlgState *state, /* * Dialog-box function for the main PuTTYgen dialog box. */ -static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, +static INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam) { static const char generating_msg[] = @@ -839,7 +827,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_SAVE, "&Save private key"); AppendMenu(menu1, MF_SEPARATOR, 0, 0); AppendMenu(menu1, MF_ENABLED, IDC_QUIT, "E&xit"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&File"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&File"); state->filemenu = menu1; menu1 = CreateMenu(); @@ -850,7 +838,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2DSA, "SSH-2 &DSA key"); AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2ECDSA, "SSH-2 &ECDSA key"); AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2ED25519, "SSH-2 ED&25519 key"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&Key"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&Key"); state->keymenu = menu1; menu1 = CreateMenu(); @@ -862,7 +850,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, "Export &OpenSSH key (force new file format)"); AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_SSHCOM, "Export &ssh.com key"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "Con&versions"); state->cvtmenu = menu1; @@ -870,7 +858,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_ABOUT, "&About"); if (has_help()) AppendMenu(menu1, MF_ENABLED, IDC_GIVEHELP, "&Help"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&Help"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&Help"); SetMenu(hwnd, menu); } @@ -927,12 +915,13 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, "&Save private key", IDC_SAVE); endbox(&cp); beginbox(&cp, "Parameters", IDC_BOX_PARAMS); - radioline(&cp, "Type of key to generate:", IDC_TYPESTATIC, 4, + radioline(&cp, "Type of key to generate:", IDC_TYPESTATIC, 5, + "&RSA", IDC_KEYSSH2RSA, + "&DSA", IDC_KEYSSH2DSA, + "&ECDSA", IDC_KEYSSH2ECDSA, + "ED&25519", IDC_KEYSSH2ED25519, "SSH-&1 (RSA)", IDC_KEYSSH1, - "SSH-2 &RSA", IDC_KEYSSH2RSA, - "SSH-2 &DSA", IDC_KEYSSH2DSA, - "SSH-2 &ECDSA", IDC_KEYSSH2ECDSA, - "SSH-2 ED&25519", IDC_KEYSSH2ED25519, NULL); + NULL); staticedit(&cp, "Number of &bits in a generated key:", IDC_BITSSTATIC, IDC_BITS, 20); endbox(&cp); @@ -1016,15 +1005,12 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, state = (struct MainDlgState *) GetWindowLongPtr(hwnd, GWLP_USERDATA); if (!IsDlgButtonChecked(hwnd, LOWORD(wParam))) - CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2DSA, + CheckRadioButton(hwnd, + IDC_KEYSSH1, IDC_KEYSSH2ED25519, LOWORD(wParam)); - CheckMenuRadioItem(state->keymenu, IDC_KEYSSH1, IDC_KEYSSH2DSA, + CheckMenuRadioItem(state->keymenu, + IDC_KEYSSH1, IDC_KEYSSH2ED25519, LOWORD(wParam), MF_BYCOMMAND); - CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2ECDSA, - LOWORD(wParam)); - CheckMenuRadioItem(state->keymenu, IDC_KEYSSH1, - IDC_KEYSSH2ECDSA, - LOWORD(wParam), MF_BYCOMMAND); } break; case IDC_QUIT: @@ -1335,12 +1321,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, state->ssh2key.alg = &ssh_dss; } else if (state->keytype == ECDSA) { state->ssh2key.data = &state->eckey; - if (state->eckey.publicKey.curve->fieldBits == 256) - state->ssh2key.alg = &ssh_ecdsa_nistp256; - else if (state->eckey.publicKey.curve->fieldBits == 384) - state->ssh2key.alg = &ssh_ecdsa_nistp384; - else - state->ssh2key.alg = &ssh_ecdsa_nistp521; + state->ssh2key.alg = state->eckey.signalg; } else if (state->keytype == ED25519) { state->ssh2key.data = &state->eckey; state->ssh2key.alg = &ssh_ecdsa_ed25519; @@ -1395,7 +1376,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, *state->commentptr = NULL; if (state->ssh2) { char *fp; - fp = state->ssh2key.alg->fingerprint(state->ssh2key.data); + fp = ssh2_fingerprint(state->ssh2key.alg, state->ssh2key.data); SetDlgItemText(hwnd, IDC_FINGERPRINT, fp); sfree(fp); } else { @@ -1425,7 +1406,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, case WM_HELP: { int id = ((LPHELPINFO)lParam)->iCtrlId; - char *topic = NULL; + const char *topic = NULL; switch (id) { case IDC_GENERATING: case IDC_PROGRESS: