projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Work towards wish `keyfile-diagnostic'. Many sshpubk.c keyfile-loading
[u/mdw/putty]
/
pageant.c
diff --git
a/pageant.c
b/pageant.c
index
0ca6b95
..
4d69cb5
100644
(file)
--- a/
pageant.c
+++ b/
pageant.c
@@
-416,7
+416,7
@@
static void add_keyfile(Filename filename)
int i, nkeys, bloblen;
if (type == SSH_KEYTYPE_SSH1) {
int i, nkeys, bloblen;
if (type == SSH_KEYTYPE_SSH1) {
- if (!rsakey_pubblob(&filename, &blob, &bloblen)) {
+ if (!rsakey_pubblob(&filename, &blob, &bloblen
, NULL
)) {
MessageBox(NULL, "Couldn't load private key.", APPNAME,
MB_OK | MB_ICONERROR);
return;
MessageBox(NULL, "Couldn't load private key.", APPNAME,
MB_OK | MB_ICONERROR);
return;
@@
-424,7
+424,7
@@
static void add_keyfile(Filename filename)
keylist = get_keylist1();
} else {
unsigned char *blob2;
keylist = get_keylist1();
} else {
unsigned char *blob2;
- blob = ssh2_userkey_loadpub(&filename, NULL, &bloblen);
+ blob = ssh2_userkey_loadpub(&filename, NULL, &bloblen
, NULL
);
if (!blob) {
MessageBox(NULL, "Couldn't load private key.", APPNAME,
MB_OK | MB_ICONERROR);
if (!blob) {
MessageBox(NULL, "Couldn't load private key.", APPNAME,
MB_OK | MB_ICONERROR);
@@
-498,9
+498,9
@@
static void add_keyfile(Filename filename)
} else
*passphrase = '\0';
if (type == SSH_KEYTYPE_SSH1)
} else
*passphrase = '\0';
if (type == SSH_KEYTYPE_SSH1)
- ret = loadrsakey(&filename, rkey, passphrase);
+ ret = loadrsakey(&filename, rkey, passphrase
, NULL
);
else {
else {
- skey = ssh2_load_userkey(&filename, passphrase);
+ skey = ssh2_load_userkey(&filename, passphrase
, NULL
);
if (skey == SSH2_WRONG_PASSPHRASE)
ret = -1;
else if (!skey)
if (skey == SSH2_WRONG_PASSPHRASE)
ret = -1;
else if (!skey)