Fix a mishandling of error returns from makekey() in the SSH-1 private

key loader.

[originally from svn r9905]

diff --git a/sshpubk.c b/sshpubk.c
index b860040dbfbe55f321978a8c2b0d8c6fdead895f..4db37c2bf0917bf081789cd37dbdc6714b368d7c 100644 (file)
--- a/sshpubk.c
+++ b/sshpubk.c
@@ -67,9 +67,10 @@ static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
     i += 4;
 
     /* Now the serious stuff. An ordinary SSH-1 public key. */
-    i += makekey(buf + i, len, key, NULL, 1);
-    if (i < 0)
+    j = makekey(buf + i, len, key, NULL, 1);
+    if (j < 0)
        goto end;                      /* overran */
+    i += j;
 
     /* Next, the comment field. */
     j = GET_32BIT(buf + i);