* 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
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);