* PuTTY key generation front end.
*/
-#include <windows.h>
-#include <commctrl.h>
#include <time.h>
#include <stdio.h>
#include <stdlib.h>
#include "putty.h"
#include "ssh.h"
-#include "winstuff.h"
+
+#include <commctrl.h>
#ifdef MSVC4
#define ICON_BIG 1
strcpy(p, key->comment);
SetDlgItemText(hwnd, id, buffer);
SetDlgItemText(hwnd, idstatic, "&Public key for pasting into "
- "OpenSSH authorized_keys2 file:");
+ "OpenSSH authorized_keys file:");
sfree(pub_blob);
sfree(buffer);
}
if (type == SSH_KEYTYPE_SSH1) {
if (realtype == type)
ret = loadrsakey(&filename, &newkey1,
- passphrase);
+ passphrase, NULL);
else
ret = import_ssh1(&filename, realtype,
&newkey1, passphrase);
} else {
if (realtype == type)
newkey2 = ssh2_load_userkey(&filename,
- passphrase);
+ passphrase, NULL);
else
newkey2 = import_ssh2(&filename, realtype,
passphrase);
IDC_BITSSTATIC, IDC_BITS, 20);
endbox(&cp);
}
- CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2DSA, IDC_KEYSSH1);
+ CheckRadioButton(hwnd, IDC_KEYSSH1, IDC_KEYSSH2DSA, IDC_KEYSSH2RSA);
CheckMenuRadioItem(state->keymenu, IDC_KEYSSH1, IDC_KEYSSH2DSA,
IDC_KEYSSH1, MF_BYCOMMAND);
SetDlgItemInt(hwnd, IDC_BITS, DEFAULT_KEYSIZE, FALSE);