X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=windows%2Fwinpgen.c;h=8806d75f933b972bd17e675585fb7e86a8366c79;hb=eef0235a0f79e92f25f34782fc486c101fa703ee;hp=858b4581e11a0013009a07a0411470062f9c754c;hpb=76a4b576e58fa3b245b02f9fbb052e4651acbfa9;p=PuTTY.git diff --git a/windows/winpgen.c b/windows/winpgen.c index 858b4581..8806d75f 100644 --- a/windows/winpgen.c +++ b/windows/winpgen.c @@ -383,69 +383,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. */ @@ -537,7 +491,7 @@ enum { IDC_ABOUT, IDC_GIVEHELP, IDC_IMPORT, - IDC_EXPORT_OPENSSH_PEM, IDC_EXPORT_OPENSSH_NEW, + IDC_EXPORT_OPENSSH_AUTO, IDC_EXPORT_OPENSSH_NEW, IDC_EXPORT_SSHCOM }; @@ -586,7 +540,7 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableMenuItem(state->keymenu, IDC_KEYSSH2ED25519, MF_ENABLED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_IMPORT, MF_ENABLED|MF_BYCOMMAND); - EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_PEM, + EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_AUTO, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_NEW, MF_GRAYED|MF_BYCOMMAND); @@ -619,7 +573,7 @@ void ui_set_state(HWND hwnd, struct MainDlgState *state, int status) EnableMenuItem(state->keymenu, IDC_KEYSSH2ED25519, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_IMPORT, MF_GRAYED|MF_BYCOMMAND); - EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_PEM, + EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_AUTO, MF_GRAYED|MF_BYCOMMAND); EnableMenuItem(state->cvtmenu, IDC_EXPORT_OPENSSH_NEW, MF_GRAYED|MF_BYCOMMAND); @@ -660,7 +614,7 @@ 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_PEM, SSH_KEYTYPE_OPENSSH_PEM); + 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 @@ -902,10 +856,10 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, menu1 = CreateMenu(); AppendMenu(menu1, MF_ENABLED, IDC_IMPORT, "&Import key"); AppendMenu(menu1, MF_SEPARATOR, 0, 0); - AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_OPENSSH_PEM, - "Export &OpenSSH key (old PEM format)"); + AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_OPENSSH_AUTO, + "Export &OpenSSH key"); AppendMenu(menu1, MF_ENABLED, IDC_EXPORT_OPENSSH_NEW, - "Export &OpenSSH key (new format)"); + "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, @@ -1198,7 +1152,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, } break; case IDC_SAVE: - case IDC_EXPORT_OPENSSH_PEM: + case IDC_EXPORT_OPENSSH_AUTO: case IDC_EXPORT_OPENSSH_NEW: case IDC_EXPORT_SSHCOM: if (HIWORD(wParam) != BN_CLICKED) @@ -1215,8 +1169,8 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, else realtype = SSH_KEYTYPE_SSH1; - if (LOWORD(wParam) == IDC_EXPORT_OPENSSH_PEM) - type = SSH_KEYTYPE_OPENSSH_PEM; + 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) @@ -1326,15 +1280,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; @@ -1499,7 +1465,7 @@ static int CALLBACK MainDlgProc(HWND hwnd, UINT msg, case IDC_BITS: topic = WINHELP_CTX_puttygen_bits; break; case IDC_IMPORT: - case IDC_EXPORT_OPENSSH_PEM: + case IDC_EXPORT_OPENSSH_AUTO: case IDC_EXPORT_OPENSSH_NEW: case IDC_EXPORT_SSHCOM: topic = WINHELP_CTX_puttygen_conversions; break;