projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Give a better error message if a PuTTY private key file has a version
[u/mdw/putty]
/
sshpubk.c
diff --git
a/sshpubk.c
b/sshpubk.c
index
79b224c
..
76aa343
100644
(file)
--- a/
sshpubk.c
+++ b/
sshpubk.c
@@
-108,7
+108,7
@@
static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c);
des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c);
des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
-
memset(keybuf, 0, sizeof(keybuf));
/* burn the evidence */
+
smemclr(keybuf, sizeof(keybuf));
/* burn the evidence */
}
/*
}
/*
@@
-150,7
+150,7
@@
static int loadrsakey_main(FILE * fp, struct RSAKey *key, int pub_only,
ret = 1;
end:
ret = 1;
end:
-
memset(buf, 0
, sizeof(buf)); /* burn the evidence */
+
smemclr(buf
, sizeof(buf)); /* burn the evidence */
return ret;
}
return ret;
}
@@
-162,7
+162,7
@@
int loadrsakey(const Filename *filename, struct RSAKey *key, char *passphrase,
int ret = 0;
const char *error = NULL;
int ret = 0;
const char *error = NULL;
- fp = f_open(
*filename, "rb"
);
+ fp = f_open(
filename, "rb", FALSE
);
if (!fp) {
error = "can't open file";
goto end;
if (!fp) {
error = "can't open file";
goto end;
@@
-203,7
+203,7
@@
int rsakey_encrypted(const Filename *filename, char **comment)
FILE *fp;
char buf[64];
FILE *fp;
char buf[64];
- fp = f_open(
*filename, "rb"
);
+ fp = f_open(
filename, "rb", FALSE
);
if (!fp)
return 0; /* doesn't even exist */
if (!fp)
return 0; /* doesn't even exist */
@@
-241,7
+241,7
@@
int rsakey_pubblob(const Filename *filename, void **blob, int *bloblen,
*bloblen = 0;
ret = 0;
*bloblen = 0;
ret = 0;
- fp = f_open(
*filename, "rb"
);
+ fp = f_open(
filename, "rb", FALSE
);
if (!fp) {
error = "can't open file";
goto end;
if (!fp) {
error = "can't open file";
goto end;
@@
-358,13
+358,13
@@
int saversakey(const Filename *filename, struct RSAKey *key, char *passphrase)
MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c);
des3_encrypt_pubkey(keybuf, estart, p - estart);
MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
MD5Final(keybuf, &md5c);
des3_encrypt_pubkey(keybuf, estart, p - estart);
-
memset(keybuf, 0, sizeof(keybuf));
/* burn the evidence */
+
smemclr(keybuf, sizeof(keybuf));
/* burn the evidence */
}
/*
* Done. Write the result to the file.
*/
}
/*
* Done. Write the result to the file.
*/
- fp = f_open(
*filename, "wb"
);
+ fp = f_open(
filename, "wb", TRUE
);
if (fp) {
int ret = (fwrite(buf, 1, p - buf, fp) == (size_t) (p - buf));
if (fclose(fp))
if (fp) {
int ret = (fwrite(buf, 1, p - buf, fp) == (size_t) (p - buf));
if (fclose(fp))
@@
-495,16
+495,14
@@
static char *read_body(FILE * fp)
while (1) {
c = fgetc(fp);
while (1) {
c = fgetc(fp);
- if (c == '\r' || c == '\n') {
- c = fgetc(fp);
- if (c != '\r' && c != '\n' && c != EOF)
- ungetc(c, fp);
+ if (c == '\r' || c == '\n' || c == EOF) {
+ if (c != EOF) {
+ c = fgetc(fp);
+ if (c != '\r' && c != '\n')
+ ungetc(c, fp);
+ }
return text;
}
return text;
}
- if (c == EOF) {
- sfree(text);
- return NULL;
- }
if (len + 1 >= size) {
size += 128;
text = sresize(text, size, char);
if (len + 1 >= size) {
size += 128;
text = sresize(text, size, char);
@@
-634,7
+632,7
@@
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
encryption = comment = mac = NULL;
public_blob = private_blob = NULL;
encryption = comment = mac = NULL;
public_blob = private_blob = NULL;
- fp = f_open(
*filename, "rb"
);
+ fp = f_open(
filename, "rb", FALSE
);
if (!fp) {
error = "can't open file";
goto error;
if (!fp) {
error = "can't open file";
goto error;
@@
-649,6
+647,11
@@
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
/* this is an old key file; warn and then continue */
old_keyfile_warning();
old_fmt = 1;
/* this is an old key file; warn and then continue */
old_keyfile_warning();
old_fmt = 1;
+ } else if (0 == strncmp(header, "PuTTY-User-Key-File-", 20)) {
+ /* this is a key file FROM THE FUTURE; refuse it, but with a
+ * more specific error message than the generic one below */
+ error = "PuTTY key format too new";
+ goto error;
} else {
error = "not a PuTTY SSH-2 private key";
goto error;
} else {
error = "not a PuTTY SSH-2 private key";
goto error;
@@
-796,14
+799,14
@@
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
hmac_sha1_simple(mackey, 20, macdata, maclen, binary);
hmac_sha1_simple(mackey, 20, macdata, maclen, binary);
-
memset(mackey, 0
, sizeof(mackey));
-
memset(&s, 0
, sizeof(s));
+
smemclr(mackey
, sizeof(mackey));
+
smemclr(&s
, sizeof(s));
} else {
SHA_Simple(macdata, maclen, binary);
}
if (free_macdata) {
} else {
SHA_Simple(macdata, maclen, binary);
}
if (free_macdata) {
-
memset(macdata, 0
, maclen);
+
smemclr(macdata
, maclen);
sfree(macdata);
}
sfree(macdata);
}
@@
-883,7
+886,7
@@
unsigned char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
public_blob = NULL;
public_blob = NULL;
- fp = f_open(
*filename, "rb"
);
+ fp = f_open(
filename, "rb", FALSE
);
if (!fp) {
error = "can't open file";
goto error;
if (!fp) {
error = "can't open file";
goto error;
@@
-893,7
+896,10
@@
unsigned char *ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
if (!read_header(fp, header)
|| (0 != strcmp(header, "PuTTY-User-Key-File-2") &&
0 != strcmp(header, "PuTTY-User-Key-File-1"))) {
if (!read_header(fp, header)
|| (0 != strcmp(header, "PuTTY-User-Key-File-2") &&
0 != strcmp(header, "PuTTY-User-Key-File-1"))) {
- error = "not a PuTTY SSH-2 private key";
+ if (0 == strncmp(header, "PuTTY-User-Key-File-", 20))
+ error = "PuTTY key format too new";
+ else
+ error = "not a PuTTY SSH-2 private key";
goto error;
}
error = "file format error";
goto error;
}
error = "file format error";
@@
-964,7
+970,7
@@
int ssh2_userkey_encrypted(const Filename *filename, char **commentptr)
if (commentptr)
*commentptr = NULL;
if (commentptr)
*commentptr = NULL;
- fp = f_open(
*filename, "rb"
);
+ fp = f_open(
filename, "rb", FALSE
);
if (!fp)
return 0;
if (!read_header(fp, header)
if (!fp)
return 0;
if (!read_header(fp, header)
@@
-1118,10
+1124,10
@@
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
SHA_Bytes(&s, passphrase, strlen(passphrase));
SHA_Final(&s, mackey);
hmac_sha1_simple(mackey, 20, macdata, maclen, priv_mac);
SHA_Bytes(&s, passphrase, strlen(passphrase));
SHA_Final(&s, mackey);
hmac_sha1_simple(mackey, 20, macdata, maclen, priv_mac);
-
memset(macdata, 0
, maclen);
+
smemclr(macdata
, maclen);
sfree(macdata);
sfree(macdata);
-
memset(mackey, 0
, sizeof(mackey));
-
memset(&s, 0
, sizeof(s));
+
smemclr(mackey
, sizeof(mackey));
+
smemclr(&s
, sizeof(s));
}
if (passphrase) {
}
if (passphrase) {
@@
-1141,11
+1147,11
@@
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
aes256_encrypt_pubkey(key, priv_blob_encrypted,
priv_encrypted_len);
aes256_encrypt_pubkey(key, priv_blob_encrypted,
priv_encrypted_len);
-
memset(key, 0
, sizeof(key));
-
memset(&s, 0
, sizeof(s));
+
smemclr(key
, sizeof(key));
+
smemclr(&s
, sizeof(s));
}
}
- fp = f_open(
*filename, "w"
);
+ fp = f_open(
filename, "w", TRUE
);
if (!fp)
return 0;
fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name);
if (!fp)
return 0;
fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name);
@@
-1162,7
+1168,7
@@
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
fclose(fp);
sfree(pub_blob);
fclose(fp);
sfree(pub_blob);
-
memset(priv_blob, 0
, priv_blob_len);
+
smemclr(priv_blob
, priv_blob_len);
sfree(priv_blob);
sfree(priv_blob_encrypted);
return 1;
sfree(priv_blob);
sfree(priv_blob_encrypted);
return 1;
@@
-1181,7
+1187,7
@@
int key_type(const Filename *filename)
const char openssh_sig[] = "-----BEGIN ";
int i;
const char openssh_sig[] = "-----BEGIN ";
int i;
- fp = f_open(
*filename, "r"
);
+ fp = f_open(
filename, "r", FALSE
);
if (!fp)
return SSH_KEYTYPE_UNOPENABLE;
i = fread(buf, 1, sizeof(buf), fp);
if (!fp)
return SSH_KEYTYPE_UNOPENABLE;
i = fread(buf, 1, sizeof(buf), fp);