dropbear: keyimport.c annotate

annotate keyimport.c @ 1319:21156be2bb26

ses.debug_trace is wrong

author	Matt Johnston <matt@ucc.asn.au>
date	Thu, 01 Sep 2016 23:08:56 +0800
parents	2c9dac2d6707
children	77c0d57a4410

rev	line source
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 * Based on PuTTY's import.c for importing/exporting OpenSSH and SSH.com
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 * keyfiles.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 * Modifications copyright 2003 Matt Johnston
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * PuTTY is copyright 1997-2003 Simon Tatham.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 * Portions copyright Robert de Bath, Joris van Rantwijk, Delian
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10 * Delchev, Andreas Schultz, Jeroen Massar, Wez Furlong, Nicolas Barry,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 * Justin Bradford, and CORE SDI S.A.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 * Permission is hereby granted, free of charge, to any person
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 * obtaining a copy of this software and associated documentation files
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 * (the "Software"), to deal in the Software without restriction,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 * including without limitation the rights to use, copy, modify, merge,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 * publish, distribute, sublicense, and/or sell copies of the Software,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 * and to permit persons to whom the Software is furnished to do so,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 * subject to the following conditions:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21 * The above copyright notice and this permission notice shall be
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 * included in all copies or substantial portions of the Software.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	26 * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 * NONINFRINGEMENT. IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 #include "keyimport.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 #include "bignum.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 #include "buffer.h"
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #include "dbutil.h"
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	37 #include "ecc.h"
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	38
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	39 #if DROPBEAR_ECDSA
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	40 static const unsigned char OID_SEC256R1_BLOB[] = {0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07};
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	41 static const unsigned char OID_SEC384R1_BLOB[] = {0x2b, 0x81, 0x04, 0x00, 0x22};
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	42 static const unsigned char OID_SEC521R1_BLOB[] = {0x2b, 0x81, 0x04, 0x00, 0x23};
1294 56aba7dedbea options for disabling "normal" DH Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	43 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 #define PUT_32BIT(cp, value) do { \
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 (cp)[3] = (unsigned char)(value); \
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 (cp)[2] = (unsigned char)((value) >> 8); \
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 (cp)[1] = (unsigned char)((value) >> 16); \
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 (cp)[0] = (unsigned char)((value) >> 24); } while (0)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 #define GET_32BIT(cp) \
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	52 (((unsigned long)(unsigned char)(cp)[0] << 24) \| \
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	53 ((unsigned long)(unsigned char)(cp)[1] << 16) \| \
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	54 ((unsigned long)(unsigned char)(cp)[2] << 8) \| \
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	55 ((unsigned long)(unsigned char)(cp)[3]))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 static int openssh_encrypted(const char *filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 static sign_key openssh_read(const char filename, char *passphrase);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 static int openssh_write(const char filename, sign_key key,
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	60 char *passphrase);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 static int dropbear_write(const charfilename, sign_key key);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63 static sign_key dropbear_read(const char filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	65 static int toint(unsigned u);
34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	66
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 #if 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 static int sshcom_encrypted(const char filename, char *comment);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	69 static struct ssh2_userkey sshcom_read(const char filename, char *passphrase);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 static int sshcom_write(const char filename, struct ssh2_userkey key,
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	71 char *passphrase);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	73
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 int import_encrypted(const char* filename, int filetype) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76 if (filetype == KEYFILE_OPENSSH) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 return openssh_encrypted(filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 #if 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79 } else if (filetype == KEYFILE_SSHCOM) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	80 return sshcom_encrypted(filename, NULL);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	81 #endif
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	82 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	83 return 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	86 sign_key import_read(const char filename, char *passphrase, int filetype) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 if (filetype == KEYFILE_OPENSSH) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 return openssh_read(filename, passphrase);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 } else if (filetype == KEYFILE_DROPBEAR) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 return dropbear_read(filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 #if 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 } else if (filetype == KEYFILE_SSHCOM) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 return sshcom_read(filename, passphrase);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	97 return NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	98 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 int import_write(const char filename, sign_key key, char *passphrase,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 int filetype) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 if (filetype == KEYFILE_OPENSSH) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 return openssh_write(filename, key, passphrase);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 } else if (filetype == KEYFILE_DROPBEAR) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 return dropbear_write(filename, key);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 #if 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 } else if (filetype == KEYFILE_SSHCOM) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 return sshcom_write(filename, key, passphrase);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	112 return 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 static sign_key dropbear_read(const char filename) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 buffer * buf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 sign_key *ret = NULL;
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: 845 diff changeset	119 enum signkey_type type;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120
73 0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	121 buf = buf_new(MAX_PRIVKEY_SIZE);
0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	122 if (buf_readfile(buf, filename) == DROPBEAR_FAILURE) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 goto error;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126 buf_setpos(buf, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 ret = new_sign_key();
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129 type = DROPBEAR_SIGNKEY_ANY;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 if (buf_get_priv_key(buf, ret, &type) == DROPBEAR_FAILURE){
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 goto error;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 buf_free(buf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	134
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	135 ret->type = type;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	136
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	137 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	138
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	139 error:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	140 if (buf) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	141 buf_free(buf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	143 if (ret) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	144 sign_key_free(ret);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	145 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	146 return NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	147 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	148
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	149 /* returns 0 on fail, 1 on success */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	150 static int dropbear_write(const charfilename, sign_key key) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	151
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	152 buffer * buf;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	153 FILE*fp;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	154 int len;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	155 int ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	156
73 0bf5cebe622c Dropbearkey can now print out pubkey portions Matt Johnston <matt@ucc.asn.au> parents: 4 diff changeset	157 buf = buf_new(MAX_PRIVKEY_SIZE);
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	158 buf_put_priv_key(buf, key, key->type);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	159
87 680a0bc9df0a Some small fixes for unused vars, and old messages Matt Johnston <matt@ucc.asn.au> parents: 73 diff changeset	160 fp = fopen(filename, "w");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	161 if (!fp) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	162 ret = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	163 goto out;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	164 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	165
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 buf_setpos(buf, 0);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 do {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 len = fwrite(buf_getptr(buf, buf->len - buf->pos),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 1, buf->len - buf->pos, fp);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 buf_incrpos(buf, len);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	171 } while (len > 0 && buf->len != buf->pos);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172
256 ac890087b8c1 * keyimport.c: fclose() the key file to make sure data gets written Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	173 fclose(fp);
ac890087b8c1 * keyimport.c: fclose() the key file to make sure data gets written Matt Johnston <matt@ucc.asn.au> parents: 241 diff changeset	174
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	175 if (buf->pos != buf->len) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176 ret = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	178 ret = 1;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	179 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 out:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	181 buf_free(buf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	182 return ret;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	183 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	184
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	185
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	186 /* ----------------------------------------------------------------------
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	187 * Helper routines. (The base64 ones are defined in sshpubk.c.)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	189
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	190 #define isbase64(c) ( ((c) >= 'A' && (c) <= 'Z') \|\| \
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	191 ((c) >= 'a' && (c) <= 'z') \|\| \
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	192 ((c) >= '0' && (c) <= '9') \|\| \
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	193 (c) == '+' \|\| (c) == '/' \|\| (c) == '=' \
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	194 )
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	195
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	196 /* cpl has to be less than 100 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	197 static void base64_encode_fp(FILE * fp, unsigned char *data,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 int datalen, int cpl)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 {
1094 c45d65392c1a Fix pointer differ in signess warnings [-Werror=pointer-sign] Gaël PORTAY <gael.portay@gmail.com> parents: 1089 diff changeset	200 unsigned char out[100];
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1124 diff changeset	201 int n;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	202 unsigned long outlen;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	203 int rawcpl;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 rawcpl = cpl * 3 / 4;
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	205 dropbear_assert((unsigned int)cpl < sizeof(out));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1124 diff changeset	207 while (datalen > 0) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 n = (datalen < rawcpl ? datalen : rawcpl);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 outlen = sizeof(out);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 base64_encode(data, n, out, &outlen);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 data += n;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 datalen -= n;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	213 fwrite(out, 1, outlen, fp);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 fputc('\n', fp);
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1124 diff changeset	215 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218 * Read an ASN.1/BER identifier and length pair.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	220 * Flags are a combination of the #defines listed below.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	221 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	222 * Returns -1 if unsuccessful; otherwise returns the number of
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 * bytes used out of the source data.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	225
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 /* ASN.1 tag classes. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227 #define ASN1_CLASS_UNIVERSAL (0 << 6)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 #define ASN1_CLASS_APPLICATION (1 << 6)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 #define ASN1_CLASS_CONTEXT_SPECIFIC (2 << 6)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	230 #define ASN1_CLASS_PRIVATE (3 << 6)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	231 #define ASN1_CLASS_MASK (3 << 6)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	232
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 /* Primitive versus constructed bit. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	234 #define ASN1_CONSTRUCTED (1 << 5)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 static int ber_read_id_len(void *source, int sourcelen,
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	237 int id, int length, int *flags)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	239 unsigned char p = (unsigned char ) source;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	241 if (sourcelen == 0)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	242 return -1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	244 flags = (p & 0xE0);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	245 if ((*p & 0x1F) == 0x1F) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	246 *id = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	247 while (*p & 0x80) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	248 p++, sourcelen--;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	249 if (sourcelen == 0)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	250 return -1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	251 id = (id << 7) \| (*p & 0x7F);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	252 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	253 p++, sourcelen--;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	254 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	255 id = p & 0x1F;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	256 p++, sourcelen--;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257 }
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	258
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	259 if (sourcelen == 0)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	260 return -1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	261
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	262 if (*p & 0x80) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	263 unsigned len;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	264 int n = *p & 0x7F;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	265 p++, sourcelen--;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	266 if (sourcelen < n)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	267 return -1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	268 len = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	269 while (n--)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	270 len = (len << 8) \| (*p++);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	271 sourcelen -= n;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	272 *length = toint(len);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	273 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	274 length = p;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	275 p++, sourcelen--;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	276 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	278 if (*length < 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	279 printf("Negative ASN.1 length\n");
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	280 return -1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	281 }
1307 ad9c40aca3bc add length checks for ecc too Matt Johnston <matt@ucc.asn.au> parents: 1306 diff changeset	282
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	283 return p - (unsigned char *) source;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	284 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	286 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	287 * Write an ASN.1/BER identifier and length pair. Returns the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	288 * number of bytes consumed. Assumes dest contains enough space.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	289 * Will avoid writing anything if dest is NULL, but still return
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 * amount of space required.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	291 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	292 static int ber_write_id_len(void *dest, int id, int length, int flags)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	293 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	294 unsigned char d = (unsigned char )dest;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	295 int len = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	297 if (id <= 30) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	298 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	299 * Identifier is one byte.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	300 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	301 len++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	302 if (d) *d++ = id \| flags;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	303 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	304 int n;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	305 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	306 * Identifier is multiple bytes: the first byte is 11111
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	307 * plus the flags, and subsequent bytes encode the value of
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	308 * the identifier, 7 bits at a time, with the top bit of
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	309 * each byte 1 except the last one which is 0.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	310 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	311 len++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	312 if (d) *d++ = 0x1F \| flags;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	313 for (n = 1; (id >> (7*n)) > 0; n++)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 continue; /* count the bytes */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	315 while (n--) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	316 len++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	317 if (d) d++ = (n ? 0x80 : 0) \| ((id >> (7n)) & 0x7F);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	318 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	321 if (length < 128) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	322 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	323 * Length is one byte.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	324 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	325 len++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	326 if (d) *d++ = length;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	327 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	328 int n;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	329 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	330 * Length is multiple bytes. The first is 0x80 plus the
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	331 * number of subsequent bytes, and the subsequent bytes
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	332 * encode the actual length.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	333 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	334 for (n = 1; (length >> (8*n)) > 0; n++)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 continue; /* count the bytes */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	336 len++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	337 if (d) *d++ = 0x80 \| n;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	338 while (n--) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	339 len++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	340 if (d) d++ = (length >> (8n)) & 0xFF;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	341 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	344 return len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348 /* Simple structure to point to an mp-int within a blob. */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349 struct mpint_pos { void *start; int bytes; };
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	351 /* ----------------------------------------------------------------------
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	352 * Code to read and write OpenSSH private keys.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	353 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 491 diff changeset	355 enum { OSSH_DSA, OSSH_RSA, OSSH_EC };
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	356 struct openssh_key {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	357 int type;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	358 int encrypted;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	359 char iv[32];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	360 unsigned char *keyblob;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 unsigned int keyblob_len, keyblob_size;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	362 };
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	364 static struct openssh_key load_openssh_key(const char filename)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	366 struct openssh_key *ret;
340 454a34b2dfd1 Fixes from Erik Hovland: Matt Johnston <matt@ucc.asn.au> parents: 256 diff changeset	367 FILE *fp = NULL;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	368 char buffer[256];
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	369 char errmsg = NULL, p = NULL;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	370 int headers_done;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371 unsigned long len, outlen;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 ret = (struct openssh_key*)m_malloc(sizeof(struct openssh_key));
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	374 ret->keyblob = NULL;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	375 ret->keyblob_len = ret->keyblob_size = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	376 ret->encrypted = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	377 memset(ret->iv, 0, sizeof(ret->iv));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	379 if (strlen(filename) == 1 && filename[0] == '-') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 fp = stdin;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 fp = fopen(filename, "r");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	384 if (!fp) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	385 errmsg = "Unable to open key file";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	386 goto error;
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	387 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	388 if (!fgets(buffer, sizeof(buffer), fp) \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	389 0 != strncmp(buffer, "-----BEGIN ", 11) \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	390 0 != strcmp(buffer+strlen(buffer)-17, "PRIVATE KEY-----\n")) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	391 errmsg = "File does not begin with OpenSSH key header";
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	392 goto error;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	393 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	394 if (!strcmp(buffer, "-----BEGIN RSA PRIVATE KEY-----\n"))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	395 ret->type = OSSH_RSA;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	396 else if (!strcmp(buffer, "-----BEGIN DSA PRIVATE KEY-----\n"))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	397 ret->type = OSSH_DSA;
793 70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 491 diff changeset	398 else if (!strcmp(buffer, "-----BEGIN EC PRIVATE KEY-----\n"))
70625eed40c9 A bit of work on ecdsa for host/auth keys Matt Johnston <matt@ucc.asn.au> parents: 491 diff changeset	399 ret->type = OSSH_EC;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	400 else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	401 errmsg = "Unrecognised key type";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	402 goto error;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	405 headers_done = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	406 while (1) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	407 if (!fgets(buffer, sizeof(buffer), fp)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	408 errmsg = "Unexpected end of file";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	409 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	410 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	411 if (0 == strncmp(buffer, "-----END ", 9) &&
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	412 0 == strcmp(buffer+strlen(buffer)-17, "PRIVATE KEY-----\n"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	413 break; /* done */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	414 if ((p = strchr(buffer, ':')) != NULL) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	415 if (headers_done) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	416 errmsg = "Header found in body of key data";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	417 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	418 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	419 *p++ = '\0';
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	420 while (p && isspace((unsigned char)p)) p++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	421 if (!strcmp(buffer, "Proc-Type")) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	422 if (p[0] != '4' \|\| p[1] != ',') {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	423 errmsg = "Proc-Type is not 4 (only 4 is supported)";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	424 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	425 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	426 p += 2;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	427 if (!strcmp(p, "ENCRYPTED\n"))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	428 ret->encrypted = 1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	429 } else if (!strcmp(buffer, "DEK-Info")) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	430 int i, j;
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	431
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	432 if (strncmp(p, "DES-EDE3-CBC,", 13)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	433 errmsg = "Ciphers other than DES-EDE3-CBC not supported";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	434 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	435 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	436 p += 13;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	437 for (i = 0; i < 8; i++) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	438 if (1 != sscanf(p, "%2x", &j))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	439 break;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	440 ret->iv[i] = j;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	441 p += 2;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	442 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	443 if (i < 8) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	444 errmsg = "Expected 16-digit iv in DEK-Info";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	445 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	446 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	447 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	448 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	449 headers_done = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 len = strlen(buffer);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 outlen = len*4/3;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	452 if (ret->keyblob_len + outlen > ret->keyblob_size) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 ret->keyblob_size = ret->keyblob_len + outlen + 256;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 ret->keyblob = (unsigned char*)m_realloc(ret->keyblob,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	455 ret->keyblob_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	457 outlen = ret->keyblob_size - ret->keyblob_len;
1094 c45d65392c1a Fix pointer differ in signess warnings [-Werror=pointer-sign] Gaël PORTAY <gael.portay@gmail.com> parents: 1089 diff changeset	458 if (base64_decode((const unsigned char *)buffer, len,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459 ret->keyblob + ret->keyblob_len, &outlen) != CRYPT_OK){
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	460 errmsg = "Error decoding base64";
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 goto error;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	462 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463 ret->keyblob_len += outlen;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	464 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	466
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	467 if (ret->keyblob_len == 0 \|\| !ret->keyblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	468 errmsg = "Key body not present";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	469 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	470 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	471
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	472 if (ret->encrypted && ret->keyblob_len % 8 != 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	473 errmsg = "Encrypted key blob is not a multiple of cipher block size";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	474 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	475 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476
1045 31727a8abd4b Use m_burn rather than memset Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1038 diff changeset	477 m_burn(buffer, sizeof(buffer));
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	478 return ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	479
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	480 error:
1045 31727a8abd4b Use m_burn rather than memset Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1038 diff changeset	481 m_burn(buffer, sizeof(buffer));
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	482 if (ret) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	483 if (ret->keyblob) {
1045 31727a8abd4b Use m_burn rather than memset Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1038 diff changeset	484 m_burn(ret->keyblob, ret->keyblob_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	485 m_free(ret->keyblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	486 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	487 m_free(ret);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	488 }
340 454a34b2dfd1 Fixes from Erik Hovland: Matt Johnston <matt@ucc.asn.au> parents: 256 diff changeset	489 if (fp) {
454a34b2dfd1 Fixes from Erik Hovland: Matt Johnston <matt@ucc.asn.au> parents: 256 diff changeset	490 fclose(fp);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	491 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	492 if (errmsg) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	493 fprintf(stderr, "Error: %s\n", errmsg);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	494 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	495 return NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	496 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	497
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	498 static int openssh_encrypted(const char *filename)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	499 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	500 struct openssh_key *key = load_openssh_key(filename);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	501 int ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	502
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	503 if (!key)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	504 return 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	505 ret = key->encrypted;
1045 31727a8abd4b Use m_burn rather than memset Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1038 diff changeset	506 m_burn(key->keyblob, key->keyblob_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	507 m_free(key->keyblob);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	508 m_free(key);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	509 return ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	510 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	511
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: 845 diff changeset	512 static sign_key openssh_read(const char filename, char * UNUSED(passphrase))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	513 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	514 struct openssh_key *key;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	515 unsigned char *p;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	516 int ret, id, len, flags;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	517 int i, num_integers = 0;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	518 sign_key *retval = NULL;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	519 char *errmsg;
1119 845922d73e9c Turn modptr local variable into unsigned char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	520 unsigned char *modptr = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	521 int modlen = -9999;
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: 845 diff changeset	522 enum signkey_type type;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	523
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	524 sign_key *retkey;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	525 buffer * blobbuf = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	526
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	527 retkey = new_sign_key();
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	528
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	529 key = load_openssh_key(filename);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	530
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	531 if (!key)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	532 return NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	533
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	534 if (key->encrypted) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	535 errmsg = "encrypted keys not supported currently";
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	536 goto error;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	537 #if 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	538 /* matt TODO */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	539 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	540 * Derive encryption key from passphrase and iv/salt:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	541 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	542 * - let block A equal MD5(passphrase \|\| iv)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	543 * - let block B equal MD5(A \|\| passphrase \|\| iv)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	544 * - block C would be MD5(B \|\| passphrase \|\| iv) and so on
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	545 * - encryption key is the first N bytes of A \|\| B
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	546 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	547 struct MD5Context md5c;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	548 unsigned char keybuf[32];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	549
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	550 MD5Init(&md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	551 MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	552 MD5Update(&md5c, (unsigned char *)key->iv, 8);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	553 MD5Final(keybuf, &md5c);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	554
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	555 MD5Init(&md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	556 MD5Update(&md5c, keybuf, 16);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	557 MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	558 MD5Update(&md5c, (unsigned char *)key->iv, 8);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	559 MD5Final(keybuf+16, &md5c);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	560
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	561 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	562 * Now decrypt the key blob.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	563 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	564 des3_decrypt_pubkey_ossh(keybuf, (unsigned char *)key->iv,
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	565 key->keyblob, key->keyblob_len);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	566
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	567 memset(&md5c, 0, sizeof(md5c));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	568 memset(keybuf, 0, sizeof(keybuf));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	569 #endif
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	570 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	571
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	572 /*
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	573 * Now we have a decrypted key blob, which contains an ASN.1
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	574 * encoded private key. We must now untangle the ASN.1.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	575 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	576 * We expect the whole key blob to be formatted as a SEQUENCE
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	577 * (0x30 followed by a length code indicating that the rest of
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	578 * the blob is part of the sequence). Within that SEQUENCE we
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	579 * expect to see a bunch of INTEGERs. What those integers mean
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	580 * depends on the key type:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	581 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	582 * - For RSA, we expect the integers to be 0, n, e, d, p, q,
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	583 * dmp1, dmq1, iqmp in that order. (The last three are d mod
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	584 * (p-1), d mod (q-1), inverse of q mod p respectively.)
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	585 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	586 * - For DSA, we expect them to be 0, p, q, g, y, x in that
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	587 * order.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	588 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	589
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	590 p = key->keyblob;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	591
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	592 /* Expect the SEQUENCE header. Take its absence as a failure to decrypt. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	593 ret = ber_read_id_len(p, key->keyblob_len, &id, &len, &flags);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	594 p += ret;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	595 if (ret < 0 \|\| id != 16 \|\| len < 0 \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	596 key->keyblob+key->keyblob_len-p < len) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	597 errmsg = "ASN.1 decoding failure";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	598 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	599 }
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	600
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	601 /* Expect a load of INTEGERs. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	602 if (key->type == OSSH_RSA)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	603 num_integers = 9;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	604 else if (key->type == OSSH_DSA)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	605 num_integers = 6;
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	606 else if (key->type == OSSH_EC)
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	607 num_integers = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	608
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	609 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	610 * Space to create key blob in.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	611 */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	612 blobbuf = buf_new(3000);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	613
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	614 #if DROPBEAR_DSS
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	615 if (key->type == OSSH_DSA) {
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1119 diff changeset	616 buf_putstring(blobbuf, "ssh-dss", 7);
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	617 retkey->type = DROPBEAR_SIGNKEY_DSS;
935 25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	618 }
25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	619 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	620 #if DROPBEAR_RSA
935 25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	621 if (key->type == OSSH_RSA) {
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1119 diff changeset	622 buf_putstring(blobbuf, "ssh-rsa", 7);
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	623 retkey->type = DROPBEAR_SIGNKEY_RSA;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	624 }
935 25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	625 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	626
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	627 for (i = 0; i < num_integers; i++) {
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	628 ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p,
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	629 &id, &len, &flags);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	630 p += ret;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	631 if (ret < 0 \|\| id != 2 \|\| len < 0 \|\|
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	632 key->keyblob+key->keyblob_len-p < len) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	633 errmsg = "ASN.1 decoding failure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	634 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	635 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	636
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	637 if (i == 0) {
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	638 /* First integer is a version indicator */
991 4f65c867fc99 Fix variables may be uninitialized. Like Ma <likemartinma@gmail.com> parents: 935 diff changeset	639 int expected = -1;
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	640 switch (key->type) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	641 case OSSH_RSA:
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	642 case OSSH_DSA:
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	643 expected = 0;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	644 break;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	645 case OSSH_EC:
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	646 expected = 1;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	647 break;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	648 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	649 if (len != 1 \|\| p[0] != expected) {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	650 errmsg = "Version number mismatch";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	651 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	652 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	653 } else if (key->type == OSSH_RSA) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	654 /*
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	655 * OpenSSH key order is n, e, d, p, q, dmp1, dmq1, iqmp
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	656 * but we want e, n, d, p, q
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	657 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	658 if (i == 1) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	659 /* Save the details for after we deal with number 2. */
1119 845922d73e9c Turn modptr local variable into unsigned char * Gaël PORTAY <gael.portay@gmail.com> parents: 1094 diff changeset	660 modptr = p;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	661 modlen = len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	662 } else if (i >= 2 && i <= 5) {
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1119 diff changeset	663 buf_putstring(blobbuf, (const char*)p, len);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	664 if (i == 2) {
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1119 diff changeset	665 buf_putstring(blobbuf, (const char*)modptr, modlen);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	666 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	667 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	668 } else if (key->type == OSSH_DSA) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	669 /*
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	670 * OpenSSH key order is p, q, g, y, x,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	671 * we want the same.
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	672 */
1122 aaf576b27a10 Merge pull request #13 from gazoo74/fix-warnings Matt Johnston <matt@ucc.asn.au> parents: 1119 diff changeset	673 buf_putstring(blobbuf, (const char*)p, len);
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	674 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	675
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	676 /* Skip past the number. */
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	677 p += len;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	678 }
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	679
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	680 #if DROPBEAR_ECDSA
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	681 if (key->type == OSSH_EC) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	682 unsigned char* private_key_bytes = NULL;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	683 int private_key_len = 0;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	684 unsigned char* public_key_bytes = NULL;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	685 int public_key_len = 0;
807 75509065db53 have separate ecdsa keys for each size Matt Johnston <matt@ucc.asn.au> parents: 806 diff changeset	686 ecc_key *ecc = NULL;
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	687 const struct dropbear_ecc_curve *curve = NULL;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	688
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	689 /* See SEC1 v2, Appendix C.4 */
c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	690 /* OpenSSL (so OpenSSH) seems to include the optional parts. */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	691
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	692 /* privateKey OCTET STRING, */
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	693 ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p,
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	694 &id, &len, &flags);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	695 p += ret;
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	696 /* id==4 for octet string */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	697 if (ret < 0 \|\| id != 4 \|\| len < 0 \|\|
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	698 key->keyblob+key->keyblob_len-p < len) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	699 errmsg = "ASN.1 decoding failure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	700 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	701 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	702 private_key_bytes = p;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	703 private_key_len = len;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	704 p += len;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	705
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	706 /* parameters [0] ECDomainParameters {{ SECGCurveNames }} OPTIONAL, */
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	707 ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p,
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	708 &id, &len, &flags);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	709 p += ret;
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	710 /* id==0 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	711 if (ret < 0 \|\| id != 0 \|\| len < 0) {
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	712 errmsg = "ASN.1 decoding failure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	713 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	714 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	715
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	716 ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p,
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	717 &id, &len, &flags);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	718 p += ret;
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	719 /* id==6 for object */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	720 if (ret < 0 \|\| id != 6 \|\| len < 0 \|\|
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	721 key->keyblob+key->keyblob_len-p < len) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	722 errmsg = "ASN.1 decoding failure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	723 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	724 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	725
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	726 if (0) {}
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	727 #if DROPBEAR_ECC_256
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	728 else if (len == sizeof(OID_SEC256R1_BLOB)
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	729 && memcmp(p, OID_SEC256R1_BLOB, len) == 0) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	730 retkey->type = DROPBEAR_SIGNKEY_ECDSA_NISTP256;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	731 curve = &ecc_curve_nistp256;
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	732 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	733 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	734 #if DROPBEAR_ECC_384
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	735 else if (len == sizeof(OID_SEC384R1_BLOB)
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	736 && memcmp(p, OID_SEC384R1_BLOB, len) == 0) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	737 retkey->type = DROPBEAR_SIGNKEY_ECDSA_NISTP384;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	738 curve = &ecc_curve_nistp384;
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	739 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	740 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	741 #if DROPBEAR_ECC_521
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	742 else if (len == sizeof(OID_SEC521R1_BLOB)
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	743 && memcmp(p, OID_SEC521R1_BLOB, len) == 0) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	744 retkey->type = DROPBEAR_SIGNKEY_ECDSA_NISTP521;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	745 curve = &ecc_curve_nistp521;
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	746 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	747 #endif
847 f4bb964c8678 Add '-R' for delayed hostkey option Matt Johnston <matt@ucc.asn.au> parents: 846 diff changeset	748 else {
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	749 errmsg = "Unknown ECC key type";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	750 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	751 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	752 p += len;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	753
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	754 /* publicKey [1] BIT STRING OPTIONAL */
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	755 ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p,
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	756 &id, &len, &flags);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	757 p += ret;
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	758 /* id==1 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	759 if (ret < 0 \|\| id != 1 \|\| len < 0) {
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	760 errmsg = "ASN.1 decoding failure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	761 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	762 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	763
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	764 ret = ber_read_id_len(p, key->keyblob+key->keyblob_len-p,
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	765 &id, &len, &flags);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	766 p += ret;
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	767 /* id==3 for bit string */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	768 if (ret < 0 \|\| id != 3 \|\| len < 0 \|\|
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	769 key->keyblob+key->keyblob_len-p < len) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	770 errmsg = "ASN.1 decoding failure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	771 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	772 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	773 public_key_bytes = p+1;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	774 public_key_len = len-1;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	775 p += len;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	776
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	777 buf_putbytes(blobbuf, public_key_bytes, public_key_len);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	778 ecc = buf_get_ecc_raw_pubkey(blobbuf, curve);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	779 if (!ecc) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	780 errmsg = "Error parsing ECC key";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	781 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	782 }
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	783 m_mp_alloc_init_multi((mp_int**)&ecc->k, NULL);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	784 if (mp_read_unsigned_bin(ecc->k, private_key_bytes, private_key_len)
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	785 != MP_OKAY) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	786 errmsg = "Error parsing ECC key";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	787 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	788 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	789
841 d4ce5269a439 Fix specifying a keysize for key generation, fix key name arguments Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	790 *signkey_key_ptr(retkey, retkey->type) = ecc;
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	791 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	792 #endif /* DROPBEAR_ECDSA */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	793
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	794 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	795 * Now put together the actual key. Simplest way to do this is
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	796 * to assemble our own key blobs and feed them to the createkey
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	797 * functions; this is a bit faffy but it does mean we get all
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	798 * the sanity checks for free.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	799 */
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	800 if (key->type == OSSH_RSA \|\| key->type == OSSH_DSA) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	801 buf_setpos(blobbuf, 0);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	802 type = DROPBEAR_SIGNKEY_ANY;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	803 if (buf_get_priv_key(blobbuf, retkey, &type)
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	804 != DROPBEAR_SUCCESS) {
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	805 errmsg = "unable to create key structure";
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	806 sign_key_free(retkey);
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	807 retkey = NULL;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	808 goto error;
71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	809 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	810 }
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	811
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	812 errmsg = NULL; /* no error */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	813 retval = retkey;
806 71e7d31f7671 hackish ECC import code from OpenSSH Matt Johnston <matt@ucc.asn.au> parents: 793 diff changeset	814
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	815 error:
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	816 if (blobbuf) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	817 buf_burn(blobbuf);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	818 buf_free(blobbuf);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	819 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	820 m_burn(key->keyblob, key->keyblob_size);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	821 m_free(key->keyblob);
1002 97d1e54941fd When clearing the memory of 'key' in function openssh_read(), only the size Christian Engelmayer <cengelma@gmx.at> parents: 991 diff changeset	822 m_burn(key, sizeof(*key));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	823 m_free(key);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	824 if (errmsg) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	825 fprintf(stderr, "Error: %s\n", errmsg);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	826 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	827 return retval;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	828 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	829
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	830 static int openssh_write(const char filename, sign_key key,
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	831 char *passphrase)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	832 {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	833 buffer * keyblob = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	834 buffer * extrablob = NULL; /* used for calculated values to write */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	835 unsigned char *outblob = NULL;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	836 int outlen = -9999;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	837 struct mpint_pos numbers[9];
991 4f65c867fc99 Fix variables may be uninitialized. Like Ma <likemartinma@gmail.com> parents: 935 diff changeset	838 int nnumbers = -1, pos = 0, len = 0, seqlen, i;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	839 char header = NULL, footer = NULL;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	840 char zero[1];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	841 int ret = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	842 FILE *fp;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	843
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	844 #if DROPBEAR_RSA
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	845 mp_int dmp1, dmq1, iqmp, tmpval; /* for rsa */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	846 #endif
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	847
935 25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	848 if (
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	849 #if DROPBEAR_RSA
935 25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	850 key->type == DROPBEAR_SIGNKEY_RSA \|\|
25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	851 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	852 #if DROPBEAR_DSS
935 25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	853 key->type == DROPBEAR_SIGNKEY_DSS \|\|
25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	854 #endif
25692c60479e Fix compiling with ECDSA and DSS disabled Matt Johnston <matt@ucc.asn.au> parents: 867 diff changeset	855 0)
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	856 {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	857 /*
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	858 * Fetch the key blobs.
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	859 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	860 keyblob = buf_new(3000);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	861 buf_put_priv_key(keyblob, key, key->type);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	862
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	863 buf_setpos(keyblob, 0);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	864 /* skip the "ssh-rsa" or "ssh-dss" header */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	865 buf_incrpos(keyblob, buf_getint(keyblob));
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	866
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	867 /*
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	868 * Find the sequence of integers to be encoded into the OpenSSH
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	869 * key blob, and also decide on the header line.
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	870 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	871 numbers[0].start = zero; numbers[0].bytes = 1; zero[0] = '\0';
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	872
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	873 #ifdef DROPBEAR_RSA
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	874 if (key->type == DROPBEAR_SIGNKEY_RSA) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	875
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	876 if (key->rsakey->p == NULL \|\| key->rsakey->q == NULL) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	877 fprintf(stderr, "Pre-0.33 Dropbear keys cannot be converted to OpenSSH keys.\n");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	878 goto error;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	879 }
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	880
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	881 /* e */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	882 numbers[2].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	883 numbers[2].start = buf_getptr(keyblob, numbers[2].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	884 buf_incrpos(keyblob, numbers[2].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	885
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	886 /* n */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	887 numbers[1].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	888 numbers[1].start = buf_getptr(keyblob, numbers[1].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	889 buf_incrpos(keyblob, numbers[1].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	890
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	891 /* d */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	892 numbers[3].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	893 numbers[3].start = buf_getptr(keyblob, numbers[3].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	894 buf_incrpos(keyblob, numbers[3].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	895
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	896 /* p */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	897 numbers[4].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	898 numbers[4].start = buf_getptr(keyblob, numbers[4].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	899 buf_incrpos(keyblob, numbers[4].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	900
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	901 /* q */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	902 numbers[5].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	903 numbers[5].start = buf_getptr(keyblob, numbers[5].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	904 buf_incrpos(keyblob, numbers[5].bytes);
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	905
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	906 /* now calculate some extra parameters: */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	907 m_mp_init(&tmpval);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	908 m_mp_init(&dmp1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	909 m_mp_init(&dmq1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	910 m_mp_init(&iqmp);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	911
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	912 /* dmp1 = d mod (p-1) */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	913 if (mp_sub_d(key->rsakey->p, 1, &tmpval) != MP_OKAY) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	914 fprintf(stderr, "Bignum error for p-1\n");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	915 goto error;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	916 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	917 if (mp_mod(key->rsakey->d, &tmpval, &dmp1) != MP_OKAY) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	918 fprintf(stderr, "Bignum error for dmp1\n");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	919 goto error;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	920 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	921
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	922 /* dmq1 = d mod (q-1) */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	923 if (mp_sub_d(key->rsakey->q, 1, &tmpval) != MP_OKAY) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	924 fprintf(stderr, "Bignum error for q-1\n");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	925 goto error;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	926 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	927 if (mp_mod(key->rsakey->d, &tmpval, &dmq1) != MP_OKAY) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	928 fprintf(stderr, "Bignum error for dmq1\n");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	929 goto error;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	930 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	931
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	932 /* iqmp = (q^-1) mod p */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	933 if (mp_invmod(key->rsakey->q, key->rsakey->p, &iqmp) != MP_OKAY) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	934 fprintf(stderr, "Bignum error for iqmp\n");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	935 goto error;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	936 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	937
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	938 extrablob = buf_new(2000);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	939 buf_putmpint(extrablob, &dmp1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	940 buf_putmpint(extrablob, &dmq1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	941 buf_putmpint(extrablob, &iqmp);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	942 buf_setpos(extrablob, 0);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	943 mp_clear(&dmp1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	944 mp_clear(&dmq1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	945 mp_clear(&iqmp);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	946 mp_clear(&tmpval);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	947
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	948 /* dmp1 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	949 numbers[6].bytes = buf_getint(extrablob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	950 numbers[6].start = buf_getptr(extrablob, numbers[6].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	951 buf_incrpos(extrablob, numbers[6].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	952
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	953 /* dmq1 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	954 numbers[7].bytes = buf_getint(extrablob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	955 numbers[7].start = buf_getptr(extrablob, numbers[7].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	956 buf_incrpos(extrablob, numbers[7].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	957
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	958 /* iqmp */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	959 numbers[8].bytes = buf_getint(extrablob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	960 numbers[8].start = buf_getptr(extrablob, numbers[8].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	961 buf_incrpos(extrablob, numbers[8].bytes);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	962
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	963 nnumbers = 9;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	964 header = "-----BEGIN RSA PRIVATE KEY-----\n";
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	965 footer = "-----END RSA PRIVATE KEY-----\n";
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	966 }
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	967 #endif /* DROPBEAR_RSA */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	968
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	969 #ifdef DROPBEAR_DSS
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	970 if (key->type == DROPBEAR_SIGNKEY_DSS) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	971
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	972 /* p */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	973 numbers[1].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	974 numbers[1].start = buf_getptr(keyblob, numbers[1].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	975 buf_incrpos(keyblob, numbers[1].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	976
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	977 /* q */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	978 numbers[2].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	979 numbers[2].start = buf_getptr(keyblob, numbers[2].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	980 buf_incrpos(keyblob, numbers[2].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	981
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	982 /* g */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	983 numbers[3].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	984 numbers[3].start = buf_getptr(keyblob, numbers[3].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	985 buf_incrpos(keyblob, numbers[3].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	986
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	987 /* y */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	988 numbers[4].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	989 numbers[4].start = buf_getptr(keyblob, numbers[4].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	990 buf_incrpos(keyblob, numbers[4].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	991
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	992 /* x */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	993 numbers[5].bytes = buf_getint(keyblob);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	994 numbers[5].start = buf_getptr(keyblob, numbers[5].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	995 buf_incrpos(keyblob, numbers[5].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	996
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	997 nnumbers = 6;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	998 header = "-----BEGIN DSA PRIVATE KEY-----\n";
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	999 footer = "-----END DSA PRIVATE KEY-----\n";
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1000 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1001 #endif /* DROPBEAR_DSS */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1002
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1003 /*
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1004 * Now count up the total size of the ASN.1 encoded integers,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1005 * so as to determine the length of the containing SEQUENCE.
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1006 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1007 len = 0;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1008 for (i = 0; i < nnumbers; i++) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1009 len += ber_write_id_len(NULL, 2, numbers[i].bytes, 0);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1010 len += numbers[i].bytes;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1011 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1012 seqlen = len;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1013 /* Now add on the SEQUENCE header. */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1014 len += ber_write_id_len(NULL, 16, seqlen, ASN1_CONSTRUCTED);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1015 /* Round up to the cipher block size, ensuring we have at least one
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1016 * byte of padding (see below). */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1017 outlen = len;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1018 if (passphrase)
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1019 outlen = (outlen+8) &~ 7;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1020
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1021 /*
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1022 * Now we know how big outblob needs to be. Allocate it.
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1023 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1024 outblob = (unsigned char*)m_malloc(outlen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1025
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1026 /*
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1027 * And write the data into it.
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1028 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1029 pos = 0;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1030 pos += ber_write_id_len(outblob+pos, 16, seqlen, ASN1_CONSTRUCTED);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1031 for (i = 0; i < nnumbers; i++) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1032 pos += ber_write_id_len(outblob+pos, 2, numbers[i].bytes, 0);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1033 memcpy(outblob+pos, numbers[i].start, numbers[i].bytes);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1034 pos += numbers[i].bytes;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1035 }
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	1036 } /* end RSA and DSS handling */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1037
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1294 diff changeset	1038 #if DROPBEAR_ECDSA
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1039 if (key->type == DROPBEAR_SIGNKEY_ECDSA_NISTP256
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1040 \|\| key->type == DROPBEAR_SIGNKEY_ECDSA_NISTP384
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1041 \|\| key->type == DROPBEAR_SIGNKEY_ECDSA_NISTP521) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1042
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1043 /* SEC1 V2 appendix c.4
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1044 ECPrivateKey ::= SEQUENCE {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1045 version INTEGER { ecPrivkeyVer1(1) } (ecPrivkeyVer1),
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1046 privateKey OCTET STRING,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1047 parameters [0] ECDomainParameters {{ SECGCurveNames }} OPTIONAL,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1048 publicKey [1] BIT STRING OPTIONAL
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1049 }
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1050 */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1051 buffer *seq_buf = buf_new(400);
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: 845 diff changeset	1052 ecc_key eck = (ecc_key)signkey_key_ptr(key, key->type);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: 845 diff changeset	1053 const long curve_size = (*eck)->dp->size;
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1054 int curve_oid_len = 0;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1055 const void* curve_oid = NULL;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1056 unsigned long pubkey_size = 2*curve_size+1;
1089 d144a6bece53 Uses k_size as an signed integer Gaël PORTAY <gael.portay@gmail.com> parents: 1045 diff changeset	1057 int k_size;
1038 d3925ed45a85 Fix for old compilers, variable declarations at beginning of functions Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1002 diff changeset	1058 int err = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1059
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1060 /* version. less than 10 bytes */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1061 buf_incrwritepos(seq_buf,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1062 ber_write_id_len(buf_getwriteptr(seq_buf, 10), 2, 1, 0));
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1063 buf_putbyte(seq_buf, 1);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1064
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1065 /* privateKey */
867 d2d624c951ca - Increase buffer size, fixes converting 521bit ECC key Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	1066 k_size = mp_unsigned_bin_size((*eck)->k);
d2d624c951ca - Increase buffer size, fixes converting 521bit ECC key Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	1067 dropbear_assert(k_size <= curve_size);
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1068 buf_incrwritepos(seq_buf,
867 d2d624c951ca - Increase buffer size, fixes converting 521bit ECC key Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	1069 ber_write_id_len(buf_getwriteptr(seq_buf, 10), 4, k_size, 0));
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 1124 diff changeset	1070 mp_to_unsigned_bin((*eck)->k, buf_getwriteptr(seq_buf, k_size));
867 d2d624c951ca - Increase buffer size, fixes converting 521bit ECC key Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	1071 buf_incrwritepos(seq_buf, k_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1072
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1073 /* SECGCurveNames */
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1074 switch (key->type)
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1075 {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1076 case DROPBEAR_SIGNKEY_ECDSA_NISTP256:
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1077 curve_oid_len = sizeof(OID_SEC256R1_BLOB);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1078 curve_oid = OID_SEC256R1_BLOB;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1079 break;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1080 case DROPBEAR_SIGNKEY_ECDSA_NISTP384:
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1081 curve_oid_len = sizeof(OID_SEC384R1_BLOB);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1082 curve_oid = OID_SEC384R1_BLOB;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1083 break;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1084 case DROPBEAR_SIGNKEY_ECDSA_NISTP521:
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1085 curve_oid_len = sizeof(OID_SEC521R1_BLOB);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1086 curve_oid = OID_SEC521R1_BLOB;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1087 break;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1088 default:
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1089 dropbear_exit("Internal error");
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1090 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1091
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1092 buf_incrwritepos(seq_buf,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1093 ber_write_id_len(buf_getwriteptr(seq_buf, 10), 0, 2+curve_oid_len, 0xa0));
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 849 diff changeset	1094 /* object == 6 */
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1095 buf_incrwritepos(seq_buf,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1096 ber_write_id_len(buf_getwriteptr(seq_buf, 10), 6, curve_oid_len, 0));
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1097 buf_putbytes(seq_buf, curve_oid, curve_oid_len);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1098
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1099 buf_incrwritepos(seq_buf,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1100 ber_write_id_len(buf_getwriteptr(seq_buf, 10), 1, 2+1+pubkey_size, 0xa0));
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1101 buf_incrwritepos(seq_buf,
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1102 ber_write_id_len(buf_getwriteptr(seq_buf, 10), 3, 1+pubkey_size, 0));
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1103 buf_putbyte(seq_buf, 0);
1038 d3925ed45a85 Fix for old compilers, variable declarations at beginning of functions Thorsten Horstmann <thorsten.horstmann@web.de> parents: 1002 diff changeset	1104 err = ecc_ansi_x963_export(*eck, buf_getwriteptr(seq_buf, pubkey_size), &pubkey_size);
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1105 if (err != CRYPT_OK) {
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1106 dropbear_exit("ECC error");
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1107 }
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1108 buf_incrwritepos(seq_buf, pubkey_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1109
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1110 buf_setpos(seq_buf, 0);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1111
867 d2d624c951ca - Increase buffer size, fixes converting 521bit ECC key Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	1112 outblob = (unsigned char*)m_malloc(1000);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1113
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1114 pos = 0;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1115 pos += ber_write_id_len(outblob+pos, 16, seq_buf->len, ASN1_CONSTRUCTED);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1116 memcpy(&outblob[pos], seq_buf->data, seq_buf->len);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1117 pos += seq_buf->len;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1118 len = pos;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1119 outlen = len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1120
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1121 buf_burn(seq_buf);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1122 buf_free(seq_buf);
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1123 seq_buf = NULL;
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1124
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1125 header = "-----BEGIN EC PRIVATE KEY-----\n";
d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1126 footer = "-----END EC PRIVATE KEY-----\n";
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1127 }
836 d7d9f1612d51 writing out openssh ecc keys works Matt Johnston <matt@ucc.asn.au> parents: 807 diff changeset	1128 #endif
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1129
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1130 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1131 * Padding on OpenSSH keys is deterministic. The number of
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1132 * padding bytes is always more than zero, and always at most
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1133 * the cipher block length. The value of each padding byte is
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1134 * equal to the number of padding bytes. So a plaintext that's
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1135 * an exact multiple of the block size will be padded with 08
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1136 * 08 08 08 08 08 08 08 (assuming a 64-bit block cipher); a
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1137 * plaintext one byte less than a multiple of the block size
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1138 * will be padded with just 01.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1139 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1140 * This enables the OpenSSL key decryption function to strip
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1141 * off the padding algorithmically and return the unpadded
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1142 * plaintext to the next layer: it looks at the final byte, and
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1143 * then expects to find that many bytes at the end of the data
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1144 * with the same value. Those are all removed and the rest is
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1145 * returned.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1146 */
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1147 dropbear_assert(pos == len);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1148 while (pos < outlen) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1149 outblob[pos++] = outlen - len;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1150 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1151
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1152 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1153 * Encrypt the key.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1154 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1155 if (passphrase) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1156 fprintf(stderr, "Encrypted keys aren't supported currently\n");
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1157 goto error;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1158 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1159
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1160 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1161 * And save it. We'll use Unix line endings just in case it's
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1162 * subsequently transferred in binary mode.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1163 */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1164 if (strlen(filename) == 1 && filename[0] == '-') {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1165 fp = stdout;
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1166 } else {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1167 fp = fopen(filename, "wb"); /* ensure Unix line endings */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1168 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1169 if (!fp) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1170 fprintf(stderr, "Failed opening output file\n");
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1171 goto error;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1172 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1173 fputs(header, fp);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1174 base64_encode_fp(fp, outblob, outlen, 64);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1175 fputs(footer, fp);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1176 fclose(fp);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1177 ret = 1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1178
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1179 error:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1180 if (outblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1181 memset(outblob, 0, outlen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1182 m_free(outblob);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1183 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1184 if (keyblob) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1185 buf_burn(keyblob);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1186 buf_free(keyblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1187 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1188 if (extrablob) {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1189 buf_burn(extrablob);
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1190 buf_free(extrablob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1191 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1192 return ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1193 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1194
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1195 #if 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1196 /* XXX TODO ssh.com stuff isn't going yet */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1197
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1198 /* ----------------------------------------------------------------------
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1199 * Code to read ssh.com private keys.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1200 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1201
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1202 /*
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1203 * The format of the base64 blob is largely ssh2-packet-formatted,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1204 * except that mpints are a bit different: they're more like the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1205 * old ssh1 mpint. You have a 32-bit bit count N, followed by
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1206 * (N+7)/8 bytes of data.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1207 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1208 * So. The blob contains:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1209 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1210 * - uint32 0x3f6ff9eb (magic number)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1211 * - uint32 size (total blob size)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1212 * - string key-type (see below)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1213 * - string cipher-type (tells you if key is encrypted)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1214 * - string encrypted-blob
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1215 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1216 * (The first size field includes the size field itself and the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1217 * magic number before it. All other size fields are ordinary ssh2
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1218 * strings, so the size field indicates how much data is to
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1219 * _follow_.)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1220 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1221 * The encrypted blob, once decrypted, contains a single string
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1222 * which in turn contains the payload. (This allows padding to be
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1223 * added after that string while still making it clear where the
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1224 * real payload ends. Also it probably makes for a reasonable
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1225 * decryption check.)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1226 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1227 * The payload blob, for an RSA key, contains:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1228 * - mpint e
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1229 * - mpint d
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1230 * - mpint n (yes, the public and private stuff is intermixed)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1231 * - mpint u (presumably inverse of p mod q)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1232 * - mpint p (p is the smaller prime)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1233 * - mpint q (q is the larger)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1234 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1235 * For a DSA key, the payload blob contains:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1236 * - uint32 0
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1237 * - mpint p
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1238 * - mpint g
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1239 * - mpint q
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1240 * - mpint y
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1241 * - mpint x
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1242 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1243 * Alternatively, if the parameters are `predefined', that
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1244 * (0,p,g,q) sequence can be replaced by a uint32 1 and a string
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1245 * containing some predefined parameter specification. shudder,
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1246 * but I doubt we'll encounter this in real life.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1247 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1248 * The key type strings are ghastly. The RSA key I looked at had a
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1249 * type string of
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1250 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1251 * `if-modn{sign{rsa-pkcs1-sha1},encrypt{rsa-pkcs1v2-oaep}}'
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1252 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1253 * and the DSA key wasn't much better:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1254 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1255 * `dl-modp{sign{dsa-nist-sha1},dh{plain}}'
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1256 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1257 * It isn't clear that these will always be the same. I think it
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1258 * might be wise just to look at the `if-modn{sign{rsa' and
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1259 * `dl-modp{sign{dsa' prefixes.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1260 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1261 * Finally, the encryption. The cipher-type string appears to be
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1262 * either `none' or `3des-cbc'. Looks as if this is SSH2-style
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1263 * 3des-cbc (i.e. outer cbc rather than inner). The key is created
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1264 * from the passphrase by means of yet another hashing faff:
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1265 *
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1266 * - first 16 bytes are MD5(passphrase)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1267 * - next 16 bytes are MD5(passphrase \|\| first 16 bytes)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1268 * - if there were more, they'd be MD5(passphrase \|\| first 32),
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1269 * and so on.
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1270 */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1271
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1272 #define SSHCOM_MAGIC_NUMBER 0x3f6ff9eb
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1273
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1274 struct sshcom_key {
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1275 char comment[256]; /* allowing any length is overkill */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1276 unsigned char *keyblob;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1277 int keyblob_len, keyblob_size;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1278 };
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1279
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1280 static struct sshcom_key load_sshcom_key(const char filename)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1281 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1282 struct sshcom_key *ret;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1283 FILE *fp;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1284 char buffer[256];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1285 int len;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1286 char errmsg, p;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1287 int headers_done;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1288 char base64_bit[4];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1289 int base64_chars = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1290
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1291 ret = snew(struct sshcom_key);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1292 ret->comment[0] = '\0';
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1293 ret->keyblob = NULL;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1294 ret->keyblob_len = ret->keyblob_size = 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1295
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1296 fp = fopen(filename, "r");
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1297 if (!fp) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1298 errmsg = "Unable to open key file";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1299 goto error;
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1300 }
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1301 if (!fgets(buffer, sizeof(buffer), fp) \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1302 0 != strcmp(buffer, "---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----\n")) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1303 errmsg = "File does not begin with ssh.com key header";
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1304 goto error;
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1305 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1306
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1307 headers_done = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1308 while (1) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1309 if (!fgets(buffer, sizeof(buffer), fp)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1310 errmsg = "Unexpected end of file";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1311 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1312 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1313 if (!strcmp(buffer, "---- END SSH2 ENCRYPTED PRIVATE KEY ----\n"))
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1314 break; /* done */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1315 if ((p = strchr(buffer, ':')) != NULL) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1316 if (headers_done) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1317 errmsg = "Header found in body of key data";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1318 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1319 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1320 *p++ = '\0';
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1321 while (p && isspace((unsigned char)p)) p++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1322 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1323 * Header lines can end in a trailing backslash for
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1324 * continuation.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1325 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1326 while ((len = strlen(p)) > (int)(sizeof(buffer) - (p-buffer) -1) \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1327 p[len-1] != '\n' \|\| p[len-2] == '\\') {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1328 if (len > (int)((p-buffer) + sizeof(buffer)-2)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1329 errmsg = "Header line too long to deal with";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1330 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1331 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1332 if (!fgets(p+len-2, sizeof(buffer)-(p-buffer)-(len-2), fp)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1333 errmsg = "Unexpected end of file";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1334 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1335 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1336 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1337 p[strcspn(p, "\n")] = '\0';
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1338 if (!strcmp(buffer, "Comment")) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1339 /* Strip quotes in comment if present. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1340 if (p[0] == '"' && p[strlen(p)-1] == '"') {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1341 p++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1342 p[strlen(p)-1] = '\0';
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1343 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1344 strncpy(ret->comment, p, sizeof(ret->comment));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1345 ret->comment[sizeof(ret->comment)-1] = '\0';
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1346 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1347 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1348 headers_done = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1349
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1350 p = buffer;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1351 while (isbase64(*p)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1352 base64_bit[base64_chars++] = *p;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1353 if (base64_chars == 4) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1354 unsigned char out[3];
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1355
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1356 base64_chars = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1357
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1358 len = base64_decode_atom(base64_bit, out);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1359
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1360 if (len <= 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1361 errmsg = "Invalid base64 encoding";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1362 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1363 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1364
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1365 if (ret->keyblob_len + len > ret->keyblob_size) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1366 ret->keyblob_size = ret->keyblob_len + len + 256;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1367 ret->keyblob = sresize(ret->keyblob, ret->keyblob_size,
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1368 unsigned char);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1369 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1370
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1371 memcpy(ret->keyblob + ret->keyblob_len, out, len);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1372 ret->keyblob_len += len;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1373 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1374
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1375 p++;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1376 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1377 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1378 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1379
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1380 if (ret->keyblob_len == 0 \|\| !ret->keyblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1381 errmsg = "Key body not present";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1382 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1383 }
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1384
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1385 return ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1386
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1387 error:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1388 if (ret) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1389 if (ret->keyblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1390 memset(ret->keyblob, 0, ret->keyblob_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1391 m_free(ret->keyblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1392 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1393 memset(ret, 0, sizeof(*ret));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1394 m_free(ret);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1395 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1396 return NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1397 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1398
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1399 int sshcom_encrypted(const char filename, char *comment)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1400 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1401 struct sshcom_key *key = load_sshcom_key(filename);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1402 int pos, len, answer;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1403
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1404 *comment = NULL;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1405 if (!key)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1406 return 0;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1407
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1408 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1409 * Check magic number.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1410 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1411 if (GET_32BIT(key->keyblob) != 0x3f6ff9eb)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1412 return 0; /* key is invalid */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1413
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1414 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1415 * Find the cipher-type string.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1416 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1417 answer = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1418 pos = 8;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1419 if (key->keyblob_len < pos+4)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1420 goto done; /* key is far too short */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1421 len = toint(GET_32BIT(key->keyblob + pos));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1422 if (len < 0 \|\| len > key->keyblob_len - pos - 4)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1423 goto done; /* key is far too short */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1424 pos += 4 + len; /* skip key type */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1425 len = toint(GET_32BIT(key->keyblob + pos)); /* find cipher-type length */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1426 if (len < 0 \|\| len > key->keyblob_len - pos - 4)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1427 goto done; /* cipher type string is incomplete */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1428 if (len != 4 \|\| 0 != memcmp(key->keyblob + pos + 4, "none", 4))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1429 answer = 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1430
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1431 done:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1432 *comment = dupstr(key->comment);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1433 memset(key->keyblob, 0, key->keyblob_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1434 m_free(key->keyblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1435 memset(key, 0, sizeof(*key));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1436 m_free(key);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1437 return answer;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1438 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1439
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1440 static int sshcom_read_mpint(void data, int len, struct mpint_pos ret)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1441 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1442 unsigned bits, bytes;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1443 unsigned char d = (unsigned char ) data;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1444
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1445 if (len < 4)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1446 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1447 bits = GET_32BIT(d);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1448
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1449 bytes = (bits + 7) / 8;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1450 if (len < 4+bytes)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1451 goto error;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1452
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1453 ret->start = d + 4;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1454 ret->bytes = bytes;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1455 return bytes+4;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1456
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1457 error:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1458 ret->start = NULL;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1459 ret->bytes = -1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1460 return len; /* ensure further calls fail as well */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1461 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1462
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1463 static int sshcom_put_mpint(void target, void data, int len)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1464 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1465 unsigned char d = (unsigned char )target;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1466 unsigned char i = (unsigned char )data;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1467 int bits = len * 8 - 1;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1468
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1469 while (bits > 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1470 if (*i & (1 << (bits & 7)))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1471 break;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1472 if (!(bits-- & 7))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1473 i++, len--;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1474 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1475
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1476 PUT_32BIT(d, bits+1);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1477 memcpy(d+4, i, len);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1478 return len+4;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1479 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1480
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1481 sign_key sshcom_read(const char filename, char *passphrase)
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1482 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1483 struct sshcom_key *key = load_sshcom_key(filename);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1484 char *errmsg;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1485 int pos, len;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1486 const char prefix_rsa[] = "if-modn{sign{rsa";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1487 const char prefix_dsa[] = "dl-modp{sign{dsa";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1488 enum { RSA, DSA } type;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1489 int encrypted;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1490 char *ciphertext;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1491 int cipherlen;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1492 struct ssh2_userkey ret = NULL, retkey;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1493 const struct ssh_signkey *alg;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1494 unsigned char *blob = NULL;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1495 int blobsize = 0, publen, privlen;
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1496
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1497 if (!key)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1498 return NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1499
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1500 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1501 * Check magic number.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1502 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1503 if (GET_32BIT(key->keyblob) != SSHCOM_MAGIC_NUMBER) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1504 errmsg = "Key does not begin with magic number";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1505 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1506 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1507
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1508 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1509 * Determine the key type.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1510 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1511 pos = 8;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1512 if (key->keyblob_len < pos+4 \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1513 (len = GET_32BIT(key->keyblob + pos)) > key->keyblob_len - pos - 4) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1514 errmsg = "Key blob does not contain a key type string";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1515 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1516 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1517 if (len > sizeof(prefix_rsa) - 1 &&
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1518 !memcmp(key->keyblob+pos+4, prefix_rsa, sizeof(prefix_rsa) - 1)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1519 type = RSA;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1520 } else if (len > sizeof(prefix_dsa) - 1 &&
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1521 !memcmp(key->keyblob+pos+4, prefix_dsa, sizeof(prefix_dsa) - 1)) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1522 type = DSA;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1523 } else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1524 errmsg = "Key is of unknown type";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1525 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1526 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1527 pos += 4+len;
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1528
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1529 /*
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1530 * Determine the cipher type.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1531 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1532 if (key->keyblob_len < pos+4 \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1533 (len = GET_32BIT(key->keyblob + pos)) > key->keyblob_len - pos - 4) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1534 errmsg = "Key blob does not contain a cipher type string";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1535 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1536 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1537 if (len == 4 && !memcmp(key->keyblob+pos+4, "none", 4))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1538 encrypted = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1539 else if (len == 8 && !memcmp(key->keyblob+pos+4, "3des-cbc", 8))
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1540 encrypted = 1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1541 else {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1542 errmsg = "Key encryption is of unknown type";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1543 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1544 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1545 pos += 4+len;
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1546
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1547 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1548 * Get hold of the encrypted part of the key.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1549 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1550 if (key->keyblob_len < pos+4 \|\|
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1551 (len = GET_32BIT(key->keyblob + pos)) > key->keyblob_len - pos - 4) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1552 errmsg = "Key blob does not contain actual key data";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1553 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1554 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1555 ciphertext = (char *)key->keyblob + pos + 4;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1556 cipherlen = len;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1557 if (cipherlen == 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1558 errmsg = "Length of key data is zero";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1559 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1560 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1561
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1562 /*
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1563 * Decrypt it if necessary.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1564 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1565 if (encrypted) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1566 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1567 * Derive encryption key from passphrase and iv/salt:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1568 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1569 * - let block A equal MD5(passphrase)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1570 * - let block B equal MD5(passphrase \|\| A)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1571 * - block C would be MD5(passphrase \|\| A \|\| B) and so on
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1572 * - encryption key is the first N bytes of A \|\| B
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1573 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1574 struct MD5Context md5c;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1575 unsigned char keybuf[32], iv[8];
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1576
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1577 if (cipherlen % 8 != 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1578 errmsg = "Encrypted part of key is not a multiple of cipher block"
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1579 " size";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1580 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1581 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1582
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1583 MD5Init(&md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1584 MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1585 MD5Final(keybuf, &md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1586
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1587 MD5Init(&md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1588 MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1589 MD5Update(&md5c, keybuf, 16);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1590 MD5Final(keybuf+16, &md5c);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1591
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1592 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1593 * Now decrypt the key blob.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1594 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1595 memset(iv, 0, sizeof(iv));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1596 des3_decrypt_pubkey_ossh(keybuf, iv, (unsigned char *)ciphertext,
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1597 cipherlen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1598
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1599 memset(&md5c, 0, sizeof(md5c));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1600 memset(keybuf, 0, sizeof(keybuf));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1601
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1602 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1603 * Hereafter we return WRONG_PASSPHRASE for any parsing
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1604 * error. (But only if we've just tried to decrypt it!
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1605 * Returning WRONG_PASSPHRASE for an unencrypted key is
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1606 * automatic doom.)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1607 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1608 if (encrypted)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1609 ret = SSH2_WRONG_PASSPHRASE;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1610 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1611
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1612 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1613 * Strip away the containing string to get to the real meat.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1614 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1615 len = toint(GET_32BIT(ciphertext));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1616 if (len < 0 \|\| len > cipherlen-4) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1617 errmsg = "containing string was ill-formed";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1618 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1619 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1620 ciphertext += 4;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1621 cipherlen = len;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1622
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1623 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1624 * Now we break down into RSA versus DSA. In either case we'll
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1625 * construct public and private blobs in our own format, and
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1626 * end up feeding them to alg->createkey().
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1627 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1628 blobsize = cipherlen + 256;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1629 blob = snewn(blobsize, unsigned char);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1630 privlen = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1631 if (type == RSA) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1632 struct mpint_pos n, e, d, u, p, q;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1633 int pos = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1634 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &e);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1635 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &d);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1636 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &n);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1637 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &u);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1638 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &p);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1639 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &q);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1640 if (!q.start) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1641 errmsg = "key data did not contain six integers";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1642 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1643 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1644
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1645 alg = &ssh_rsa;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1646 pos = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1647 pos += put_string(blob+pos, "ssh-rsa", 7);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1648 pos += put_mp(blob+pos, e.start, e.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1649 pos += put_mp(blob+pos, n.start, n.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1650 publen = pos;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1651 pos += put_string(blob+pos, d.start, d.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1652 pos += put_mp(blob+pos, q.start, q.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1653 pos += put_mp(blob+pos, p.start, p.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1654 pos += put_mp(blob+pos, u.start, u.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1655 privlen = pos - publen;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1656 } else if (type == DSA) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1657 struct mpint_pos p, q, g, x, y;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1658 int pos = 4;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1659 if (GET_32BIT(ciphertext) != 0) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1660 errmsg = "predefined DSA parameters not supported";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1661 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1662 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1663 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &p);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1664 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &g);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1665 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &q);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1666 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &y);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1667 pos += sshcom_read_mpint(ciphertext+pos, cipherlen-pos, &x);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1668 if (!x.start) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1669 errmsg = "key data did not contain five integers";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1670 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1671 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1672
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1673 alg = &ssh_dss;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1674 pos = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1675 pos += put_string(blob+pos, "ssh-dss", 7);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1676 pos += put_mp(blob+pos, p.start, p.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1677 pos += put_mp(blob+pos, q.start, q.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1678 pos += put_mp(blob+pos, g.start, g.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1679 pos += put_mp(blob+pos, y.start, y.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1680 publen = pos;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1681 pos += put_mp(blob+pos, x.start, x.bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1682 privlen = pos - publen;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1683 } else
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1684 return NULL;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1685
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1686 dropbear_assert(privlen > 0); /* should have bombed by now if not */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1687
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1688 retkey = snew(struct ssh2_userkey);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1689 retkey->alg = alg;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1690 retkey->data = alg->createkey(blob, publen, blob+publen, privlen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1691 if (!retkey->data) {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1692 m_free(retkey);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1693 errmsg = "unable to create key data structure";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1694 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1695 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1696 retkey->comment = dupstr(key->comment);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1697
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1698 errmsg = NULL; /* no error */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1699 ret = retkey;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1700
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1701 error:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1702 if (blob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1703 memset(blob, 0, blobsize);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1704 m_free(blob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1705 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1706 memset(key->keyblob, 0, key->keyblob_size);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1707 m_free(key->keyblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1708 memset(key, 0, sizeof(*key));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1709 m_free(key);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1710 return ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1711 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1712
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1713 int sshcom_write(const char filename, sign_key key,
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1714 char *passphrase)
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1715 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1716 unsigned char pubblob, privblob;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1717 int publen, privlen;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1718 unsigned char *outblob;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1719 int outlen;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1720 struct mpint_pos numbers[6];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1721 int nnumbers, initial_zero, pos, lenpos, i;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1722 char *type;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1723 char *ciphertext;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1724 int cipherlen;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1725 int ret = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1726 FILE *fp;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1727
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1728 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1729 * Fetch the key blobs.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1730 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1731 pubblob = key->alg->public_blob(key->data, &publen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1732 privblob = key->alg->private_blob(key->data, &privlen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1733 outblob = NULL;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1734
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1735 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1736 * Find the sequence of integers to be encoded into the OpenSSH
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1737 * key blob, and also decide on the header line.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1738 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1739 if (key->alg == &ssh_rsa) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1740 int pos;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1741 struct mpint_pos n, e, d, p, q, iqmp;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1742
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1743 pos = 4 + GET_32BIT(pubblob);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1744 pos += ssh2_read_mpint(pubblob+pos, publen-pos, &e);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1745 pos += ssh2_read_mpint(pubblob+pos, publen-pos, &n);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1746 pos = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1747 pos += ssh2_read_mpint(privblob+pos, privlen-pos, &d);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1748 pos += ssh2_read_mpint(privblob+pos, privlen-pos, &p);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1749 pos += ssh2_read_mpint(privblob+pos, privlen-pos, &q);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1750 pos += ssh2_read_mpint(privblob+pos, privlen-pos, &iqmp);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1751
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1752 dropbear_assert(e.start && iqmp.start); /* can't go wrong */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1753
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1754 numbers[0] = e;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1755 numbers[1] = d;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1756 numbers[2] = n;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1757 numbers[3] = iqmp;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1758 numbers[4] = q;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1759 numbers[5] = p;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1760
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1761 nnumbers = 6;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1762 initial_zero = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1763 type = "if-modn{sign{rsa-pkcs1-sha1},encrypt{rsa-pkcs1v2-oaep}}";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1764 } else if (key->alg == &ssh_dss) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1765 int pos;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1766 struct mpint_pos p, q, g, y, x;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1767
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1768 pos = 4 + GET_32BIT(pubblob);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1769 pos += ssh2_read_mpint(pubblob+pos, publen-pos, &p);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1770 pos += ssh2_read_mpint(pubblob+pos, publen-pos, &q);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1771 pos += ssh2_read_mpint(pubblob+pos, publen-pos, &g);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1772 pos += ssh2_read_mpint(pubblob+pos, publen-pos, &y);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1773 pos = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1774 pos += ssh2_read_mpint(privblob+pos, privlen-pos, &x);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1775
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1776 dropbear_assert(y.start && x.start); /* can't go wrong */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1777
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1778 numbers[0] = p;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1779 numbers[1] = g;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1780 numbers[2] = q;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1781 numbers[3] = y;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1782 numbers[4] = x;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1783
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1784 nnumbers = 5;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1785 initial_zero = 1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1786 type = "dl-modp{sign{dsa-nist-sha1},dh{plain}}";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1787 } else {
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1788 dropbear_assert(0); /* zoinks! */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1789 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1790
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1791 /*
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1792 * Total size of key blob will be somewhere under 512 plus
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1793 * combined length of integers. We'll calculate the more
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1794 * precise size as we construct the blob.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1795 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1796 outlen = 512;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1797 for (i = 0; i < nnumbers; i++)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1798 outlen += 4 + numbers[i].bytes;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1799 outblob = snewn(outlen, unsigned char);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1800
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1801 /*
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1802 * Create the unencrypted key blob.
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1803 */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1804 pos = 0;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1805 PUT_32BIT(outblob+pos, SSHCOM_MAGIC_NUMBER); pos += 4;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1806 pos += 4; /* length field, fill in later */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1807 pos += put_string(outblob+pos, type, strlen(type));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1808 {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1809 char *ciphertype = passphrase ? "3des-cbc" : "none";
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1810 pos += put_string(outblob+pos, ciphertype, strlen(ciphertype));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1811 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1812 lenpos = pos; /* remember this position */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1813 pos += 4; /* encrypted-blob size */
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1814 pos += 4; /* encrypted-payload size */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1815 if (initial_zero) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1816 PUT_32BIT(outblob+pos, 0);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1817 pos += 4;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1818 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1819 for (i = 0; i < nnumbers; i++)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1820 pos += sshcom_put_mpint(outblob+pos,
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1821 numbers[i].start, numbers[i].bytes);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1822 /* Now wrap up the encrypted payload. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1823 PUT_32BIT(outblob+lenpos+4, pos - (lenpos+8));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1824 /* Pad encrypted blob to a multiple of cipher block size. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1825 if (passphrase) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1826 int padding = -(pos - (lenpos+4)) & 7;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1827 while (padding--)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1828 outblob[pos++] = random_byte();
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1829 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1830 ciphertext = (char *)outblob+lenpos+4;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1831 cipherlen = pos - (lenpos+4);
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1832 dropbear_assert(!passphrase \|\| cipherlen % 8 == 0);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1833 /* Wrap up the encrypted blob string. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1834 PUT_32BIT(outblob+lenpos, cipherlen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1835 /* And finally fill in the total length field. */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1836 PUT_32BIT(outblob+4, pos);
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1837
241 c5d3ef11155f * use own assertions which should get logged properly Matt Johnston <matt@ucc.asn.au> parents: 87 diff changeset	1838 dropbear_assert(pos < outlen);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1839
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1840 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1841 * Encrypt the key.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1842 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1843 if (passphrase) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1844 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1845 * Derive encryption key from passphrase and iv/salt:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1846 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1847 * - let block A equal MD5(passphrase)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1848 * - let block B equal MD5(passphrase \|\| A)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1849 * - block C would be MD5(passphrase \|\| A \|\| B) and so on
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1850 * - encryption key is the first N bytes of A \|\| B
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1851 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1852 struct MD5Context md5c;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1853 unsigned char keybuf[32], iv[8];
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1854
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1855 MD5Init(&md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1856 MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1857 MD5Final(keybuf, &md5c);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1858
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1859 MD5Init(&md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1860 MD5Update(&md5c, (unsigned char *)passphrase, strlen(passphrase));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1861 MD5Update(&md5c, keybuf, 16);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1862 MD5Final(keybuf+16, &md5c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1863
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1864 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1865 * Now decrypt the key blob.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1866 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1867 memset(iv, 0, sizeof(iv));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1868 des3_encrypt_pubkey_ossh(keybuf, iv, (unsigned char *)ciphertext,
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1869 cipherlen);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1870
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1871 memset(&md5c, 0, sizeof(md5c));
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1872 memset(keybuf, 0, sizeof(keybuf));
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1873 }
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1874
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1875 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1876 * And save it. We'll use Unix line endings just in case it's
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1877 * subsequently transferred in binary mode.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1878 */
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1879 fp = fopen(filename, "wb"); /* ensure Unix line endings */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1880 if (!fp)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1881 goto error;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1882 fputs("---- BEGIN SSH2 ENCRYPTED PRIVATE KEY ----\n", fp);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1883 fprintf(fp, "Comment: \"");
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1884 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1885 * Comment header is broken with backslash-newline if it goes
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1886 * over 70 chars. Although it's surrounded by quotes, it
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1887 * _doesn't_ escape backslashes or quotes within the string.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1888 * Don't ask me, I didn't design it.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1889 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1890 {
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1891 int slen = 60; /* starts at 60 due to "Comment: " */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1892 char *c = key->comment;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1893 while ((int)strlen(c) > slen) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1894 fprintf(fp, "%.*s\\\n", slen, c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1895 c += slen;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1896 slen = 70; /* allow 70 chars on subsequent lines */
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1897 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1898 fprintf(fp, "%s\"\n", c);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1899 }
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1900 base64_encode_fp(fp, outblob, pos, 70);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1901 fputs("---- END SSH2 ENCRYPTED PRIVATE KEY ----\n", fp);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1902 fclose(fp);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1903 ret = 1;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1904
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1905 error:
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1906 if (outblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1907 memset(outblob, 0, outlen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1908 m_free(outblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1909 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1910 if (privblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1911 memset(privblob, 0, privlen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1912 m_free(privblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1913 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1914 if (pubblob) {
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1915 memset(pubblob, 0, publen);
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1916 m_free(pubblob);
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1917 }
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1918 return ret;
4 fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1919 }
fe6bca95afa7 Makefile.in contains updated files required Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1920 #endif /* ssh.com stuff disabled */
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1921
34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1922 /* From PuTTY misc.c */
34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1923 static int toint(unsigned u)
34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1924 {
1308 8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1925 /*
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1926 * Convert an unsigned to an int, without running into the
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1927 * undefined behaviour which happens by the strict C standard if
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1928 * the value overflows. You'd hope that sensible compilers would
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1929 * do the sensible thing in response to a cast, but actually I
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1930 * don't trust modern compilers not to do silly things like
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1931 * assuming that _obviously_ you wouldn't have caused an overflow
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1932 * and so they can elide an 'if (i < 0)' test immediately after
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1933 * the cast.
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1934 *
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1935 * Sensible compilers ought of course to optimise this entire
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1936 * function into 'just return the input value'!
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1937 */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1938 if (u <= (unsigned)INT_MAX)
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1939 return (int)u;
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1940 else if (u >= (unsigned)INT_MIN) /* wrap in cast _to_ unsigned is OK */
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1941 return INT_MIN + (int)(u - (unsigned)INT_MIN);
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1942 else
8678e2cc1e53 make indenting consistent Matt Johnston <matt@ucc.asn.au> parents: 1307 diff changeset	1943 return INT_MIN; /* fallback; should never occur on binary machines */
1306 34e6127ef02e merge fixes from PuTTY import.c Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	1944 }

Mercurial > dropbear

annotate keyimport.c @ 1319:21156be2bb26