From 5fe609d2c9e699b49dcf8aa59dd4a3d6de63630b Mon Sep 17 00:00:00 2001
From: jacob <jacob@cda61777-01e9-0310-a592-d414129be87e>
Date: Sun, 27 Feb 2005 23:15:22 +0000
Subject: [PATCH] Improve Pageant's error reporting for private key load
 failures.

git-svn-id: svn://svn.tartarus.org/sgt/putty@5409 cda61777-01e9-0310-a592-d414129be87e
---
 windows/winpgnt.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/windows/winpgnt.c b/windows/winpgnt.c
index 9f43bbf7..49cd311f 100644
--- a/windows/winpgnt.c
+++ b/windows/winpgnt.c
@@ -402,6 +402,7 @@ static void add_keyfile(Filename filename)
     int ret;
     int attempts;
     char *comment;
+    const char *error = NULL;
     struct PassphraseProcStruct pps;
     int type;
     int original_pass;
@@ -424,18 +425,20 @@ static void add_keyfile(Filename filename)
 	int i, nkeys, bloblen, keylistlen;
 
 	if (type == SSH_KEYTYPE_SSH1) {
-	    if (!rsakey_pubblob(&filename, &blob, &bloblen, NULL)) {
-		MessageBox(NULL, "Couldn't load private key.", APPNAME,
-			   MB_OK | MB_ICONERROR);
+	    if (!rsakey_pubblob(&filename, &blob, &bloblen, &error)) {
+		char *msg = dupprintf("Couldn't load private key (%s)", error);
+		MessageBox(NULL, msg, APPNAME, MB_OK | MB_ICONERROR);
+		sfree(msg);
 		return;
 	    }
 	    keylist = get_keylist1(&keylistlen);
 	} else {
 	    unsigned char *blob2;
-	    blob = ssh2_userkey_loadpub(&filename, NULL, &bloblen, NULL);
+	    blob = ssh2_userkey_loadpub(&filename, NULL, &bloblen, &error);
 	    if (!blob) {
-		MessageBox(NULL, "Couldn't load private key.", APPNAME,
-			   MB_OK | MB_ICONERROR);
+		char *msg = dupprintf("Couldn't load private key (%s)", error);
+		MessageBox(NULL, msg, APPNAME, MB_OK | MB_ICONERROR);
+		sfree(msg);
 		return;
 	    }
 	    /* For our purposes we want the blob prefixed with its length */
@@ -515,6 +518,7 @@ static void add_keyfile(Filename filename)
 	sfree(blob);
     }
 
+    error = NULL;
     if (type == SSH_KEYTYPE_SSH1)
 	needs_pass = rsakey_encrypted(&filename, &comment);
     else
@@ -548,9 +552,9 @@ static void add_keyfile(Filename filename)
 	} else
 	    *passphrase = '\0';
 	if (type == SSH_KEYTYPE_SSH1)
-	    ret = loadrsakey(&filename, rkey, passphrase, NULL);
+	    ret = loadrsakey(&filename, rkey, passphrase, &error);
 	else {
-	    skey = ssh2_load_userkey(&filename, passphrase, NULL);
+	    skey = ssh2_load_userkey(&filename, passphrase, &error);
 	    if (skey == SSH2_WRONG_PASSPHRASE)
 		ret = -1;
 	    else if (!skey)
@@ -570,8 +574,9 @@ static void add_keyfile(Filename filename)
     if (comment)
 	sfree(comment);
     if (ret == 0) {
-	MessageBox(NULL, "Couldn't load private key.", APPNAME,
-		   MB_OK | MB_ICONERROR);
+	char *msg = dupprintf("Couldn't load private key (%s)", error);
+	MessageBox(NULL, msg, APPNAME, MB_OK | MB_ICONERROR);
+	sfree(msg);
 	if (type == SSH_KEYTYPE_SSH1)
 	    sfree(rkey);
 	return;
-- 
2.11.0