It's a new year.

[PuTTY.git] / sshpubk.c

diff --git a/sshpubk.c b/sshpubk.c
index 72aaaa97a5384aaccdea5dc4af922005987a24b4..87f1ebf3db179abbbec1c5fa996e3cb3505d49b3 100644 (file)
--- a/sshpubk.c
+++ b/sshpubk.c
@@ -463,7 +463,7 @@ static int read_header(FILE * fp, char *header)
     int len = 39;
     int c;
 
-    while (len > 0) {
+    while (1) {
        c = fgetc(fp);
        if (c == '\n' || c == '\r' || c == EOF)
            return 0;                  /* failure */
@@ -513,54 +513,6 @@ static char *read_body(FILE * fp)
     }
 }
 
-int base64_decode_atom(char *atom, unsigned char *out)
-{
-    int vals[4];
-    int i, v, len;
-    unsigned word;
-    char c;
-
-    for (i = 0; i < 4; i++) {
-       c = atom[i];
-       if (c >= 'A' && c <= 'Z')
-           v = c - 'A';
-       else if (c >= 'a' && c <= 'z')
-           v = c - 'a' + 26;
-       else if (c >= '0' && c <= '9')
-           v = c - '0' + 52;
-       else if (c == '+')
-           v = 62;
-       else if (c == '/')
-           v = 63;
-       else if (c == '=')
-           v = -1;
-       else
-           return 0;                  /* invalid atom */
-       vals[i] = v;
-    }
-
-    if (vals[0] == -1 || vals[1] == -1)
-       return 0;
-    if (vals[2] == -1 && vals[3] != -1)
-       return 0;
-
-    if (vals[3] != -1)
-       len = 3;
-    else if (vals[2] != -1)
-       len = 2;
-    else
-       len = 1;
-
-    word = ((vals[0] << 18) |
-           (vals[1] << 12) | ((vals[2] & 0x3F) << 6) | (vals[3] & 0x3F));
-    out[0] = (word >> 16) & 0xFF;
-    if (len > 1)
-       out[1] = (word >> 8) & 0xFF;
-    if (len > 2)
-       out[2] = word & 0xFF;
-    return len;
-}
-
 static unsigned char *read_blob(FILE * fp, int nlines, int *bloblen)
 {
     unsigned char *blob;
@@ -827,6 +779,7 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
        }
     }
     sfree(mac);
+    mac = NULL;
 
     /*
      * Create and return the key.
@@ -837,7 +790,6 @@ struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
     ret->data = alg->createkey(public_blob, public_blob_len,
                               private_blob, private_blob_len);
     if (!ret->data) {
-       sfree(ret->comment);
        sfree(ret);
        ret = NULL;
        error = "createkey failed";
@@ -1008,6 +960,8 @@ int ssh2_userkey_encrypted(const Filename *filename, char **commentptr)
 
     if (commentptr)
        *commentptr = comment;
+    else
+        sfree(comment);
 
     fclose(fp);
     if (!strcmp(b, "aes256-cbc"))