X-Git-Url: https://git.distorted.org.uk/~mdw/sgt/putty/blobdiff_plain/aca589d972c5c12706d57322e89f9dec2b2a3a00..54018d95d47e4aff427c4e76f2d952c063ae077b:/cmdgen.c

diff --git a/cmdgen.c b/cmdgen.c
index 5042aa4e..83a158d4 100644
--- a/cmdgen.c
+++ b/cmdgen.c
@@ -739,15 +739,14 @@ int main(int argc, char **argv)
 
 	  case SSH_KEYTYPE_OPENSSH:
 	  case SSH_KEYTYPE_SSHCOM:
-	    ssh2key = import_ssh2(&infilename, intype, passphrase);
-	    if (ssh2key && ssh2key != SSH2_WRONG_PASSPHRASE)
-		error = NULL;
-	    else if (!error) {
-		if (ssh2key == SSH2_WRONG_PASSPHRASE)
-		    error = "wrong passphrase";
+	    ssh2key = import_ssh2(&infilename, intype, passphrase, &error);
+	    if (ssh2key) {
+		if (ssh2key != SSH2_WRONG_PASSPHRASE)
+		    error = NULL;
 		else
-		    error = "unknown error";
-	    }
+		    error = "wrong passphrase";
+	    } else if (!error)
+		error = "unknown error";
 	    break;
 
 	  default: