2000-09-07 16:40:50 +00:00
|
|
|
/*
|
2000-09-25 10:14:53 +00:00
|
|
|
* Generic SSH public-key handling operations. In particular,
|
|
|
|
* reading of SSH public-key files, and also the generic `sign'
|
2005-03-10 16:36:05 +00:00
|
|
|
* operation for SSH-2 (which checks the type of the key and
|
2000-09-25 10:14:53 +00:00
|
|
|
* dispatches to the appropriate key-type specific function).
|
2000-09-07 16:40:50 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
2000-09-25 10:14:53 +00:00
|
|
|
#include <stdlib.h>
|
2001-03-03 11:54:34 +00:00
|
|
|
#include <assert.h>
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2003-02-01 12:54:40 +00:00
|
|
|
#include "putty.h"
|
2000-09-07 16:40:50 +00:00
|
|
|
#include "ssh.h"
|
2001-11-25 14:31:46 +00:00
|
|
|
#include "misc.h"
|
2000-09-07 16:40:50 +00:00
|
|
|
|
|
|
|
#define rsa_signature "SSH PRIVATE KEY FILE FORMAT 1.1\n"
|
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
#define BASE64_TOINT(x) ( (x)-'A'<26 ? (x)-'A'+0 :\
|
|
|
|
(x)-'a'<26 ? (x)-'a'+26 :\
|
|
|
|
(x)-'0'<10 ? (x)-'0'+52 :\
|
|
|
|
(x)=='+' ? 62 : \
|
|
|
|
(x)=='/' ? 63 : 0 )
|
|
|
|
|
2015-05-12 11:19:57 +00:00
|
|
|
static int key_type_fp(FILE *fp);
|
|
|
|
|
2018-05-24 07:22:44 +00:00
|
|
|
static int rsa_ssh1_load_main(FILE * fp, struct RSAKey *key, int pub_only,
|
|
|
|
char **commentptr, const char *passphrase,
|
|
|
|
const char **error)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2000-09-07 16:40:50 +00:00
|
|
|
unsigned char buf[16384];
|
|
|
|
unsigned char keybuf[16];
|
|
|
|
int len;
|
|
|
|
int i, j, ciphertype;
|
|
|
|
int ret = 0;
|
|
|
|
struct MD5Context md5c;
|
2000-09-25 10:14:53 +00:00
|
|
|
char *comment;
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2003-08-29 22:52:57 +00:00
|
|
|
*error = NULL;
|
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
/* Slurp the whole file (minus the header) into a buffer. */
|
2000-09-07 16:40:50 +00:00
|
|
|
len = fread(buf, 1, sizeof(buf), fp);
|
|
|
|
fclose(fp);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (len < 0 || len == sizeof(buf)) {
|
|
|
|
*error = "error reading file";
|
2001-05-06 14:35:20 +00:00
|
|
|
goto end; /* file too big or not read */
|
2003-08-29 22:52:57 +00:00
|
|
|
}
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
i = 0;
|
2003-08-29 22:52:57 +00:00
|
|
|
*error = "file format error";
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
/*
|
|
|
|
* A zero byte. (The signature includes a terminating NUL.)
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
if (len - i < 1 || buf[i] != 0)
|
|
|
|
goto end;
|
2000-09-25 10:14:53 +00:00
|
|
|
i++;
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
/* One byte giving encryption type, and one reserved uint32. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (len - i < 1)
|
|
|
|
goto end;
|
2000-09-07 16:40:50 +00:00
|
|
|
ciphertype = buf[i];
|
|
|
|
if (ciphertype != 0 && ciphertype != SSH_CIPHER_3DES)
|
2001-05-06 14:35:20 +00:00
|
|
|
goto end;
|
2000-09-07 16:40:50 +00:00
|
|
|
i++;
|
2001-05-06 14:35:20 +00:00
|
|
|
if (len - i < 4)
|
|
|
|
goto end; /* reserved field not present */
|
|
|
|
if (buf[i] != 0 || buf[i + 1] != 0 || buf[i + 2] != 0
|
|
|
|
|| buf[i + 3] != 0) goto end; /* reserved field nonzero, panic! */
|
2000-09-07 16:40:50 +00:00
|
|
|
i += 4;
|
|
|
|
|
2005-03-10 16:36:05 +00:00
|
|
|
/* Now the serious stuff. An ordinary SSH-1 public key. */
|
2018-05-24 07:22:44 +00:00
|
|
|
j = rsa_ssh1_readpub(buf + i, len - i, key, NULL, RSA_SSH1_MODULUS_FIRST);
|
2013-07-11 17:24:04 +00:00
|
|
|
if (j < 0)
|
2001-05-06 14:35:20 +00:00
|
|
|
goto end; /* overran */
|
2013-07-11 17:24:04 +00:00
|
|
|
i += j;
|
2000-09-07 16:40:50 +00:00
|
|
|
|
|
|
|
/* Next, the comment field. */
|
2013-07-14 10:45:54 +00:00
|
|
|
j = toint(GET_32BIT(buf + i));
|
2000-09-14 15:02:50 +00:00
|
|
|
i += 4;
|
2013-07-11 17:24:01 +00:00
|
|
|
if (j < 0 || len - i < j)
|
2001-05-06 14:35:20 +00:00
|
|
|
goto end;
|
2003-03-29 16:14:26 +00:00
|
|
|
comment = snewn(j + 1, char);
|
2000-09-25 10:14:53 +00:00
|
|
|
if (comment) {
|
2001-05-06 14:35:20 +00:00
|
|
|
memcpy(comment, buf + i, j);
|
|
|
|
comment[j] = '\0';
|
2000-09-14 15:02:50 +00:00
|
|
|
}
|
|
|
|
i += j;
|
2000-09-25 10:14:53 +00:00
|
|
|
if (commentptr)
|
2005-10-30 16:28:45 +00:00
|
|
|
*commentptr = dupstr(comment);
|
2000-09-25 10:14:53 +00:00
|
|
|
if (key)
|
2001-05-06 14:35:20 +00:00
|
|
|
key->comment = comment;
|
2005-10-30 16:28:45 +00:00
|
|
|
else
|
|
|
|
sfree(comment);
|
|
|
|
|
|
|
|
if (pub_only) {
|
|
|
|
ret = 1;
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
if (!key) {
|
2003-08-29 22:52:57 +00:00
|
|
|
ret = ciphertype != 0;
|
|
|
|
*error = NULL;
|
|
|
|
goto end;
|
2000-09-25 10:14:53 +00:00
|
|
|
}
|
2000-09-07 16:40:50 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Decrypt remainder of buffer.
|
|
|
|
*/
|
|
|
|
if (ciphertype) {
|
2001-05-06 14:35:20 +00:00
|
|
|
MD5Init(&md5c);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_data(&md5c, passphrase, strlen(passphrase));
|
2001-05-06 14:35:20 +00:00
|
|
|
MD5Final(keybuf, &md5c);
|
|
|
|
des3_decrypt_pubkey(keybuf, buf + i, (len - i + 7) & ~7);
|
2012-07-22 19:51:50 +00:00
|
|
|
smemclr(keybuf, sizeof(keybuf)); /* burn the evidence */
|
2000-09-07 16:40:50 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* We are now in the secret part of the key. The first four
|
|
|
|
* bytes should be of the form a, b, a, b.
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
if (len - i < 4)
|
|
|
|
goto end;
|
|
|
|
if (buf[i] != buf[i + 2] || buf[i + 1] != buf[i + 3]) {
|
2003-08-29 22:52:57 +00:00
|
|
|
*error = "wrong passphrase";
|
2001-05-06 14:35:20 +00:00
|
|
|
ret = -1;
|
|
|
|
goto end;
|
|
|
|
}
|
2000-09-07 16:40:50 +00:00
|
|
|
i += 4;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* After that, we have one further bignum which is our
|
2000-10-19 15:43:08 +00:00
|
|
|
* decryption exponent, and then the three auxiliary values
|
|
|
|
* (iqmp, q, p).
|
2000-09-07 16:40:50 +00:00
|
|
|
*/
|
2018-05-24 07:22:44 +00:00
|
|
|
j = rsa_ssh1_readpriv(buf + i, len - i, key);
|
2004-08-01 12:07:11 +00:00
|
|
|
if (j < 0) goto end;
|
|
|
|
i += j;
|
|
|
|
j = ssh1_read_bignum(buf + i, len - i, &key->iqmp);
|
|
|
|
if (j < 0) goto end;
|
|
|
|
i += j;
|
|
|
|
j = ssh1_read_bignum(buf + i, len - i, &key->q);
|
|
|
|
if (j < 0) goto end;
|
|
|
|
i += j;
|
|
|
|
j = ssh1_read_bignum(buf + i, len - i, &key->p);
|
|
|
|
if (j < 0) goto end;
|
|
|
|
i += j;
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2001-03-22 21:48:33 +00:00
|
|
|
if (!rsa_verify(key)) {
|
2003-08-29 22:52:57 +00:00
|
|
|
*error = "rsa_verify failed";
|
2001-03-22 21:48:33 +00:00
|
|
|
freersakey(key);
|
|
|
|
ret = 0;
|
|
|
|
} else
|
|
|
|
ret = 1;
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
end:
|
2012-07-22 19:51:50 +00:00
|
|
|
smemclr(buf, sizeof(buf)); /* burn the evidence */
|
2000-09-07 16:40:50 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-05-24 07:22:44 +00:00
|
|
|
int rsa_ssh1_loadkey(const Filename *filename, struct RSAKey *key,
|
|
|
|
const char *passphrase, const char **errorstr)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2000-09-07 16:40:50 +00:00
|
|
|
FILE *fp;
|
2003-01-05 14:11:14 +00:00
|
|
|
char buf[64];
|
2003-08-29 22:52:57 +00:00
|
|
|
int ret = 0;
|
|
|
|
const char *error = NULL;
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "rb", FALSE);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (!fp) {
|
|
|
|
error = "can't open file";
|
|
|
|
goto end;
|
|
|
|
}
|
2000-09-07 16:40:50 +00:00
|
|
|
|
2000-09-25 10:14:53 +00:00
|
|
|
/*
|
|
|
|
* Read the first line of the file and see if it's a v1 private
|
|
|
|
* key file.
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
if (fgets(buf, sizeof(buf), fp) && !strcmp(buf, rsa_signature)) {
|
2003-11-19 17:30:16 +00:00
|
|
|
/*
|
|
|
|
* This routine will take care of calling fclose() for us.
|
|
|
|
*/
|
2018-05-24 07:22:44 +00:00
|
|
|
ret = rsa_ssh1_load_main(fp, key, FALSE, NULL, passphrase, &error);
|
2004-01-22 19:15:32 +00:00
|
|
|
fp = NULL;
|
2003-08-29 22:52:57 +00:00
|
|
|
goto end;
|
2000-09-25 10:14:53 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Otherwise, we have nothing. Return empty-handed.
|
|
|
|
*/
|
2003-08-29 22:52:57 +00:00
|
|
|
error = "not an SSH-1 RSA file";
|
|
|
|
|
|
|
|
end:
|
2004-01-22 19:15:32 +00:00
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
2003-08-29 22:52:57 +00:00
|
|
|
if ((ret != 1) && errorstr)
|
|
|
|
*errorstr = error;
|
|
|
|
return ret;
|
2000-09-07 16:40:50 +00:00
|
|
|
}
|
2000-09-25 10:14:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* See whether an RSA key is encrypted. Return its comment field as
|
|
|
|
* well.
|
|
|
|
*/
|
2018-05-24 07:22:44 +00:00
|
|
|
int rsa_ssh1_encrypted(const Filename *filename, char **comment)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2000-09-25 10:14:53 +00:00
|
|
|
FILE *fp;
|
2003-01-05 14:11:14 +00:00
|
|
|
char buf[64];
|
2000-09-25 10:14:53 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "rb", FALSE);
|
2000-09-25 10:14:53 +00:00
|
|
|
if (!fp)
|
2001-05-06 14:35:20 +00:00
|
|
|
return 0; /* doesn't even exist */
|
2000-09-25 10:14:53 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the first line of the file and see if it's a v1 private
|
|
|
|
* key file.
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
if (fgets(buf, sizeof(buf), fp) && !strcmp(buf, rsa_signature)) {
|
2003-08-29 22:52:57 +00:00
|
|
|
const char *dummy;
|
2003-11-19 17:30:16 +00:00
|
|
|
/*
|
|
|
|
* This routine will take care of calling fclose() for us.
|
|
|
|
*/
|
2018-05-24 07:22:44 +00:00
|
|
|
return rsa_ssh1_load_main(fp, NULL, FALSE, comment, NULL, &dummy);
|
2000-09-25 10:14:53 +00:00
|
|
|
}
|
2000-10-20 17:57:47 +00:00
|
|
|
fclose(fp);
|
2001-05-06 14:35:20 +00:00
|
|
|
return 0; /* wasn't the right kind of file */
|
2000-09-25 10:14:53 +00:00
|
|
|
}
|
2000-10-19 15:43:08 +00:00
|
|
|
|
2001-12-30 15:58:17 +00:00
|
|
|
/*
|
2018-05-24 09:59:39 +00:00
|
|
|
* Read the public part of an SSH-1 RSA key from a file (public or
|
|
|
|
* private), and generate its public blob in exponent-first order.
|
2001-12-30 15:58:17 +00:00
|
|
|
*/
|
2018-05-24 09:59:39 +00:00
|
|
|
int rsa_ssh1_loadpub(const Filename *filename, BinarySink *bs,
|
2018-05-24 07:22:44 +00:00
|
|
|
char **commentptr, const char **errorstr)
|
2001-12-30 15:58:17 +00:00
|
|
|
{
|
|
|
|
FILE *fp;
|
2003-01-05 14:11:14 +00:00
|
|
|
char buf[64];
|
2001-12-30 15:58:17 +00:00
|
|
|
struct RSAKey key;
|
|
|
|
int ret;
|
2003-08-29 22:52:57 +00:00
|
|
|
const char *error = NULL;
|
2001-12-30 15:58:17 +00:00
|
|
|
|
|
|
|
/* Default return if we fail. */
|
2018-05-24 09:59:39 +00:00
|
|
|
ret = FALSE;
|
2001-12-30 15:58:17 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "rb", FALSE);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (!fp) {
|
|
|
|
error = "can't open file";
|
|
|
|
goto end;
|
|
|
|
}
|
2001-12-30 15:58:17 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Read the first line of the file and see if it's a v1 private
|
|
|
|
* key file.
|
|
|
|
*/
|
|
|
|
if (fgets(buf, sizeof(buf), fp) && !strcmp(buf, rsa_signature)) {
|
|
|
|
memset(&key, 0, sizeof(key));
|
2018-05-24 07:22:44 +00:00
|
|
|
if (rsa_ssh1_load_main(fp, &key, TRUE, commentptr, NULL, &error)) {
|
2018-05-24 09:59:39 +00:00
|
|
|
rsa_ssh1_public_blob(bs, &key, RSA_SSH1_EXPONENT_FIRST);
|
2001-12-30 15:58:17 +00:00
|
|
|
freersakey(&key);
|
2018-05-24 09:59:39 +00:00
|
|
|
ret = TRUE;
|
2001-12-30 15:58:17 +00:00
|
|
|
}
|
2018-05-24 07:22:44 +00:00
|
|
|
fp = NULL; /* rsa_ssh1_load_main unconditionally closes fp */
|
2003-08-29 22:52:57 +00:00
|
|
|
} else {
|
2015-05-12 11:19:57 +00:00
|
|
|
/*
|
|
|
|
* Try interpreting the file as an SSH-1 public key.
|
|
|
|
*/
|
|
|
|
char *line, *p, *bitsp, *expp, *modp, *commentp;
|
|
|
|
|
|
|
|
rewind(fp);
|
|
|
|
line = chomp(fgetline(fp));
|
|
|
|
p = line;
|
|
|
|
|
|
|
|
bitsp = p;
|
|
|
|
p += strspn(p, "0123456789");
|
|
|
|
if (*p != ' ')
|
|
|
|
goto not_public_either;
|
|
|
|
*p++ = '\0';
|
|
|
|
|
|
|
|
expp = p;
|
|
|
|
p += strspn(p, "0123456789");
|
|
|
|
if (*p != ' ')
|
|
|
|
goto not_public_either;
|
|
|
|
*p++ = '\0';
|
|
|
|
|
|
|
|
modp = p;
|
|
|
|
p += strspn(p, "0123456789");
|
|
|
|
if (*p) {
|
|
|
|
if (*p != ' ')
|
|
|
|
goto not_public_either;
|
|
|
|
*p++ = '\0';
|
|
|
|
commentp = p;
|
|
|
|
} else {
|
|
|
|
commentp = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
memset(&key, 0, sizeof(key));
|
|
|
|
key.exponent = bignum_from_decimal(expp);
|
|
|
|
key.modulus = bignum_from_decimal(modp);
|
|
|
|
if (atoi(bitsp) != bignum_bitcount(key.modulus)) {
|
|
|
|
freebn(key.exponent);
|
|
|
|
freebn(key.modulus);
|
|
|
|
sfree(line);
|
|
|
|
error = "key bit count does not match in SSH-1 public key file";
|
|
|
|
goto end;
|
|
|
|
}
|
|
|
|
if (commentptr)
|
|
|
|
*commentptr = commentp ? dupstr(commentp) : NULL;
|
2018-05-24 09:59:39 +00:00
|
|
|
rsa_ssh1_public_blob(bs, &key, RSA_SSH1_EXPONENT_FIRST);
|
2015-05-12 11:19:57 +00:00
|
|
|
freersakey(&key);
|
2017-01-23 18:04:50 +00:00
|
|
|
sfree(line);
|
2017-01-23 17:58:17 +00:00
|
|
|
fclose(fp);
|
2018-05-24 09:59:39 +00:00
|
|
|
return TRUE;
|
2015-05-12 11:19:57 +00:00
|
|
|
|
|
|
|
not_public_either:
|
|
|
|
sfree(line);
|
2003-08-29 22:52:57 +00:00
|
|
|
error = "not an SSH-1 RSA file";
|
2001-12-30 15:58:17 +00:00
|
|
|
}
|
2003-08-29 22:52:57 +00:00
|
|
|
|
|
|
|
end:
|
2003-11-19 17:30:16 +00:00
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
2003-08-29 22:52:57 +00:00
|
|
|
if ((ret != 1) && errorstr)
|
|
|
|
*errorstr = error;
|
2001-12-30 15:58:17 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2000-10-19 15:43:08 +00:00
|
|
|
/*
|
|
|
|
* Save an RSA key file. Return nonzero on success.
|
|
|
|
*/
|
2018-05-24 07:22:44 +00:00
|
|
|
int rsa_ssh1_savekey(const Filename *filename, struct RSAKey *key,
|
|
|
|
char *passphrase)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2018-05-24 12:11:56 +00:00
|
|
|
strbuf *buf = strbuf_new();
|
|
|
|
int estart;
|
2000-10-19 15:43:08 +00:00
|
|
|
FILE *fp;
|
|
|
|
|
|
|
|
/*
|
2018-05-24 12:11:56 +00:00
|
|
|
* The public part of the key.
|
2000-10-19 15:43:08 +00:00
|
|
|
*/
|
2018-05-24 12:11:56 +00:00
|
|
|
put_data(buf, rsa_signature, sizeof(rsa_signature));
|
|
|
|
put_byte(buf, passphrase ? SSH_CIPHER_3DES : 0); /* encryption type */
|
|
|
|
put_uint32(buf, 0); /* reserved */
|
|
|
|
rsa_ssh1_public_blob(BinarySink_UPCAST(buf), key,
|
|
|
|
RSA_SSH1_MODULUS_FIRST);
|
|
|
|
put_stringz(buf, NULLTOEMPTY(key->comment));
|
2000-10-19 15:43:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* The encrypted portion starts here.
|
|
|
|
*/
|
2018-05-24 12:11:56 +00:00
|
|
|
estart = buf->len;
|
2000-10-19 15:43:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Two bytes, then the same two bytes repeated.
|
|
|
|
*/
|
2018-05-24 12:11:56 +00:00
|
|
|
{
|
|
|
|
unsigned char b0 = random_byte();
|
|
|
|
unsigned char b1 = random_byte();
|
|
|
|
put_byte(buf, b0);
|
|
|
|
put_byte(buf, b1);
|
|
|
|
put_byte(buf, b0);
|
|
|
|
put_byte(buf, b1);
|
|
|
|
}
|
2000-10-19 15:43:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Four more bignums: the decryption exponent, then iqmp, then
|
|
|
|
* q, then p.
|
|
|
|
*/
|
2018-05-24 12:11:56 +00:00
|
|
|
put_mp_ssh1(buf, key->private_exponent);
|
|
|
|
put_mp_ssh1(buf, key->iqmp);
|
|
|
|
put_mp_ssh1(buf, key->q);
|
|
|
|
put_mp_ssh1(buf, key->p);
|
2000-10-19 15:43:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Now write zeros until the encrypted portion is a multiple of
|
|
|
|
* 8 bytes.
|
|
|
|
*/
|
2018-05-24 12:11:56 +00:00
|
|
|
while ((buf->len - estart) % 8)
|
|
|
|
put_byte(buf, 0);
|
2000-10-19 15:43:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Now encrypt the encrypted portion.
|
|
|
|
*/
|
|
|
|
if (passphrase) {
|
2018-05-24 12:11:56 +00:00
|
|
|
struct MD5Context md5c;
|
|
|
|
unsigned char keybuf[16];
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
MD5Init(&md5c);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_data(&md5c, passphrase, strlen(passphrase));
|
2001-05-06 14:35:20 +00:00
|
|
|
MD5Final(keybuf, &md5c);
|
2018-05-24 12:11:56 +00:00
|
|
|
des3_encrypt_pubkey(keybuf, buf->u + estart, buf->len - estart);
|
2012-07-22 19:51:50 +00:00
|
|
|
smemclr(keybuf, sizeof(keybuf)); /* burn the evidence */
|
2000-10-19 15:43:08 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Done. Write the result to the file.
|
|
|
|
*/
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "wb", TRUE);
|
2000-10-19 15:43:08 +00:00
|
|
|
if (fp) {
|
2018-05-24 12:11:56 +00:00
|
|
|
int ret = (fwrite(buf->u, 1, buf->len, fp) == (size_t) (buf->len));
|
2004-11-22 11:02:44 +00:00
|
|
|
if (fclose(fp))
|
|
|
|
ret = 0;
|
2001-05-06 14:35:20 +00:00
|
|
|
return ret;
|
2000-10-19 15:43:08 +00:00
|
|
|
} else
|
2001-05-06 14:35:20 +00:00
|
|
|
return 0;
|
2000-10-19 15:43:08 +00:00
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/* ----------------------------------------------------------------------
|
2005-03-10 16:36:05 +00:00
|
|
|
* SSH-2 private key load/store functions.
|
2001-03-03 11:54:34 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
2005-03-10 16:36:05 +00:00
|
|
|
* PuTTY's own format for SSH-2 keys is as follows:
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* The file is text. Lines are terminated by CRLF, although CR-only
|
|
|
|
* and LF-only are tolerated on input.
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-11-25 14:31:46 +00:00
|
|
|
* The first line says "PuTTY-User-Key-File-2: " plus the name of the
|
2001-09-22 20:52:21 +00:00
|
|
|
* algorithm ("ssh-dss", "ssh-rsa" etc).
|
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* The next line says "Encryption: " plus an encryption type.
|
|
|
|
* Currently the only supported encryption types are "aes256-cbc"
|
|
|
|
* and "none".
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* The next line says "Comment: " plus the comment string.
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* Next there is a line saying "Public-Lines: " plus a number N.
|
|
|
|
* The following N lines contain a base64 encoding of the public
|
2005-03-10 16:36:05 +00:00
|
|
|
* part of the key. This is encoded as the standard SSH-2 public key
|
2001-03-03 11:54:34 +00:00
|
|
|
* blob (with no initial length): so for RSA, for example, it will
|
|
|
|
* read
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* string "ssh-rsa"
|
|
|
|
* mpint exponent
|
|
|
|
* mpint modulus
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* Next, there is a line saying "Private-Lines: " plus a number N,
|
|
|
|
* and then N lines containing the (potentially encrypted) private
|
|
|
|
* part of the key. For the key type "ssh-rsa", this will be
|
|
|
|
* composed of
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* mpint private_exponent
|
|
|
|
* mpint p (the larger of the two primes)
|
|
|
|
* mpint q (the smaller prime)
|
|
|
|
* mpint iqmp (the inverse of q modulo p)
|
|
|
|
* data padding (to reach a multiple of the cipher block size)
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
|
|
|
* And for "ssh-dss", it will be composed of
|
|
|
|
*
|
|
|
|
* mpint x (the private key parameter)
|
2001-11-25 14:31:46 +00:00
|
|
|
* [ string hash 20-byte hash of mpints p || q || g only in old format ]
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-11-25 14:31:46 +00:00
|
|
|
* Finally, there is a line saying "Private-MAC: " plus a hex
|
|
|
|
* representation of a HMAC-SHA-1 of:
|
|
|
|
*
|
|
|
|
* string name of algorithm ("ssh-dss", "ssh-rsa")
|
|
|
|
* string encryption type
|
|
|
|
* string comment
|
|
|
|
* string public-blob
|
|
|
|
* string private-plaintext (the plaintext version of the
|
|
|
|
* private part, including the final
|
|
|
|
* padding)
|
2001-03-03 11:54:34 +00:00
|
|
|
*
|
2001-09-22 20:52:21 +00:00
|
|
|
* The key to the MAC is itself a SHA-1 hash of:
|
2001-03-03 11:54:34 +00:00
|
|
|
*
|
2001-09-22 20:52:21 +00:00
|
|
|
* data "putty-private-key-file-mac-key"
|
|
|
|
* data passphrase
|
|
|
|
*
|
2003-09-02 19:02:06 +00:00
|
|
|
* (An empty passphrase is used for unencrypted keys.)
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* If the key is encrypted, the encryption key is derived from the
|
|
|
|
* passphrase by means of a succession of SHA-1 hashes. Each hash
|
|
|
|
* is the hash of:
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* uint32 sequence-number
|
2001-09-22 20:52:21 +00:00
|
|
|
* data passphrase
|
|
|
|
*
|
2001-03-03 11:54:34 +00:00
|
|
|
* where the sequence-number increases from zero. As many of these
|
|
|
|
* hashes are used as necessary.
|
2001-09-22 20:52:21 +00:00
|
|
|
*
|
2001-11-25 14:31:46 +00:00
|
|
|
* For backwards compatibility with snapshots between 0.51 and
|
|
|
|
* 0.52, we also support the older key file format, which begins
|
|
|
|
* with "PuTTY-User-Key-File-1" (version number differs). In this
|
|
|
|
* format the Private-MAC: field only covers the private-plaintext
|
|
|
|
* field and nothing else (and without the 4-byte string length on
|
2005-02-26 15:50:29 +00:00
|
|
|
* the front too). Moreover, the Private-MAC: field can be replaced
|
|
|
|
* with a Private-Hash: field which is a plain SHA-1 hash instead of
|
|
|
|
* an HMAC (this was generated for unencrypted keys).
|
2001-03-03 11:54:34 +00:00
|
|
|
*/
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
static int read_header(FILE * fp, char *header)
|
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
int len = 39;
|
|
|
|
int c;
|
|
|
|
|
2013-07-14 10:46:55 +00:00
|
|
|
while (1) {
|
2001-03-03 11:54:34 +00:00
|
|
|
c = fgetc(fp);
|
|
|
|
if (c == '\n' || c == '\r' || c == EOF)
|
|
|
|
return 0; /* failure */
|
|
|
|
if (c == ':') {
|
|
|
|
c = fgetc(fp);
|
|
|
|
if (c != ' ')
|
|
|
|
return 0;
|
|
|
|
*header = '\0';
|
|
|
|
return 1; /* success! */
|
|
|
|
}
|
|
|
|
if (len == 0)
|
|
|
|
return 0; /* failure */
|
|
|
|
*header++ = c;
|
|
|
|
len--;
|
|
|
|
}
|
|
|
|
return 0; /* failure */
|
|
|
|
}
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
static char *read_body(FILE * fp)
|
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
char *text;
|
|
|
|
int len;
|
|
|
|
int size;
|
|
|
|
int c;
|
|
|
|
|
|
|
|
size = 128;
|
2003-03-29 16:14:26 +00:00
|
|
|
text = snewn(size, char);
|
2001-03-03 11:54:34 +00:00
|
|
|
len = 0;
|
|
|
|
text[len] = '\0';
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
c = fgetc(fp);
|
2008-11-23 20:11:12 +00:00
|
|
|
if (c == '\r' || c == '\n' || c == EOF) {
|
|
|
|
if (c != EOF) {
|
|
|
|
c = fgetc(fp);
|
|
|
|
if (c != '\r' && c != '\n')
|
|
|
|
ungetc(c, fp);
|
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
return text;
|
|
|
|
}
|
2005-03-01 23:48:45 +00:00
|
|
|
if (len + 1 >= size) {
|
2001-03-03 11:54:34 +00:00
|
|
|
size += 128;
|
2003-03-29 16:14:26 +00:00
|
|
|
text = sresize(text, size, char);
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
text[len++] = c;
|
|
|
|
text[len] = '\0';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-05-24 09:59:39 +00:00
|
|
|
static int read_blob(FILE *fp, int nlines, BinarySink *bs)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
unsigned char *blob;
|
|
|
|
char *line;
|
2018-05-24 09:59:39 +00:00
|
|
|
int linelen;
|
2001-03-03 11:54:34 +00:00
|
|
|
int i, j, k;
|
|
|
|
|
|
|
|
/* We expect at most 64 base64 characters, ie 48 real bytes, per line. */
|
2003-03-29 16:14:26 +00:00
|
|
|
blob = snewn(48 * nlines, unsigned char);
|
2001-03-03 11:54:34 +00:00
|
|
|
for (i = 0; i < nlines; i++) {
|
|
|
|
line = read_body(fp);
|
|
|
|
if (!line) {
|
|
|
|
sfree(blob);
|
2018-05-24 09:59:39 +00:00
|
|
|
return FALSE;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
linelen = strlen(line);
|
|
|
|
if (linelen % 4 != 0 || linelen > 64) {
|
|
|
|
sfree(blob);
|
|
|
|
sfree(line);
|
2018-05-24 09:59:39 +00:00
|
|
|
return FALSE;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
for (j = 0; j < linelen; j += 4) {
|
2018-05-24 09:59:39 +00:00
|
|
|
unsigned char decoded[3];
|
|
|
|
k = base64_decode_atom(line + j, decoded);
|
2001-03-03 11:54:34 +00:00
|
|
|
if (!k) {
|
|
|
|
sfree(line);
|
|
|
|
sfree(blob);
|
2018-05-24 09:59:39 +00:00
|
|
|
return FALSE;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
2018-05-24 09:59:39 +00:00
|
|
|
put_data(bs, decoded, k);
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
sfree(line);
|
|
|
|
}
|
2018-05-24 09:59:39 +00:00
|
|
|
return TRUE;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Magic error return value for when the passphrase is wrong.
|
|
|
|
*/
|
|
|
|
struct ssh2_userkey ssh2_wrong_passphrase = {
|
|
|
|
NULL, NULL, NULL
|
|
|
|
};
|
|
|
|
|
Invent a struct type for polymorphic SSH key data.
During last week's work, I made a mistake in which I got the arguments
backwards in one of the key-blob-generating functions - mistakenly
swapped the 'void *' key instance with the 'BinarySink *' output
destination - and I didn't spot the mistake until run time, because in
C you can implicitly convert both to and from void * and so there was
no compile-time failure of type checking.
Now that I've introduced the FROMFIELD macro that downcasts a pointer
to one field of a structure to retrieve a pointer to the whole
structure, I think I might start using that more widely to indicate
this kind of polymorphic subtyping. So now all the public-key
functions in the struct ssh_signkey vtable handle their data instance
in the form of a pointer to a subfield of a new zero-sized structure
type 'ssh_key', which outside the key implementations indicates 'this
is some kind of key instance but it could be of any type'; they
downcast that pointer internally using FROMFIELD in place of the
previous ordinary C cast, and return one by returning &foo->sshk for
whatever foo they've just made up.
The sshk member is not at the beginning of the structure, which means
all those FROMFIELDs and &key->sshk are actually adding and
subtracting an offset. Of course I could have put the member at the
start anyway, but I had the idea that it's actually a feature _not_ to
have the two types start at the same address, because it means you
should notice earlier rather than later if you absentmindedly cast
from one to the other directly rather than by the approved method (in
particular, if you accidentally assign one through a void * and back
without even _noticing_ you perpetrated a cast). In particular, this
enforces that you can't sfree() the thing even once without realising
you should instead of called the right freekey function. (I found
several bugs by this method during initial testing, so I think it's
already proved its worth!)
While I'm here, I've also renamed the vtable structure ssh_signkey to
ssh_keyalg, because it was a confusing name anyway - it describes the
_algorithm_ for handling all keys of that type, not a specific key. So
ssh_keyalg is the collection of code, and ssh_key is one instance of
the data it handles.
2018-05-27 07:32:21 +00:00
|
|
|
const ssh_keyalg *find_pubkey_alg_len(int namelen, const char *name)
|
2004-01-22 19:15:32 +00:00
|
|
|
{
|
2015-05-07 18:57:46 +00:00
|
|
|
if (match_ssh_id(namelen, name, "ssh-rsa"))
|
2004-01-22 19:15:32 +00:00
|
|
|
return &ssh_rsa;
|
2015-05-07 18:57:46 +00:00
|
|
|
else if (match_ssh_id(namelen, name, "ssh-dss"))
|
2004-01-22 19:15:32 +00:00
|
|
|
return &ssh_dss;
|
2015-05-07 18:57:46 +00:00
|
|
|
else if (match_ssh_id(namelen, name, "ecdsa-sha2-nistp256"))
|
2014-11-01 09:45:20 +00:00
|
|
|
return &ssh_ecdsa_nistp256;
|
2015-05-07 18:57:46 +00:00
|
|
|
else if (match_ssh_id(namelen, name, "ecdsa-sha2-nistp384"))
|
2014-11-01 09:45:20 +00:00
|
|
|
return &ssh_ecdsa_nistp384;
|
2015-05-07 18:57:46 +00:00
|
|
|
else if (match_ssh_id(namelen, name, "ecdsa-sha2-nistp521"))
|
2014-11-01 09:45:20 +00:00
|
|
|
return &ssh_ecdsa_nistp521;
|
2015-05-09 14:02:54 +00:00
|
|
|
else if (match_ssh_id(namelen, name, "ssh-ed25519"))
|
|
|
|
return &ssh_ecdsa_ed25519;
|
2004-01-22 19:15:32 +00:00
|
|
|
else
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
Invent a struct type for polymorphic SSH key data.
During last week's work, I made a mistake in which I got the arguments
backwards in one of the key-blob-generating functions - mistakenly
swapped the 'void *' key instance with the 'BinarySink *' output
destination - and I didn't spot the mistake until run time, because in
C you can implicitly convert both to and from void * and so there was
no compile-time failure of type checking.
Now that I've introduced the FROMFIELD macro that downcasts a pointer
to one field of a structure to retrieve a pointer to the whole
structure, I think I might start using that more widely to indicate
this kind of polymorphic subtyping. So now all the public-key
functions in the struct ssh_signkey vtable handle their data instance
in the form of a pointer to a subfield of a new zero-sized structure
type 'ssh_key', which outside the key implementations indicates 'this
is some kind of key instance but it could be of any type'; they
downcast that pointer internally using FROMFIELD in place of the
previous ordinary C cast, and return one by returning &foo->sshk for
whatever foo they've just made up.
The sshk member is not at the beginning of the structure, which means
all those FROMFIELDs and &key->sshk are actually adding and
subtracting an offset. Of course I could have put the member at the
start anyway, but I had the idea that it's actually a feature _not_ to
have the two types start at the same address, because it means you
should notice earlier rather than later if you absentmindedly cast
from one to the other directly rather than by the approved method (in
particular, if you accidentally assign one through a void * and back
without even _noticing_ you perpetrated a cast). In particular, this
enforces that you can't sfree() the thing even once without realising
you should instead of called the right freekey function. (I found
several bugs by this method during initial testing, so I think it's
already proved its worth!)
While I'm here, I've also renamed the vtable structure ssh_signkey to
ssh_keyalg, because it was a confusing name anyway - it describes the
_algorithm_ for handling all keys of that type, not a specific key. So
ssh_keyalg is the collection of code, and ssh_key is one instance of
the data it handles.
2018-05-27 07:32:21 +00:00
|
|
|
const ssh_keyalg *find_pubkey_alg(const char *name)
|
2015-05-07 18:57:46 +00:00
|
|
|
{
|
|
|
|
return find_pubkey_alg_len(strlen(name), name);
|
|
|
|
}
|
|
|
|
|
2003-02-01 12:54:40 +00:00
|
|
|
struct ssh2_userkey *ssh2_load_userkey(const Filename *filename,
|
2015-05-11 14:23:48 +00:00
|
|
|
const char *passphrase,
|
|
|
|
const char **errorstr)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
FILE *fp;
|
2001-11-25 14:31:46 +00:00
|
|
|
char header[40], *b, *encryption, *comment, *mac;
|
Invent a struct type for polymorphic SSH key data.
During last week's work, I made a mistake in which I got the arguments
backwards in one of the key-blob-generating functions - mistakenly
swapped the 'void *' key instance with the 'BinarySink *' output
destination - and I didn't spot the mistake until run time, because in
C you can implicitly convert both to and from void * and so there was
no compile-time failure of type checking.
Now that I've introduced the FROMFIELD macro that downcasts a pointer
to one field of a structure to retrieve a pointer to the whole
structure, I think I might start using that more widely to indicate
this kind of polymorphic subtyping. So now all the public-key
functions in the struct ssh_signkey vtable handle their data instance
in the form of a pointer to a subfield of a new zero-sized structure
type 'ssh_key', which outside the key implementations indicates 'this
is some kind of key instance but it could be of any type'; they
downcast that pointer internally using FROMFIELD in place of the
previous ordinary C cast, and return one by returning &foo->sshk for
whatever foo they've just made up.
The sshk member is not at the beginning of the structure, which means
all those FROMFIELDs and &key->sshk are actually adding and
subtracting an offset. Of course I could have put the member at the
start anyway, but I had the idea that it's actually a feature _not_ to
have the two types start at the same address, because it means you
should notice earlier rather than later if you absentmindedly cast
from one to the other directly rather than by the approved method (in
particular, if you accidentally assign one through a void * and back
without even _noticing_ you perpetrated a cast). In particular, this
enforces that you can't sfree() the thing even once without realising
you should instead of called the right freekey function. (I found
several bugs by this method during initial testing, so I think it's
already proved its worth!)
While I'm here, I've also renamed the vtable structure ssh_signkey to
ssh_keyalg, because it was a confusing name anyway - it describes the
_algorithm_ for handling all keys of that type, not a specific key. So
ssh_keyalg is the collection of code, and ssh_key is one instance of
the data it handles.
2018-05-27 07:32:21 +00:00
|
|
|
const ssh_keyalg *alg;
|
2001-03-03 11:54:34 +00:00
|
|
|
struct ssh2_userkey *ret;
|
|
|
|
int cipher, cipherblk;
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf *public_blob, *private_blob;
|
2001-11-25 14:31:46 +00:00
|
|
|
int i, is_mac, old_fmt;
|
2001-09-22 20:52:21 +00:00
|
|
|
int passlen = passphrase ? strlen(passphrase) : 0;
|
2003-08-29 22:52:57 +00:00
|
|
|
const char *error = NULL;
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
ret = NULL; /* return NULL for most errors */
|
2003-02-01 17:25:06 +00:00
|
|
|
encryption = comment = mac = NULL;
|
2001-03-03 11:54:34 +00:00
|
|
|
public_blob = private_blob = NULL;
|
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "rb", FALSE);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (!fp) {
|
|
|
|
error = "can't open file";
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2003-08-29 22:52:57 +00:00
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/* Read the first header line which contains the key type. */
|
2001-11-25 14:31:46 +00:00
|
|
|
if (!read_header(fp, header))
|
|
|
|
goto error;
|
|
|
|
if (0 == strcmp(header, "PuTTY-User-Key-File-2")) {
|
|
|
|
old_fmt = 0;
|
|
|
|
} else if (0 == strcmp(header, "PuTTY-User-Key-File-1")) {
|
|
|
|
/* this is an old key file; warn and then continue */
|
|
|
|
old_keyfile_warning();
|
|
|
|
old_fmt = 1;
|
2013-02-22 21:39:02 +00:00
|
|
|
} 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;
|
2003-08-29 22:52:57 +00:00
|
|
|
} else {
|
|
|
|
error = "not a PuTTY SSH-2 private key";
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2003-08-29 22:52:57 +00:00
|
|
|
}
|
|
|
|
error = "file format error";
|
2001-03-03 11:54:34 +00:00
|
|
|
if ((b = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
2001-09-22 20:52:21 +00:00
|
|
|
/* Select key algorithm structure. */
|
2004-01-22 19:15:32 +00:00
|
|
|
alg = find_pubkey_alg(b);
|
|
|
|
if (!alg) {
|
2001-03-03 11:54:34 +00:00
|
|
|
sfree(b);
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
sfree(b);
|
2001-05-06 14:35:20 +00:00
|
|
|
|
2001-03-03 11:54:34 +00:00
|
|
|
/* Read the Encryption header line. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Encryption"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2001-11-25 14:31:46 +00:00
|
|
|
if ((encryption = read_body(fp)) == NULL)
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2001-11-25 14:31:46 +00:00
|
|
|
if (!strcmp(encryption, "aes256-cbc")) {
|
2001-05-06 14:35:20 +00:00
|
|
|
cipher = 1;
|
|
|
|
cipherblk = 16;
|
2001-11-25 14:31:46 +00:00
|
|
|
} else if (!strcmp(encryption, "none")) {
|
2001-05-06 14:35:20 +00:00
|
|
|
cipher = 0;
|
|
|
|
cipherblk = 1;
|
2001-03-03 11:54:34 +00:00
|
|
|
} else {
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the Comment header line. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Comment"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
if ((comment = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Read the Public-Lines header line and the public blob. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Public-Lines"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
if ((b = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
i = atoi(b);
|
|
|
|
sfree(b);
|
2018-05-24 09:59:39 +00:00
|
|
|
public_blob = strbuf_new();
|
|
|
|
if (!read_blob(fp, i, BinarySink_UPCAST(public_blob)))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
/* Read the Private-Lines header line and the Private blob. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Private-Lines"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
if ((b = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
i = atoi(b);
|
|
|
|
sfree(b);
|
2018-05-24 09:59:39 +00:00
|
|
|
private_blob = strbuf_new();
|
|
|
|
if (!read_blob(fp, i, BinarySink_UPCAST(private_blob)))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
|
2001-09-22 20:52:21 +00:00
|
|
|
/* Read the Private-MAC or Private-Hash header line. */
|
|
|
|
if (!read_header(fp, header))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2001-09-22 20:52:21 +00:00
|
|
|
if (0 == strcmp(header, "Private-MAC")) {
|
|
|
|
if ((mac = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
is_mac = 1;
|
2005-02-26 15:50:29 +00:00
|
|
|
} else if (0 == strcmp(header, "Private-Hash") && old_fmt) {
|
2001-09-22 20:52:21 +00:00
|
|
|
if ((mac = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
is_mac = 0;
|
|
|
|
} else
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
fclose(fp);
|
|
|
|
fp = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Decrypt the private blob.
|
|
|
|
*/
|
|
|
|
if (cipher) {
|
|
|
|
unsigned char key[40];
|
|
|
|
SHA_State s;
|
|
|
|
|
|
|
|
if (!passphrase)
|
|
|
|
goto error;
|
2018-05-24 09:59:39 +00:00
|
|
|
if (private_blob->len % cipherblk)
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
SHA_Init(&s);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_uint32(&s, 0);
|
|
|
|
put_data(&s, passphrase, passlen);
|
2001-05-06 14:35:20 +00:00
|
|
|
SHA_Final(&s, key + 0);
|
2001-03-03 11:54:34 +00:00
|
|
|
SHA_Init(&s);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_uint32(&s, 1);
|
|
|
|
put_data(&s, passphrase, passlen);
|
2001-05-06 14:35:20 +00:00
|
|
|
SHA_Final(&s, key + 20);
|
2018-05-24 09:59:39 +00:00
|
|
|
aes256_decrypt_pubkey(key, private_blob->u, private_blob->len);
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
2001-11-25 14:31:46 +00:00
|
|
|
* Verify the MAC.
|
2001-03-03 11:54:34 +00:00
|
|
|
*/
|
|
|
|
{
|
2001-09-22 20:52:21 +00:00
|
|
|
char realmac[41];
|
2001-03-03 11:54:34 +00:00
|
|
|
unsigned char binary[20];
|
2018-05-24 12:11:56 +00:00
|
|
|
strbuf *macdata;
|
|
|
|
int free_macdata;
|
2001-11-25 14:31:46 +00:00
|
|
|
|
|
|
|
if (old_fmt) {
|
|
|
|
/* MAC (or hash) only covers the private blob. */
|
2018-05-24 12:11:56 +00:00
|
|
|
macdata = private_blob;
|
|
|
|
free_macdata = FALSE;
|
2001-11-25 14:31:46 +00:00
|
|
|
} else {
|
2018-05-24 12:11:56 +00:00
|
|
|
macdata = strbuf_new();
|
|
|
|
put_stringz(macdata, alg->name);
|
|
|
|
put_stringz(macdata, encryption);
|
|
|
|
put_stringz(macdata, comment);
|
|
|
|
put_string(macdata, public_blob->s,
|
|
|
|
public_blob->len);
|
|
|
|
put_string(macdata, private_blob->s,
|
|
|
|
private_blob->len);
|
|
|
|
free_macdata = TRUE;
|
2001-11-25 14:31:46 +00:00
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2001-09-22 20:52:21 +00:00
|
|
|
if (is_mac) {
|
|
|
|
SHA_State s;
|
|
|
|
unsigned char mackey[20];
|
|
|
|
char header[] = "putty-private-key-file-mac-key";
|
|
|
|
|
|
|
|
SHA_Init(&s);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_data(&s, header, sizeof(header)-1);
|
2003-09-02 19:00:17 +00:00
|
|
|
if (cipher && passphrase)
|
2018-05-24 09:03:36 +00:00
|
|
|
put_data(&s, passphrase, passlen);
|
2001-09-22 20:52:21 +00:00
|
|
|
SHA_Final(&s, mackey);
|
|
|
|
|
2018-05-24 12:11:56 +00:00
|
|
|
hmac_sha1_simple(mackey, 20, macdata->s,
|
|
|
|
macdata->len, binary);
|
2001-09-22 20:52:21 +00:00
|
|
|
|
2012-07-22 19:51:50 +00:00
|
|
|
smemclr(mackey, sizeof(mackey));
|
|
|
|
smemclr(&s, sizeof(s));
|
2001-09-22 20:52:21 +00:00
|
|
|
} else {
|
2018-05-24 12:11:56 +00:00
|
|
|
SHA_Simple(macdata->s, macdata->len, binary);
|
2001-09-22 20:52:21 +00:00
|
|
|
}
|
2001-11-25 14:31:46 +00:00
|
|
|
|
2018-05-24 12:11:56 +00:00
|
|
|
if (free_macdata)
|
|
|
|
strbuf_free(macdata);
|
2001-11-25 14:31:46 +00:00
|
|
|
|
2001-03-03 11:54:34 +00:00
|
|
|
for (i = 0; i < 20; i++)
|
2001-09-22 20:52:21 +00:00
|
|
|
sprintf(realmac + 2 * i, "%02x", binary[i]);
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2001-09-22 20:52:21 +00:00
|
|
|
if (strcmp(mac, realmac)) {
|
|
|
|
/* An incorrect MAC is an unconditional Error if the key is
|
2001-03-03 11:54:34 +00:00
|
|
|
* unencrypted. Otherwise, it means Wrong Passphrase. */
|
2003-08-29 22:52:57 +00:00
|
|
|
if (cipher) {
|
2004-01-24 17:16:37 +00:00
|
|
|
error = "wrong passphrase";
|
2003-08-29 22:52:57 +00:00
|
|
|
ret = SSH2_WRONG_PASSPHRASE;
|
|
|
|
} else {
|
|
|
|
error = "MAC failed";
|
|
|
|
ret = NULL;
|
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
}
|
2001-09-22 20:52:21 +00:00
|
|
|
sfree(mac);
|
2014-10-28 18:39:55 +00:00
|
|
|
mac = NULL;
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Create and return the key.
|
|
|
|
*/
|
2003-03-29 16:14:26 +00:00
|
|
|
ret = snew(struct ssh2_userkey);
|
2001-03-03 11:54:34 +00:00
|
|
|
ret->alg = alg;
|
|
|
|
ret->comment = comment;
|
2018-05-24 09:59:39 +00:00
|
|
|
ret->data = alg->createkey(alg, public_blob->u, public_blob->len,
|
|
|
|
private_blob->u, private_blob->len);
|
2001-03-22 21:48:33 +00:00
|
|
|
if (!ret->data) {
|
|
|
|
sfree(ret);
|
|
|
|
ret = NULL;
|
2003-08-29 22:52:57 +00:00
|
|
|
error = "createkey failed";
|
|
|
|
goto error;
|
2001-03-22 21:48:33 +00:00
|
|
|
}
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf_free(public_blob);
|
|
|
|
strbuf_free(private_blob);
|
2001-11-25 14:31:46 +00:00
|
|
|
sfree(encryption);
|
2003-09-10 12:30:10 +00:00
|
|
|
if (errorstr)
|
|
|
|
*errorstr = NULL;
|
2001-03-03 11:54:34 +00:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Error processing.
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
error:
|
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
|
|
|
if (comment)
|
|
|
|
sfree(comment);
|
2001-11-25 14:31:46 +00:00
|
|
|
if (encryption)
|
|
|
|
sfree(encryption);
|
2001-09-22 20:52:21 +00:00
|
|
|
if (mac)
|
|
|
|
sfree(mac);
|
2001-05-06 14:35:20 +00:00
|
|
|
if (public_blob)
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf_free(public_blob);
|
|
|
|
if (private_blob)
|
|
|
|
strbuf_free(private_blob);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (errorstr)
|
|
|
|
*errorstr = error;
|
2001-03-03 11:54:34 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-05-24 09:59:39 +00:00
|
|
|
int rfc4716_loadpub(FILE *fp, char **algorithm,
|
|
|
|
BinarySink *bs,
|
|
|
|
char **commentptr, const char **errorstr)
|
2015-05-12 11:19:57 +00:00
|
|
|
{
|
|
|
|
const char *error;
|
|
|
|
char *line, *colon, *value;
|
|
|
|
char *comment = NULL;
|
|
|
|
unsigned char *pubblob = NULL;
|
|
|
|
int pubbloblen, pubblobsize;
|
|
|
|
char base64in[4];
|
|
|
|
unsigned char base64out[3];
|
|
|
|
int base64bytes;
|
|
|
|
int alglen;
|
|
|
|
|
|
|
|
line = chomp(fgetline(fp));
|
|
|
|
if (!line || 0 != strcmp(line, "---- BEGIN SSH2 PUBLIC KEY ----")) {
|
|
|
|
error = "invalid begin line in SSH-2 public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
sfree(line); line = NULL;
|
|
|
|
|
|
|
|
while (1) {
|
|
|
|
line = chomp(fgetline(fp));
|
|
|
|
if (!line) {
|
|
|
|
error = "truncated SSH-2 public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
colon = strstr(line, ": ");
|
|
|
|
if (!colon)
|
|
|
|
break;
|
|
|
|
*colon = '\0';
|
|
|
|
value = colon + 2;
|
|
|
|
|
|
|
|
if (!strcmp(line, "Comment")) {
|
|
|
|
char *p, *q;
|
|
|
|
|
|
|
|
/* Remove containing double quotes, if present */
|
|
|
|
p = value;
|
|
|
|
if (*p == '"' && p[strlen(p)-1] == '"') {
|
|
|
|
p[strlen(p)-1] = '\0';
|
|
|
|
p++;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Remove \-escaping, not in RFC4716 but seen in the wild
|
|
|
|
* in practice. */
|
|
|
|
for (q = line; *p; p++) {
|
|
|
|
if (*p == '\\' && p[1])
|
|
|
|
p++;
|
|
|
|
*q++ = *p;
|
|
|
|
}
|
|
|
|
|
|
|
|
*q = '\0';
|
2017-02-14 20:42:26 +00:00
|
|
|
sfree(comment); /* *just* in case of multiple Comment headers */
|
2015-05-12 11:19:57 +00:00
|
|
|
comment = dupstr(line);
|
|
|
|
} else if (!strcmp(line, "Subject") ||
|
|
|
|
!strncmp(line, "x-", 2)) {
|
|
|
|
/* Headers we recognise and ignore. Do nothing. */
|
|
|
|
} else {
|
|
|
|
error = "unrecognised header in SSH-2 public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
sfree(line); line = NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Now line contains the initial line of base64 data. Loop round
|
|
|
|
* while it still does contain base64.
|
|
|
|
*/
|
|
|
|
pubblobsize = 4096;
|
|
|
|
pubblob = snewn(pubblobsize, unsigned char);
|
|
|
|
pubbloblen = 0;
|
|
|
|
base64bytes = 0;
|
|
|
|
while (line && line[0] != '-') {
|
|
|
|
char *p;
|
|
|
|
for (p = line; *p; p++) {
|
|
|
|
base64in[base64bytes++] = *p;
|
|
|
|
if (base64bytes == 4) {
|
|
|
|
int n = base64_decode_atom(base64in, base64out);
|
|
|
|
if (pubbloblen + n > pubblobsize) {
|
|
|
|
pubblobsize = (pubbloblen + n) * 5 / 4 + 1024;
|
|
|
|
pubblob = sresize(pubblob, pubblobsize, unsigned char);
|
|
|
|
}
|
|
|
|
memcpy(pubblob + pubbloblen, base64out, n);
|
|
|
|
pubbloblen += n;
|
|
|
|
base64bytes = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
sfree(line); line = NULL;
|
|
|
|
line = chomp(fgetline(fp));
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Finally, check the END line makes sense.
|
|
|
|
*/
|
|
|
|
if (!line || 0 != strcmp(line, "---- END SSH2 PUBLIC KEY ----")) {
|
|
|
|
error = "invalid end line in SSH-2 public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
sfree(line); line = NULL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* OK, we now have a public blob and optionally a comment. We must
|
|
|
|
* return the key algorithm string too, so look for that at the
|
|
|
|
* start of the public blob.
|
|
|
|
*/
|
|
|
|
if (pubbloblen < 4) {
|
|
|
|
error = "not enough data in SSH-2 public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
alglen = toint(GET_32BIT(pubblob));
|
|
|
|
if (alglen < 0 || alglen > pubbloblen-4) {
|
|
|
|
error = "invalid algorithm prefix in SSH-2 public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
if (algorithm)
|
|
|
|
*algorithm = dupprintf("%.*s", alglen, pubblob+4);
|
|
|
|
if (commentptr)
|
|
|
|
*commentptr = comment;
|
|
|
|
else
|
|
|
|
sfree(comment);
|
2018-05-24 09:59:39 +00:00
|
|
|
put_data(bs, pubblob, pubbloblen);
|
|
|
|
sfree(pubblob);
|
|
|
|
return TRUE;
|
2015-05-12 11:19:57 +00:00
|
|
|
|
|
|
|
error:
|
|
|
|
sfree(line);
|
|
|
|
sfree(comment);
|
|
|
|
sfree(pubblob);
|
|
|
|
if (errorstr)
|
|
|
|
*errorstr = error;
|
2018-05-24 09:59:39 +00:00
|
|
|
return FALSE;
|
2015-05-12 11:19:57 +00:00
|
|
|
}
|
|
|
|
|
2018-05-24 09:59:39 +00:00
|
|
|
int openssh_loadpub(FILE *fp, char **algorithm,
|
|
|
|
BinarySink *bs,
|
|
|
|
char **commentptr, const char **errorstr)
|
2015-05-12 11:19:57 +00:00
|
|
|
{
|
|
|
|
const char *error;
|
|
|
|
char *line, *base64;
|
|
|
|
char *comment = NULL;
|
|
|
|
unsigned char *pubblob = NULL;
|
|
|
|
int pubbloblen, pubblobsize;
|
|
|
|
int alglen;
|
|
|
|
|
|
|
|
line = chomp(fgetline(fp));
|
|
|
|
|
|
|
|
base64 = strchr(line, ' ');
|
|
|
|
if (!base64) {
|
|
|
|
error = "no key blob in OpenSSH public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
*base64++ = '\0';
|
|
|
|
|
|
|
|
comment = strchr(base64, ' ');
|
|
|
|
if (comment) {
|
|
|
|
*comment++ = '\0';
|
|
|
|
comment = dupstr(comment);
|
|
|
|
}
|
|
|
|
|
|
|
|
pubblobsize = strlen(base64) / 4 * 3;
|
|
|
|
pubblob = snewn(pubblobsize, unsigned char);
|
|
|
|
pubbloblen = 0;
|
|
|
|
|
|
|
|
while (!memchr(base64, '\0', 4)) {
|
|
|
|
assert(pubbloblen + 3 <= pubblobsize);
|
|
|
|
pubbloblen += base64_decode_atom(base64, pubblob + pubbloblen);
|
|
|
|
base64 += 4;
|
|
|
|
}
|
|
|
|
if (*base64) {
|
|
|
|
error = "invalid length for base64 data in OpenSSH public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Sanity check: the first word on the line should be the key
|
|
|
|
* algorithm, and should match the encoded string at the start of
|
|
|
|
* the public blob.
|
|
|
|
*/
|
|
|
|
alglen = strlen(line);
|
|
|
|
if (pubbloblen < alglen + 4 ||
|
|
|
|
GET_32BIT(pubblob) != alglen ||
|
|
|
|
0 != memcmp(pubblob + 4, line, alglen)) {
|
|
|
|
error = "key algorithms do not match in OpenSSH public key file";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Done.
|
|
|
|
*/
|
|
|
|
if (algorithm)
|
|
|
|
*algorithm = dupstr(line);
|
|
|
|
if (commentptr)
|
|
|
|
*commentptr = comment;
|
|
|
|
else
|
|
|
|
sfree(comment);
|
2017-01-23 18:10:40 +00:00
|
|
|
sfree(line);
|
2018-05-24 09:59:39 +00:00
|
|
|
put_data(bs, pubblob, pubbloblen);
|
|
|
|
sfree(pubblob);
|
|
|
|
return TRUE;
|
2015-05-12 11:19:57 +00:00
|
|
|
|
|
|
|
error:
|
|
|
|
sfree(line);
|
|
|
|
sfree(comment);
|
|
|
|
sfree(pubblob);
|
|
|
|
if (errorstr)
|
|
|
|
*errorstr = error;
|
2018-05-24 09:59:39 +00:00
|
|
|
return FALSE;
|
2015-05-12 11:19:57 +00:00
|
|
|
}
|
|
|
|
|
2018-05-24 09:59:39 +00:00
|
|
|
int ssh2_userkey_loadpub(const Filename *filename, char **algorithm,
|
|
|
|
BinarySink *bs,
|
|
|
|
char **commentptr, const char **errorstr)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
FILE *fp;
|
|
|
|
char header[40], *b;
|
Invent a struct type for polymorphic SSH key data.
During last week's work, I made a mistake in which I got the arguments
backwards in one of the key-blob-generating functions - mistakenly
swapped the 'void *' key instance with the 'BinarySink *' output
destination - and I didn't spot the mistake until run time, because in
C you can implicitly convert both to and from void * and so there was
no compile-time failure of type checking.
Now that I've introduced the FROMFIELD macro that downcasts a pointer
to one field of a structure to retrieve a pointer to the whole
structure, I think I might start using that more widely to indicate
this kind of polymorphic subtyping. So now all the public-key
functions in the struct ssh_signkey vtable handle their data instance
in the form of a pointer to a subfield of a new zero-sized structure
type 'ssh_key', which outside the key implementations indicates 'this
is some kind of key instance but it could be of any type'; they
downcast that pointer internally using FROMFIELD in place of the
previous ordinary C cast, and return one by returning &foo->sshk for
whatever foo they've just made up.
The sshk member is not at the beginning of the structure, which means
all those FROMFIELDs and &key->sshk are actually adding and
subtracting an offset. Of course I could have put the member at the
start anyway, but I had the idea that it's actually a feature _not_ to
have the two types start at the same address, because it means you
should notice earlier rather than later if you absentmindedly cast
from one to the other directly rather than by the approved method (in
particular, if you accidentally assign one through a void * and back
without even _noticing_ you perpetrated a cast). In particular, this
enforces that you can't sfree() the thing even once without realising
you should instead of called the right freekey function. (I found
several bugs by this method during initial testing, so I think it's
already proved its worth!)
While I'm here, I've also renamed the vtable structure ssh_signkey to
ssh_keyalg, because it was a confusing name anyway - it describes the
_algorithm_ for handling all keys of that type, not a specific key. So
ssh_keyalg is the collection of code, and ssh_key is one instance of
the data it handles.
2018-05-27 07:32:21 +00:00
|
|
|
const ssh_keyalg *alg;
|
2015-05-12 11:19:57 +00:00
|
|
|
int type, i;
|
2003-08-29 22:52:57 +00:00
|
|
|
const char *error = NULL;
|
2015-04-26 09:49:24 +00:00
|
|
|
char *comment = NULL;
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "rb", FALSE);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (!fp) {
|
|
|
|
error = "can't open file";
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2003-08-29 22:52:57 +00:00
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2015-05-12 11:19:57 +00:00
|
|
|
/* Initially, check if this is a public-only key file. Sometimes
|
|
|
|
* we'll be asked to read a public blob from one of those. */
|
|
|
|
type = key_type_fp(fp);
|
|
|
|
if (type == SSH_KEYTYPE_SSH2_PUBLIC_RFC4716) {
|
2018-05-24 09:59:39 +00:00
|
|
|
int ret = rfc4716_loadpub(fp, algorithm, bs, commentptr, errorstr);
|
2015-05-12 11:19:57 +00:00
|
|
|
fclose(fp);
|
|
|
|
return ret;
|
|
|
|
} else if (type == SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH) {
|
2018-05-24 09:59:39 +00:00
|
|
|
int ret = openssh_loadpub(fp, algorithm, bs, commentptr, errorstr);
|
2015-05-12 11:19:57 +00:00
|
|
|
fclose(fp);
|
|
|
|
return ret;
|
|
|
|
} else if (type != SSH_KEYTYPE_SSH2) {
|
|
|
|
error = "not a PuTTY SSH-2 private key";
|
|
|
|
goto error;
|
|
|
|
}
|
|
|
|
|
2001-03-03 11:54:34 +00:00
|
|
|
/* Read the first header line which contains the key type. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header)
|
2001-11-25 14:31:46 +00:00
|
|
|
|| (0 != strcmp(header, "PuTTY-User-Key-File-2") &&
|
2003-08-29 22:52:57 +00:00
|
|
|
0 != strcmp(header, "PuTTY-User-Key-File-1"))) {
|
2013-02-22 21:39:02 +00:00
|
|
|
if (0 == strncmp(header, "PuTTY-User-Key-File-", 20))
|
|
|
|
error = "PuTTY key format too new";
|
|
|
|
else
|
|
|
|
error = "not a PuTTY SSH-2 private key";
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2003-08-29 22:52:57 +00:00
|
|
|
}
|
|
|
|
error = "file format error";
|
2001-03-03 11:54:34 +00:00
|
|
|
if ((b = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
2005-03-02 00:31:33 +00:00
|
|
|
/* Select key algorithm structure. */
|
2004-01-22 19:15:32 +00:00
|
|
|
alg = find_pubkey_alg(b);
|
2015-04-26 09:49:24 +00:00
|
|
|
sfree(b);
|
2004-01-22 19:15:32 +00:00
|
|
|
if (!alg) {
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
}
|
2001-05-06 14:35:20 +00:00
|
|
|
|
2001-03-03 11:54:34 +00:00
|
|
|
/* Read the Encryption header line. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Encryption"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
if ((b = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
sfree(b); /* we don't care */
|
|
|
|
|
|
|
|
/* Read the Comment header line. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Comment"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2005-10-30 13:42:36 +00:00
|
|
|
if ((comment = read_body(fp)) == NULL)
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
2005-10-30 13:42:36 +00:00
|
|
|
|
|
|
|
if (commentptr)
|
|
|
|
*commentptr = comment;
|
|
|
|
else
|
|
|
|
sfree(comment);
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/* Read the Public-Lines header line and the public blob. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Public-Lines"))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
if ((b = read_body(fp)) == NULL)
|
|
|
|
goto error;
|
|
|
|
i = atoi(b);
|
|
|
|
sfree(b);
|
2018-05-24 09:59:39 +00:00
|
|
|
if (!read_blob(fp, i, bs))
|
2001-03-03 11:54:34 +00:00
|
|
|
goto error;
|
|
|
|
|
|
|
|
fclose(fp);
|
2001-12-30 15:58:17 +00:00
|
|
|
if (algorithm)
|
2015-05-15 09:12:06 +00:00
|
|
|
*algorithm = dupstr(alg->name);
|
2018-05-24 09:59:39 +00:00
|
|
|
return TRUE;
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Error processing.
|
|
|
|
*/
|
2001-05-06 14:35:20 +00:00
|
|
|
error:
|
|
|
|
if (fp)
|
|
|
|
fclose(fp);
|
2003-08-29 22:52:57 +00:00
|
|
|
if (errorstr)
|
|
|
|
*errorstr = error;
|
2015-04-26 09:49:24 +00:00
|
|
|
if (comment && commentptr) {
|
|
|
|
sfree(comment);
|
|
|
|
*commentptr = NULL;
|
|
|
|
}
|
2018-05-24 09:59:39 +00:00
|
|
|
return FALSE;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
2003-02-01 12:54:40 +00:00
|
|
|
int ssh2_userkey_encrypted(const Filename *filename, char **commentptr)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
FILE *fp;
|
|
|
|
char header[40], *b, *comment;
|
|
|
|
int ret;
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
if (commentptr)
|
|
|
|
*commentptr = NULL;
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "rb", FALSE);
|
2001-03-03 11:54:34 +00:00
|
|
|
if (!fp)
|
|
|
|
return 0;
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header)
|
2001-11-25 14:31:46 +00:00
|
|
|
|| (0 != strcmp(header, "PuTTY-User-Key-File-2") &&
|
|
|
|
0 != strcmp(header, "PuTTY-User-Key-File-1"))) {
|
2001-05-06 14:35:20 +00:00
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
if ((b = read_body(fp)) == NULL) {
|
2001-05-06 14:35:20 +00:00
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
sfree(b); /* we don't care about key type here */
|
|
|
|
/* Read the Encryption header line. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Encryption")) {
|
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
if ((b = read_body(fp)) == NULL) {
|
2001-05-06 14:35:20 +00:00
|
|
|
fclose(fp);
|
|
|
|
return 0;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Read the Comment header line. */
|
2001-05-06 14:35:20 +00:00
|
|
|
if (!read_header(fp, header) || 0 != strcmp(header, "Comment")) {
|
|
|
|
fclose(fp);
|
|
|
|
sfree(b);
|
|
|
|
return 1;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
if ((comment = read_body(fp)) == NULL) {
|
2001-05-06 14:35:20 +00:00
|
|
|
fclose(fp);
|
|
|
|
sfree(b);
|
|
|
|
return 1;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
if (commentptr)
|
|
|
|
*commentptr = comment;
|
2013-07-14 10:46:07 +00:00
|
|
|
else
|
|
|
|
sfree(comment);
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
fclose(fp);
|
|
|
|
if (!strcmp(b, "aes256-cbc"))
|
|
|
|
ret = 1;
|
|
|
|
else
|
|
|
|
ret = 0;
|
|
|
|
sfree(b);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2001-05-06 14:35:20 +00:00
|
|
|
int base64_lines(int datalen)
|
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
/* When encoding, we use 64 chars/line, which equals 48 real chars. */
|
2001-05-06 14:35:20 +00:00
|
|
|
return (datalen + 47) / 48;
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
2015-05-12 13:00:04 +00:00
|
|
|
void base64_encode(FILE *fp, const unsigned char *data, int datalen, int cpl)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
int linelen = 0;
|
|
|
|
char out[4];
|
2002-05-15 19:16:45 +00:00
|
|
|
int n, i;
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
while (datalen > 0) {
|
|
|
|
n = (datalen < 3 ? datalen : 3);
|
|
|
|
base64_encode_atom(data, n, out);
|
|
|
|
data += n;
|
|
|
|
datalen -= n;
|
2002-05-15 19:16:45 +00:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
if (linelen >= cpl) {
|
|
|
|
linelen = 0;
|
|
|
|
fputc('\n', fp);
|
|
|
|
}
|
|
|
|
fputc(out[i], fp);
|
|
|
|
linelen++;
|
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
fputc('\n', fp);
|
|
|
|
}
|
|
|
|
|
2003-02-01 12:54:40 +00:00
|
|
|
int ssh2_save_userkey(const Filename *filename, struct ssh2_userkey *key,
|
2001-05-06 14:35:20 +00:00
|
|
|
char *passphrase)
|
|
|
|
{
|
2001-03-03 11:54:34 +00:00
|
|
|
FILE *fp;
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf *pub_blob, *priv_blob;
|
|
|
|
unsigned char *priv_blob_encrypted;
|
|
|
|
int priv_encrypted_len;
|
2001-03-03 11:54:34 +00:00
|
|
|
int passlen;
|
|
|
|
int cipherblk;
|
2001-11-25 14:31:46 +00:00
|
|
|
int i;
|
2015-05-15 10:15:42 +00:00
|
|
|
const char *cipherstr;
|
2001-09-22 20:52:21 +00:00
|
|
|
unsigned char priv_mac[20];
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Fetch the key component blobs.
|
|
|
|
*/
|
2018-05-24 09:59:39 +00:00
|
|
|
pub_blob = strbuf_new();
|
|
|
|
key->alg->public_blob(key->data, BinarySink_UPCAST(pub_blob));
|
|
|
|
priv_blob = strbuf_new();
|
|
|
|
key->alg->private_blob(key->data, BinarySink_UPCAST(priv_blob));
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Determine encryption details, and encrypt the private blob.
|
|
|
|
*/
|
|
|
|
if (passphrase) {
|
|
|
|
cipherstr = "aes256-cbc";
|
|
|
|
cipherblk = 16;
|
|
|
|
} else {
|
|
|
|
cipherstr = "none";
|
|
|
|
cipherblk = 1;
|
|
|
|
}
|
2018-05-24 09:59:39 +00:00
|
|
|
priv_encrypted_len = priv_blob->len + cipherblk - 1;
|
2001-03-03 11:54:34 +00:00
|
|
|
priv_encrypted_len -= priv_encrypted_len % cipherblk;
|
2003-03-29 16:14:26 +00:00
|
|
|
priv_blob_encrypted = snewn(priv_encrypted_len, unsigned char);
|
2001-03-03 11:54:34 +00:00
|
|
|
memset(priv_blob_encrypted, 0, priv_encrypted_len);
|
2018-05-24 09:59:39 +00:00
|
|
|
memcpy(priv_blob_encrypted, priv_blob->u, priv_blob->len);
|
2001-03-03 11:54:34 +00:00
|
|
|
/* Create padding based on the SHA hash of the unpadded blob. This prevents
|
|
|
|
* too easy a known-plaintext attack on the last block. */
|
2018-05-24 09:59:39 +00:00
|
|
|
SHA_Simple(priv_blob->u, priv_blob->len, priv_mac);
|
|
|
|
assert(priv_encrypted_len - priv_blob->len < 20);
|
|
|
|
memcpy(priv_blob_encrypted + priv_blob->len, priv_mac,
|
|
|
|
priv_encrypted_len - priv_blob->len);
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2001-11-25 14:31:46 +00:00
|
|
|
/* Now create the MAC. */
|
|
|
|
{
|
2018-05-24 12:11:56 +00:00
|
|
|
strbuf *macdata;
|
2001-09-22 20:52:21 +00:00
|
|
|
SHA_State s;
|
|
|
|
unsigned char mackey[20];
|
|
|
|
char header[] = "putty-private-key-file-mac-key";
|
|
|
|
|
2018-05-24 12:11:56 +00:00
|
|
|
macdata = strbuf_new();
|
|
|
|
put_stringz(macdata, key->alg->name);
|
|
|
|
put_stringz(macdata, cipherstr);
|
|
|
|
put_stringz(macdata, key->comment);
|
|
|
|
put_string(macdata, pub_blob->s, pub_blob->len);
|
|
|
|
put_string(macdata, priv_blob_encrypted, priv_encrypted_len);
|
2001-09-22 20:52:21 +00:00
|
|
|
|
|
|
|
SHA_Init(&s);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_data(&s, header, sizeof(header)-1);
|
2001-11-25 14:31:46 +00:00
|
|
|
if (passphrase)
|
2018-05-24 09:03:36 +00:00
|
|
|
put_data(&s, passphrase, strlen(passphrase));
|
2001-09-22 20:52:21 +00:00
|
|
|
SHA_Final(&s, mackey);
|
2018-05-24 12:11:56 +00:00
|
|
|
hmac_sha1_simple(mackey, 20, macdata->s,
|
|
|
|
macdata->len, priv_mac);
|
|
|
|
strbuf_free(macdata);
|
2012-07-22 19:51:50 +00:00
|
|
|
smemclr(mackey, sizeof(mackey));
|
|
|
|
smemclr(&s, sizeof(s));
|
2001-09-22 20:52:21 +00:00
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
|
|
|
|
if (passphrase) {
|
2003-01-05 14:11:14 +00:00
|
|
|
unsigned char key[40];
|
2001-03-03 11:54:34 +00:00
|
|
|
SHA_State s;
|
|
|
|
|
|
|
|
passlen = strlen(passphrase);
|
|
|
|
|
|
|
|
SHA_Init(&s);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_uint32(&s, 0);
|
|
|
|
put_data(&s, passphrase, passlen);
|
2001-05-06 14:35:20 +00:00
|
|
|
SHA_Final(&s, key + 0);
|
2001-03-03 11:54:34 +00:00
|
|
|
SHA_Init(&s);
|
2018-05-24 09:03:36 +00:00
|
|
|
put_uint32(&s, 1);
|
|
|
|
put_data(&s, passphrase, passlen);
|
2001-05-06 14:35:20 +00:00
|
|
|
SHA_Final(&s, key + 20);
|
|
|
|
aes256_encrypt_pubkey(key, priv_blob_encrypted,
|
|
|
|
priv_encrypted_len);
|
2001-09-22 20:52:21 +00:00
|
|
|
|
2012-07-22 19:51:50 +00:00
|
|
|
smemclr(key, sizeof(key));
|
|
|
|
smemclr(&s, sizeof(s));
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|
|
|
|
|
2011-10-02 11:01:57 +00:00
|
|
|
fp = f_open(filename, "w", TRUE);
|
2015-02-19 20:08:18 +00:00
|
|
|
if (!fp) {
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf_free(pub_blob);
|
|
|
|
strbuf_free(priv_blob);
|
|
|
|
smemclr(priv_blob_encrypted, priv_encrypted_len);
|
2015-02-19 20:08:18 +00:00
|
|
|
sfree(priv_blob_encrypted);
|
|
|
|
return 0;
|
|
|
|
}
|
2001-11-25 14:31:46 +00:00
|
|
|
fprintf(fp, "PuTTY-User-Key-File-2: %s\n", key->alg->name);
|
2001-03-03 11:54:34 +00:00
|
|
|
fprintf(fp, "Encryption: %s\n", cipherstr);
|
|
|
|
fprintf(fp, "Comment: %s\n", key->comment);
|
2018-05-24 09:59:39 +00:00
|
|
|
fprintf(fp, "Public-Lines: %d\n", base64_lines(pub_blob->len));
|
|
|
|
base64_encode(fp, pub_blob->u, pub_blob->len, 64);
|
2001-03-03 11:54:34 +00:00
|
|
|
fprintf(fp, "Private-Lines: %d\n", base64_lines(priv_encrypted_len));
|
2002-05-15 19:16:45 +00:00
|
|
|
base64_encode(fp, priv_blob_encrypted, priv_encrypted_len, 64);
|
2001-11-25 14:31:46 +00:00
|
|
|
fprintf(fp, "Private-MAC: ");
|
2001-03-03 11:54:34 +00:00
|
|
|
for (i = 0; i < 20; i++)
|
2001-09-22 20:52:21 +00:00
|
|
|
fprintf(fp, "%02x", priv_mac[i]);
|
2001-03-03 11:54:34 +00:00
|
|
|
fprintf(fp, "\n");
|
|
|
|
fclose(fp);
|
2001-11-25 14:31:46 +00:00
|
|
|
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf_free(pub_blob);
|
|
|
|
strbuf_free(priv_blob);
|
|
|
|
smemclr(priv_blob_encrypted, priv_encrypted_len);
|
2001-11-25 14:31:46 +00:00
|
|
|
sfree(priv_blob_encrypted);
|
2001-03-03 11:54:34 +00:00
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2015-05-12 12:42:26 +00:00
|
|
|
/* ----------------------------------------------------------------------
|
|
|
|
* Output public keys.
|
|
|
|
*/
|
|
|
|
char *ssh1_pubkey_str(struct RSAKey *key)
|
|
|
|
{
|
|
|
|
char *buffer;
|
|
|
|
char *dec1, *dec2;
|
|
|
|
|
|
|
|
dec1 = bignum_decimal(key->exponent);
|
|
|
|
dec2 = bignum_decimal(key->modulus);
|
|
|
|
buffer = dupprintf("%d %s %s%s%s", bignum_bitcount(key->modulus),
|
|
|
|
dec1, dec2,
|
|
|
|
key->comment ? " " : "",
|
|
|
|
key->comment ? key->comment : "");
|
|
|
|
sfree(dec1);
|
|
|
|
sfree(dec2);
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ssh1_write_pubkey(FILE *fp, struct RSAKey *key)
|
|
|
|
{
|
|
|
|
char *buffer = ssh1_pubkey_str(key);
|
|
|
|
fprintf(fp, "%s\n", buffer);
|
|
|
|
sfree(buffer);
|
|
|
|
}
|
|
|
|
|
|
|
|
static char *ssh2_pubkey_openssh_str_internal(const char *comment,
|
|
|
|
const void *v_pub_blob,
|
|
|
|
int pub_len)
|
|
|
|
{
|
|
|
|
const unsigned char *ssh2blob = (const unsigned char *)v_pub_blob;
|
|
|
|
const char *alg;
|
|
|
|
int alglen;
|
|
|
|
char *buffer, *p;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (pub_len < 4) {
|
|
|
|
alg = NULL;
|
|
|
|
} else {
|
|
|
|
alglen = GET_32BIT(ssh2blob);
|
|
|
|
if (alglen > 0 && alglen < pub_len - 4) {
|
|
|
|
alg = (const char *)ssh2blob + 4;
|
|
|
|
} else {
|
|
|
|
alg = NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!alg) {
|
|
|
|
alg = "INVALID-ALGORITHM";
|
|
|
|
alglen = strlen(alg);
|
|
|
|
}
|
|
|
|
|
|
|
|
buffer = snewn(alglen +
|
|
|
|
4 * ((pub_len+2) / 3) +
|
|
|
|
(comment ? strlen(comment) : 0) + 3, char);
|
|
|
|
p = buffer + sprintf(buffer, "%.*s ", alglen, alg);
|
|
|
|
i = 0;
|
|
|
|
while (i < pub_len) {
|
|
|
|
int n = (pub_len - i < 3 ? pub_len - i : 3);
|
|
|
|
base64_encode_atom(ssh2blob + i, n, p);
|
|
|
|
i += n;
|
|
|
|
p += 4;
|
|
|
|
}
|
2018-05-25 13:06:51 +00:00
|
|
|
if (comment) {
|
2015-05-12 12:42:26 +00:00
|
|
|
*p++ = ' ';
|
|
|
|
strcpy(p, comment);
|
|
|
|
} else
|
|
|
|
*p++ = '\0';
|
|
|
|
|
|
|
|
return buffer;
|
|
|
|
}
|
|
|
|
|
|
|
|
char *ssh2_pubkey_openssh_str(struct ssh2_userkey *key)
|
|
|
|
{
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf *blob;
|
2015-05-12 12:42:26 +00:00
|
|
|
char *ret;
|
|
|
|
|
2018-05-24 09:59:39 +00:00
|
|
|
blob = strbuf_new();
|
|
|
|
key->alg->public_blob(key->data, BinarySink_UPCAST(blob));
|
|
|
|
ret = ssh2_pubkey_openssh_str_internal(
|
|
|
|
key->comment, blob->s, blob->len);
|
|
|
|
strbuf_free(blob);
|
2015-05-12 12:42:26 +00:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
void ssh2_write_pubkey(FILE *fp, const char *comment,
|
|
|
|
const void *v_pub_blob, int pub_len,
|
|
|
|
int keytype)
|
|
|
|
{
|
|
|
|
unsigned char *pub_blob = (unsigned char *)v_pub_blob;
|
|
|
|
|
|
|
|
if (keytype == SSH_KEYTYPE_SSH2_PUBLIC_RFC4716) {
|
|
|
|
const char *p;
|
|
|
|
int i, column;
|
|
|
|
|
|
|
|
fprintf(fp, "---- BEGIN SSH2 PUBLIC KEY ----\n");
|
|
|
|
|
|
|
|
if (comment) {
|
|
|
|
fprintf(fp, "Comment: \"");
|
|
|
|
for (p = comment; *p; p++) {
|
|
|
|
if (*p == '\\' || *p == '\"')
|
|
|
|
fputc('\\', fp);
|
|
|
|
fputc(*p, fp);
|
|
|
|
}
|
|
|
|
fprintf(fp, "\"\n");
|
|
|
|
}
|
|
|
|
|
|
|
|
i = 0;
|
|
|
|
column = 0;
|
|
|
|
while (i < pub_len) {
|
|
|
|
char buf[5];
|
|
|
|
int n = (pub_len - i < 3 ? pub_len - i : 3);
|
|
|
|
base64_encode_atom(pub_blob + i, n, buf);
|
|
|
|
i += n;
|
|
|
|
buf[4] = '\0';
|
|
|
|
fputs(buf, fp);
|
|
|
|
if (++column >= 16) {
|
|
|
|
fputc('\n', fp);
|
|
|
|
column = 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (column > 0)
|
|
|
|
fputc('\n', fp);
|
|
|
|
|
|
|
|
fprintf(fp, "---- END SSH2 PUBLIC KEY ----\n");
|
|
|
|
} else if (keytype == SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH) {
|
|
|
|
char *buffer = ssh2_pubkey_openssh_str_internal(comment,
|
|
|
|
v_pub_blob, pub_len);
|
|
|
|
fprintf(fp, "%s\n", buffer);
|
|
|
|
sfree(buffer);
|
|
|
|
} else {
|
|
|
|
assert(0 && "Bad key type in ssh2_write_pubkey");
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-05-12 13:35:44 +00:00
|
|
|
/* ----------------------------------------------------------------------
|
|
|
|
* Utility functions to compute SSH-2 fingerprints in a uniform way.
|
|
|
|
*/
|
|
|
|
char *ssh2_fingerprint_blob(const void *blob, int bloblen)
|
|
|
|
{
|
|
|
|
unsigned char digest[16];
|
|
|
|
char fingerprint_str[16*3];
|
|
|
|
const char *algstr;
|
|
|
|
int alglen;
|
Invent a struct type for polymorphic SSH key data.
During last week's work, I made a mistake in which I got the arguments
backwards in one of the key-blob-generating functions - mistakenly
swapped the 'void *' key instance with the 'BinarySink *' output
destination - and I didn't spot the mistake until run time, because in
C you can implicitly convert both to and from void * and so there was
no compile-time failure of type checking.
Now that I've introduced the FROMFIELD macro that downcasts a pointer
to one field of a structure to retrieve a pointer to the whole
structure, I think I might start using that more widely to indicate
this kind of polymorphic subtyping. So now all the public-key
functions in the struct ssh_signkey vtable handle their data instance
in the form of a pointer to a subfield of a new zero-sized structure
type 'ssh_key', which outside the key implementations indicates 'this
is some kind of key instance but it could be of any type'; they
downcast that pointer internally using FROMFIELD in place of the
previous ordinary C cast, and return one by returning &foo->sshk for
whatever foo they've just made up.
The sshk member is not at the beginning of the structure, which means
all those FROMFIELDs and &key->sshk are actually adding and
subtracting an offset. Of course I could have put the member at the
start anyway, but I had the idea that it's actually a feature _not_ to
have the two types start at the same address, because it means you
should notice earlier rather than later if you absentmindedly cast
from one to the other directly rather than by the approved method (in
particular, if you accidentally assign one through a void * and back
without even _noticing_ you perpetrated a cast). In particular, this
enforces that you can't sfree() the thing even once without realising
you should instead of called the right freekey function. (I found
several bugs by this method during initial testing, so I think it's
already proved its worth!)
While I'm here, I've also renamed the vtable structure ssh_signkey to
ssh_keyalg, because it was a confusing name anyway - it describes the
_algorithm_ for handling all keys of that type, not a specific key. So
ssh_keyalg is the collection of code, and ssh_key is one instance of
the data it handles.
2018-05-27 07:32:21 +00:00
|
|
|
const ssh_keyalg *alg;
|
2015-05-12 13:35:44 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* The fingerprint hash itself is always just the MD5 of the blob.
|
|
|
|
*/
|
|
|
|
MD5Simple(blob, bloblen, digest);
|
|
|
|
for (i = 0; i < 16; i++)
|
|
|
|
sprintf(fingerprint_str + i*3, "%02x%s", digest[i], i==15 ? "" : ":");
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Identify the key algorithm, if possible.
|
|
|
|
*/
|
|
|
|
alglen = toint(GET_32BIT((const unsigned char *)blob));
|
|
|
|
if (alglen > 0 && alglen < bloblen-4) {
|
|
|
|
algstr = (const char *)blob + 4;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* If we can actually identify the algorithm as one we know
|
|
|
|
* about, get hold of the key's bit count too.
|
|
|
|
*/
|
|
|
|
alg = find_pubkey_alg_len(alglen, algstr);
|
|
|
|
if (alg) {
|
2015-05-15 09:12:07 +00:00
|
|
|
int bits = alg->pubkey_bits(alg, blob, bloblen);
|
2015-05-12 13:35:44 +00:00
|
|
|
return dupprintf("%.*s %d %s", alglen, algstr,
|
|
|
|
bits, fingerprint_str);
|
|
|
|
} else {
|
|
|
|
return dupprintf("%.*s %s", alglen, algstr, fingerprint_str);
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/*
|
|
|
|
* No algorithm available (which means a seriously confused
|
|
|
|
* key blob, but there we go). Return only the hash.
|
|
|
|
*/
|
|
|
|
return dupstr(fingerprint_str);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Invent a struct type for polymorphic SSH key data.
During last week's work, I made a mistake in which I got the arguments
backwards in one of the key-blob-generating functions - mistakenly
swapped the 'void *' key instance with the 'BinarySink *' output
destination - and I didn't spot the mistake until run time, because in
C you can implicitly convert both to and from void * and so there was
no compile-time failure of type checking.
Now that I've introduced the FROMFIELD macro that downcasts a pointer
to one field of a structure to retrieve a pointer to the whole
structure, I think I might start using that more widely to indicate
this kind of polymorphic subtyping. So now all the public-key
functions in the struct ssh_signkey vtable handle their data instance
in the form of a pointer to a subfield of a new zero-sized structure
type 'ssh_key', which outside the key implementations indicates 'this
is some kind of key instance but it could be of any type'; they
downcast that pointer internally using FROMFIELD in place of the
previous ordinary C cast, and return one by returning &foo->sshk for
whatever foo they've just made up.
The sshk member is not at the beginning of the structure, which means
all those FROMFIELDs and &key->sshk are actually adding and
subtracting an offset. Of course I could have put the member at the
start anyway, but I had the idea that it's actually a feature _not_ to
have the two types start at the same address, because it means you
should notice earlier rather than later if you absentmindedly cast
from one to the other directly rather than by the approved method (in
particular, if you accidentally assign one through a void * and back
without even _noticing_ you perpetrated a cast). In particular, this
enforces that you can't sfree() the thing even once without realising
you should instead of called the right freekey function. (I found
several bugs by this method during initial testing, so I think it's
already proved its worth!)
While I'm here, I've also renamed the vtable structure ssh_signkey to
ssh_keyalg, because it was a confusing name anyway - it describes the
_algorithm_ for handling all keys of that type, not a specific key. So
ssh_keyalg is the collection of code, and ssh_key is one instance of
the data it handles.
2018-05-27 07:32:21 +00:00
|
|
|
char *ssh2_fingerprint(const ssh_keyalg *alg, ssh_key *data)
|
2015-05-12 13:35:44 +00:00
|
|
|
{
|
2018-05-24 09:59:39 +00:00
|
|
|
strbuf *blob = strbuf_new();
|
|
|
|
alg->public_blob(data, BinarySink_UPCAST(blob));
|
|
|
|
char *ret = ssh2_fingerprint_blob(blob->s, blob->len);
|
|
|
|
strbuf_free(blob);
|
2015-05-12 13:35:44 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2001-03-03 11:54:34 +00:00
|
|
|
/* ----------------------------------------------------------------------
|
2015-05-12 11:19:57 +00:00
|
|
|
* Determine the type of a private key file.
|
2001-03-03 11:54:34 +00:00
|
|
|
*/
|
2015-05-12 11:19:57 +00:00
|
|
|
static int key_type_fp(FILE *fp)
|
2001-05-06 14:35:20 +00:00
|
|
|
{
|
2015-05-12 11:19:57 +00:00
|
|
|
char buf[1024];
|
|
|
|
const char public_std_sig[] = "---- BEGIN SSH2 PUBLIC KEY";
|
2002-05-11 12:13:42 +00:00
|
|
|
const char putty2_sig[] = "PuTTY-User-Key-File-";
|
|
|
|
const char sshcom_sig[] = "---- BEGIN SSH2 ENCRYPTED PRIVAT";
|
2015-04-28 18:46:58 +00:00
|
|
|
const char openssh_new_sig[] = "-----BEGIN OPENSSH PRIVATE KEY";
|
2002-05-11 12:13:42 +00:00
|
|
|
const char openssh_sig[] = "-----BEGIN ";
|
2001-03-03 11:54:34 +00:00
|
|
|
int i;
|
2015-05-12 11:19:57 +00:00
|
|
|
char *p;
|
|
|
|
|
|
|
|
i = fread(buf, 1, sizeof(buf)-1, fp);
|
|
|
|
rewind(fp);
|
2001-03-03 11:54:34 +00:00
|
|
|
|
2002-05-11 12:13:42 +00:00
|
|
|
if (i < 0)
|
|
|
|
return SSH_KEYTYPE_UNOPENABLE;
|
|
|
|
if (i < 32)
|
|
|
|
return SSH_KEYTYPE_UNKNOWN;
|
2015-05-12 11:19:57 +00:00
|
|
|
assert(i > 0 && i < sizeof(buf));
|
|
|
|
buf[i] = '\0';
|
2002-05-11 12:13:42 +00:00
|
|
|
if (!memcmp(buf, rsa_signature, sizeof(rsa_signature)-1))
|
|
|
|
return SSH_KEYTYPE_SSH1;
|
2015-05-12 11:19:57 +00:00
|
|
|
if (!memcmp(buf, public_std_sig, sizeof(public_std_sig)-1))
|
|
|
|
return SSH_KEYTYPE_SSH2_PUBLIC_RFC4716;
|
2002-05-11 12:13:42 +00:00
|
|
|
if (!memcmp(buf, putty2_sig, sizeof(putty2_sig)-1))
|
|
|
|
return SSH_KEYTYPE_SSH2;
|
2015-04-28 18:46:58 +00:00
|
|
|
if (!memcmp(buf, openssh_new_sig, sizeof(openssh_new_sig)-1))
|
|
|
|
return SSH_KEYTYPE_OPENSSH_NEW;
|
2002-05-11 12:13:42 +00:00
|
|
|
if (!memcmp(buf, openssh_sig, sizeof(openssh_sig)-1))
|
2015-04-28 18:46:58 +00:00
|
|
|
return SSH_KEYTYPE_OPENSSH_PEM;
|
2002-05-11 12:13:42 +00:00
|
|
|
if (!memcmp(buf, sshcom_sig, sizeof(sshcom_sig)-1))
|
|
|
|
return SSH_KEYTYPE_SSHCOM;
|
2015-05-12 11:19:57 +00:00
|
|
|
if ((p = buf + strspn(buf, "0123456789"), *p == ' ') &&
|
|
|
|
(p = p+1 + strspn(p+1, "0123456789"), *p == ' ') &&
|
|
|
|
(p = p+1 + strspn(p+1, "0123456789"), *p == ' ' || *p == '\n' || !*p))
|
|
|
|
return SSH_KEYTYPE_SSH1_PUBLIC;
|
|
|
|
if ((p = buf + strcspn(buf, " "), find_pubkey_alg_len(p-buf, buf)) &&
|
|
|
|
(p = p+1 + strspn(p+1, "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghij"
|
|
|
|
"klmnopqrstuvwxyz+/="),
|
|
|
|
*p == ' ' || *p == '\n' || !*p))
|
|
|
|
return SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH;
|
2002-05-11 12:13:42 +00:00
|
|
|
return SSH_KEYTYPE_UNKNOWN; /* unrecognised or EOF */
|
|
|
|
}
|
|
|
|
|
2015-05-12 11:19:57 +00:00
|
|
|
int key_type(const Filename *filename)
|
|
|
|
{
|
|
|
|
FILE *fp;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
fp = f_open(filename, "r", FALSE);
|
|
|
|
if (!fp)
|
|
|
|
return SSH_KEYTYPE_UNOPENABLE;
|
|
|
|
ret = key_type_fp(fp);
|
|
|
|
fclose(fp);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2002-05-11 12:13:42 +00:00
|
|
|
/*
|
|
|
|
* Convert the type word to a string, for `wrong type' error
|
|
|
|
* messages.
|
|
|
|
*/
|
2015-05-15 10:15:42 +00:00
|
|
|
const char *key_type_to_str(int type)
|
2002-05-11 12:13:42 +00:00
|
|
|
{
|
|
|
|
switch (type) {
|
|
|
|
case SSH_KEYTYPE_UNOPENABLE: return "unable to open file"; break;
|
2015-05-12 11:19:57 +00:00
|
|
|
case SSH_KEYTYPE_UNKNOWN: return "not a recognised key file format"; break;
|
|
|
|
case SSH_KEYTYPE_SSH1_PUBLIC: return "SSH-1 public key"; break;
|
|
|
|
case SSH_KEYTYPE_SSH2_PUBLIC_RFC4716: return "SSH-2 public key (RFC 4716 format)"; break;
|
|
|
|
case SSH_KEYTYPE_SSH2_PUBLIC_OPENSSH: return "SSH-2 public key (OpenSSH format)"; break;
|
2005-03-10 16:36:05 +00:00
|
|
|
case SSH_KEYTYPE_SSH1: return "SSH-1 private key"; break;
|
|
|
|
case SSH_KEYTYPE_SSH2: return "PuTTY SSH-2 private key"; break;
|
2015-04-28 18:46:58 +00:00
|
|
|
case SSH_KEYTYPE_OPENSSH_PEM: return "OpenSSH SSH-2 private key (old PEM format)"; break;
|
|
|
|
case SSH_KEYTYPE_OPENSSH_NEW: return "OpenSSH SSH-2 private key (new format)"; break;
|
2005-03-10 16:36:05 +00:00
|
|
|
case SSH_KEYTYPE_SSHCOM: return "ssh.com SSH-2 private key"; break;
|
2015-05-10 06:42:48 +00:00
|
|
|
/*
|
|
|
|
* This function is called with a key type derived from
|
|
|
|
* looking at an actual key file, so the output-only type
|
|
|
|
* OPENSSH_AUTO should never get here, and is much an INTERNAL
|
|
|
|
* ERROR as a code we don't even understand.
|
|
|
|
*/
|
|
|
|
case SSH_KEYTYPE_OPENSSH_AUTO: return "INTERNAL ERROR (OPENSSH_AUTO)"; break;
|
2002-05-11 12:13:42 +00:00
|
|
|
default: return "INTERNAL ERROR"; break;
|
|
|
|
}
|
2001-03-03 11:54:34 +00:00
|
|
|
}
|