X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinpgen.c;h=612692b4e669c1e77a5216f1e538720eda1e1a48;hb=2eb952ca31aa13d1f6f429305fbb6f43a9a28c56;hp=8f263efcbe3b421de14e1be74b492511a24dbd2e;hpb=5ffb20e4bf58cab31e066bc8cbdd4d4d94137eb0;p=PuTTY.git diff --git a/windows/winpgen.c b/windows/winpgen.c index 8f263efc..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)) { @@ -315,7 +352,7 @@ static int CALLBACK AboutProc(HWND hwnd, UINT msg, return 0; } -typedef enum {RSA, DSA, ECDSA} keytype; +typedef enum {RSA, DSA, ECDSA, ED25519} keytype; /* * Thread to generate a key. @@ -344,6 +381,8 @@ static DWORD WINAPI generate_rsa_key_thread(void *param) dsa_generate(params->dsskey, params->keysize, progress_update, &prog); else if (params->keytype == ECDSA) ec_generate(params->eckey, params->keysize, progress_update, &prog); + else if (params->keytype == ED25519) + ec_edgenerate(params->eckey, params->keysize, progress_update, &prog); else rsa_generate(params->key, params->keysize, progress_update, &prog); @@ -381,69 +420,23 @@ static void hidemany(HWND hwnd, const int *ids, int hideit) static void setupbigedit1(HWND hwnd, int id, int idstatic, struct RSAKey *key) { - char *buffer; - char *dec1, *dec2; - - dec1 = bignum_decimal(key->exponent); - dec2 = bignum_decimal(key->modulus); - buffer = dupprintf("%d %s %s %s", bignum_bitcount(key->modulus), - dec1, dec2, key->comment); + char *buffer = ssh1_pubkey_str(key); SetDlgItemText(hwnd, id, buffer); SetDlgItemText(hwnd, idstatic, "&Public key for pasting into authorized_keys file:"); - sfree(dec1); - sfree(dec2); sfree(buffer); } static void setupbigedit2(HWND hwnd, int id, int idstatic, struct ssh2_userkey *key) { - unsigned char *pub_blob; - char *buffer, *p; - int pub_len; - int i; - - pub_blob = key->alg->public_blob(key->data, &pub_len); - buffer = snewn(strlen(key->alg->name) + 4 * ((pub_len + 2) / 3) + - strlen(key->comment) + 3, char); - 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); + char *buffer = ssh2_pubkey_openssh_str(key); SetDlgItemText(hwnd, id, buffer); SetDlgItemText(hwnd, idstatic, "&Public key for pasting into " "OpenSSH authorized_keys file:"); - sfree(pub_blob); sfree(buffer); } -static int save_ssh1_pubkey(char *filename, struct RSAKey *key) -{ - char *dec1, *dec2; - FILE *fp; - - fp = fopen(filename, "wb"); - if (!fp) - return 0; - dec1 = bignum_decimal(key->exponent); - dec2 = bignum_decimal(key->modulus); - fprintf(fp, "%d %s %s %s\n", - bignum_bitcount(key->modulus), dec1, dec2, key->comment); - fclose(fp); - sfree(dec1); - sfree(dec2); - return 1; -} - /* * Warn about the obsolescent key file format. */ @@ -464,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, @@ -530,11 +476,13 @@ enum { IDC_SAVESTATIC, IDC_SAVE, IDC_SAVEPUB, IDC_BOX_PARAMS, IDC_TYPESTATIC, IDC_KEYSSH1, IDC_KEYSSH2RSA, IDC_KEYSSH2DSA, - IDC_KEYSSH2ECDSA, + IDC_KEYSSH2ECDSA, IDC_KEYSSH2ED25519, IDC_BITSSTATIC, IDC_BITS, IDC_ABOUT, IDC_GIVEHELP, - IDC_IMPORT, IDC_EXPORT_OPENSSH, IDC_EXPORT_SSHCOM + IDC_IMPORT, + IDC_EXPORT_OPENSSH_AUTO, IDC_EXPORT_OPENSSH_NEW, + IDC_EXPORT_SSHCOM }; static const int nokey_ids[] = { IDC_NOKEY, 0 }; @@ -568,6 +516,7 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 1); EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 1); EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2ECDSA), 1); + EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2ED25519), 1); EnableWindow(GetDlgItem(hwnd, IDC_BITS), 1); EnableMenuItem(state->filemenu, IDC_LOAD, MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->filemenu, IDC_SAVE, MF_GRAYED|MF_BYCOMMAND); @@ -578,8 +527,12 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableMenuItem(state->keymenu, IDC_KEYSSH2DSA, MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->keymenu, IDC_KEYSSH2ECDSA, MF_ENABLED|MF_BYCOMMAND); + EnableMenuItem(state->keymenu, IDC_KEYSSH2ED25519, + MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_IMPORT, MF_ENABLED|MF_BYCOMMAND); - EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH, + EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_AUTO, + MF_GRAYED|MF_BYCOMMAND); + EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_NEW, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_EXPORT_SSHCOM, MF_GRAYED|MF_BYCOMMAND); @@ -596,6 +549,7 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 0); EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 0); EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2ECDSA), 0); + EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2ED25519), 0); EnableWindow(GetDlgItem(hwnd, IDC_BITS), 0); EnableMenuItem(state->filemenu, IDC_LOAD, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->filemenu, IDC_SAVE, MF_GRAYED|MF_BYCOMMAND); @@ -606,8 +560,12 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableMenuItem(state->keymenu, IDC_KEYSSH2DSA, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->keymenu, IDC_KEYSSH2ECDSA, MF_GRAYED|MF_BYCOMMAND); + EnableMenuItem(state->keymenu, IDC_KEYSSH2ED25519, + MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_IMPORT, MF_GRAYED|MF_BYCOMMAND); - EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH, + EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_AUTO, + MF_GRAYED|MF_BYCOMMAND); + EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_NEW, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_EXPORT_SSHCOM, MF_GRAYED|MF_BYCOMMAND); @@ -624,6 +582,7 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2RSA), 1); EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2DSA), 1); EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2ECDSA), 1); + EnableWindow(GetDlgItem(hwnd, IDC_KEYSSH2ED25519), 1); EnableWindow(GetDlgItem(hwnd, IDC_BITS), 1); EnableMenuItem(state->filemenu, IDC_LOAD, MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->filemenu, IDC_SAVE, MF_ENABLED|MF_BYCOMMAND); @@ -634,6 +593,8 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableMenuItem(state->keymenu, IDC_KEYSSH2DSA,MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->keymenu, IDC_KEYSSH2ECDSA, MF_ENABLED|MF_BYCOMMAND); + EnableMenuItem(state->keymenu, IDC_KEYSSH2ED25519, + MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_IMPORT, MF_ENABLED|MF_BYCOMMAND); /* * Enable export menu items if and only if the key type @@ -643,7 +604,8 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) #define do_export_menuitem(x,y) \ EnableMenuItem(state->cvtmenu, x, MF_BYCOMMAND | \ (import_target_type(y)==type?MF_ENABLED:MF_GRAYED)) - do_export_menuitem(IDC_EXPORT_OPENSSH, SSH_KEYTYPE_OPENSSH); + do_export_menuitem(IDC_EXPORT_OPENSSH_AUTO, SSH_KEYTYPE_OPENSSH_AUTO); + do_export_menuitem(IDC_EXPORT_OPENSSH_NEW, SSH_KEYTYPE_OPENSSH_NEW); do_export_menuitem(IDC_EXPORT_SSHCOM, SSH_KEYTYPE_SSHCOM); #undef do_export_menuitem break; @@ -781,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); @@ -826,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[] = @@ -867,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(); @@ -877,17 +837,20 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2RSA, "SSH-2 &RSA key"); AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2DSA, "SSH-2 &DSA key"); AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2ECDSA, "SSH-2 &ECDSA key"); - AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT) menu1, "&Key"); + AppendMenu(menu1, MF_ENABLED, IDC_KEYSSH2ED25519, "SSH-2 ED&25519 key"); + AppendMenu(menu, MF_POPUP | MF_ENABLED, (UINT_PTR) menu1, "&Key"); state->keymenu = menu1; menu1 = CreateMenu(); AppendMenu(menu1, MF_ENABLED, IDC_IMPORT, "&Import key"); AppendMenu(menu1, MF_SEPARATOR, 0, 0); - AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_OPENSSH, + AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_OPENSSH_AUTO, "Export &OpenSSH key"); + AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_OPENSSH_NEW, + "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; @@ -895,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); } @@ -952,11 +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, NULL); + NULL); staticedit(&cp, "Number of &bits in a generated key:", IDC_BITSSTATIC, IDC_BITS, 20); endbox(&cp); @@ -1035,19 +1000,17 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, case IDC_KEYSSH2RSA: case IDC_KEYSSH2DSA: case IDC_KEYSSH2ECDSA: + case IDC_KEYSSH2ED25519: { 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: @@ -1104,6 +1067,8 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, state->keytype = DSA; } else if (IsDlgButtonChecked(hwnd, IDC_KEYSSH2ECDSA)) { state->keytype = ECDSA; + } else if (IsDlgButtonChecked(hwnd, IDC_KEYSSH2ED25519)) { + state->keytype = ED25519; } if (state->keysize < 256) { int ret = MessageBox(hwnd, @@ -1131,6 +1096,18 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, state->keysize = 256; SetDlgItemInt(hwnd, IDC_BITS, 256, FALSE); } + if (state->keytype == ED25519 && state->keysize != 256) { + int ret = MessageBox(hwnd, + "Only 256 bit Edwards elliptic" + " curves are supported.\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); + } ui_set_state(hwnd, state, 1); SetDlgItemText(hwnd, IDC_GENERATING, entropy_msg); state->key_exists = FALSE; @@ -1161,7 +1138,8 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, } break; case IDC_SAVE: - case IDC_EXPORT_OPENSSH: + case IDC_EXPORT_OPENSSH_AUTO: + case IDC_EXPORT_OPENSSH_NEW: case IDC_EXPORT_SSHCOM: if (HIWORD(wParam) != BN_CLICKED) break; @@ -1177,8 +1155,10 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, else realtype = SSH_KEYTYPE_SSH1; - if (LOWORD(wParam) == IDC_EXPORT_OPENSSH) - type = SSH_KEYTYPE_OPENSSH; + if (LOWORD(wParam) == IDC_EXPORT_OPENSSH_AUTO) + type = SSH_KEYTYPE_OPENSSH_AUTO; + else if (LOWORD(wParam) == IDC_EXPORT_OPENSSH_NEW) + type = SSH_KEYTYPE_OPENSSH_NEW; else if (LOWORD(wParam) == IDC_EXPORT_SSHCOM) type = SSH_KEYTYPE_SSHCOM; else @@ -1286,15 +1266,27 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, if (ret != IDYES) break; } - if (state->ssh2) { - ret = save_ssh2_pubkey(filename, &state->ssh2key); - } else { - ret = save_ssh1_pubkey(filename, &state->key); - } - if (ret <= 0) { - MessageBox(hwnd, "Unable to save key file", - "PuTTYgen Error", MB_OK | MB_ICONERROR); - } + fp = fopen(filename, "w"); + if (!fp) { + MessageBox(hwnd, "Unable to open key file", + "PuTTYgen Error", MB_OK | MB_ICONERROR); + } else { + if (state->ssh2) { + int bloblen; + unsigned char *blob; + blob = state->ssh2key.alg->public_blob + (state->ssh2key.data, &bloblen); + ssh2_write_pubkey(fp, state->ssh2key.comment, + blob, bloblen, + SSH_KEYTYPE_SSH2_PUBLIC_RFC4716); + } else { + ssh1_write_pubkey(fp, &state->key); + } + if (fclose(fp) < 0) { + MessageBox(hwnd, "Unable to save key file", + "PuTTYgen Error", MB_OK | MB_ICONERROR); + } + } } } break; @@ -1329,12 +1321,10 @@ 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; } else { state->ssh2key.data = &state->key; state->ssh2key.alg = &ssh_rsa; @@ -1357,6 +1347,8 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, strftime(*state->commentptr, 30, "dsa-key-%Y%m%d", &tm); else if (state->keytype == ECDSA) strftime(*state->commentptr, 30, "ecdsa-key-%Y%m%d", &tm); + else if (state->keytype == ED25519) + strftime(*state->commentptr, 30, "ed25519-key-%Y%m%d", &tm); else strftime(*state->commentptr, 30, "rsa-key-%Y%m%d", &tm); } @@ -1384,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 { @@ -1414,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: @@ -1448,12 +1440,14 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, case IDC_KEYSSH2RSA: case IDC_KEYSSH2DSA: case IDC_KEYSSH2ECDSA: + case IDC_KEYSSH2ED25519: topic = WINHELP_CTX_puttygen_keytype; break; case IDC_BITSSTATIC: case IDC_BITS: topic = WINHELP_CTX_puttygen_bits; break; case IDC_IMPORT: - case IDC_EXPORT_OPENSSH: + case IDC_EXPORT_OPENSSH_AUTO: + case IDC_EXPORT_OPENSSH_NEW: case IDC_EXPORT_SSHCOM: topic = WINHELP_CTX_puttygen_conversions; break; }