dropbear: gensignkey.c annotate

annotate gensignkey.c @ 1505:55120acb9994

Add Spectre v2 mitigations for GCC (#54)

author	Loganaden Velvindron <logan@hackers.mu>
date	Fri, 16 Feb 2018 19:35:32 +0400
parents	4f8eb331174f
children	7402218141d4

rev	line source
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 #include "includes.h"
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 #include "dbutil.h"
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 #include "buffer.h"
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 #include "ecdsa.h"
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 #include "genrsa.h"
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 #include "gendss.h"
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 #include "signkey.h"
858 220f55d540ae rename random.h to dbrandom.h since some OSes have a system random.h Matt Johnston <matt@ucc.asn.au> parents: 857 diff changeset	8 #include "dbrandom.h"
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9
857 c19acba28590 use oldstyle comments Matt Johnston <matt@ucc.asn.au> parents: 855 diff changeset	10 /* Returns DROPBEAR_SUCCESS or DROPBEAR_FAILURE */
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 static int buf_writefile(buffer * buf, const char * filename) {
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 int ret = DROPBEAR_FAILURE;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 int fd = -1;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	15 fd = open(filename, O_RDWR \| O_CREAT \| O_EXCL, S_IRUSR \| S_IWUSR);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	16 if (fd < 0) {
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17 dropbear_log(LOG_ERR, "Couldn't create new file %s: %s",
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 filename, strerror(errno));
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	19 goto out;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	20 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	22 /* write the file now */
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23 while (buf->pos != buf->len) {
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	24 int len = write(fd, buf_getptr(buf, buf->len - buf->pos),
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	25 buf->len - buf->pos);
888 6e6ae84d3dba Fix check for EINTR Matt Johnston <matt@ucc.asn.au> parents: 858 diff changeset	26 if (len == -1 && errno == EINTR) {
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 continue;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	29 if (len <= 0) {
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	30 dropbear_log(LOG_ERR, "Failed writing file %s: %s",
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	31 filename, strerror(errno));
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 goto out;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	34 buf_incrpos(buf, len);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	35 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37 ret = DROPBEAR_SUCCESS;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	39 out:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	40 if (fd >= 0) {
983 2b62f26cf808 Open directories O_RDONLY for fsync, add debugging if it fails Matt Johnston <matt@ucc.asn.au> parents: 982 diff changeset	41 if (fsync(fd) != 0) {
2b62f26cf808 Open directories O_RDONLY for fsync, add debugging if it fails Matt Johnston <matt@ucc.asn.au> parents: 982 diff changeset	42 dropbear_log(LOG_ERR, "fsync of %s failed: %s", filename, strerror(errno));
2b62f26cf808 Open directories O_RDONLY for fsync, add debugging if it fails Matt Johnston <matt@ucc.asn.au> parents: 982 diff changeset	43 }
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 m_close(fd);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 return ret;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 /* returns 0 on failure */
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50 static int get_default_bits(enum signkey_type keytype)
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 {
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	52 switch (keytype) {
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	53 #if DROPBEAR_RSA
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	54 case DROPBEAR_SIGNKEY_RSA:
1438 4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	55 return DROPBEAR_DEFAULT_RSA_SIZE;
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	57 #if DROPBEAR_DSS
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	58 case DROPBEAR_SIGNKEY_DSS:
1438 4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	59 /* DSS for SSH only defines 1024 bits */
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	60 return 1024;
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	62 #if DROPBEAR_ECDSA
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	63 case DROPBEAR_SIGNKEY_ECDSA_KEYGEN:
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	64 return ECDSA_DEFAULT_SIZE;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	65 case DROPBEAR_SIGNKEY_ECDSA_NISTP521:
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	66 return 521;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	67 case DROPBEAR_SIGNKEY_ECDSA_NISTP384:
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	68 return 384;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	69 case DROPBEAR_SIGNKEY_ECDSA_NISTP256:
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	70 return 256;
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71 #endif
1250 2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	72 default:
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	73 return 0;
2bb4c662d1c2 more hard tab Francois Perrad <francois.perrad@gadz.org> parents: 983 diff changeset	74 }
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	76
1438 4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	77 int signkey_generate_get_bits(enum signkey_type keytype, int bits) {
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	78 if (bits == 0)
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	79 {
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	80 bits = get_default_bits(keytype);
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	81 }
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	82 return bits;
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	83 }
4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	84
1329 185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	85 /* if skip_exist is set it will silently return if the key file exists */
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	86 int signkey_generate(enum signkey_type keytype, int bits, const char* filename, int skip_exist)
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	87 {
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 sign_key * key = NULL;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 buffer *buf = NULL;
1329 185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	90 char *fn_temp = NULL;
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	91 int ret = DROPBEAR_FAILURE;
1438 4f8eb331174f add configuration option for default RSA size. Matt Johnston <matt@ucc.asn.au> parents: 1343 diff changeset	92 bits = signkey_generate_get_bits(keytype, bits);
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 /* now we can generate the key */
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	95 key = new_sign_key();
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	96
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	97 seedrandom();
7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	98
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 switch(keytype) {
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	100 #if DROPBEAR_RSA
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 case DROPBEAR_SIGNKEY_RSA:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 key->rsakey = gen_rsa_priv_key(bits);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103 break;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	105 #if DROPBEAR_DSS
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	106 case DROPBEAR_SIGNKEY_DSS:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 key->dsskey = gen_dss_priv_key(bits);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 break;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 #endif
1295 750ec4ec4cbe Convert #ifdef to #if, other build changes Matt Johnston <matt@ucc.asn.au> parents: 1250 diff changeset	110 #if DROPBEAR_ECDSA
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	111 case DROPBEAR_SIGNKEY_ECDSA_KEYGEN:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112 case DROPBEAR_SIGNKEY_ECDSA_NISTP521:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	113 case DROPBEAR_SIGNKEY_ECDSA_NISTP384:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 case DROPBEAR_SIGNKEY_ECDSA_NISTP256:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 {
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	116 ecc_key *ecckey = gen_ecdsa_priv_key(bits);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117 keytype = ecdsa_signkey_type(ecckey);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118 *signkey_key_ptr(key, keytype) = ecckey;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 break;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 #endif
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 default:
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123 dropbear_exit("Internal error");
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 }
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125
852 7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	126 seedrandom();
7540c0822374 Various cleanups and fixes for warnings Matt Johnston <matt@ucc.asn.au> parents: 847 diff changeset	127
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	128 buf = buf_new(MAX_PRIVKEY_SIZE);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	129
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	130 buf_put_priv_key(buf, key, keytype);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	131 sign_key_free(key);
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	132 key = NULL;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	133 buf_setpos(buf, 0);
1329 185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	134
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	135 fn_temp = m_malloc(strlen(filename) + 30);
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	136 snprintf(fn_temp, strlen(filename)+30, "%s.tmp%d", filename, getpid());
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	137 ret = buf_writefile(buf, fn_temp);
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	138
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	139 if (ret == DROPBEAR_FAILURE) {
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	140 goto out;
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	141 }
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	142
1329 185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	143 if (link(fn_temp, filename) < 0) {
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	144 /* If generating keys on connection (skipexist) it's OK to get EEXIST
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	145 - we probably just lost a race with another connection to generate the key */
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	146 if (!(skip_exist && errno == EEXIST)) {
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	147 dropbear_log(LOG_ERR, "Failed moving key file to %s: %s", filename,
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	148 strerror(errno));
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	149 /* XXX fallback to non-atomic copy for some filesystems? */
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	150 ret = DROPBEAR_FAILURE;
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	151 goto out;
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	152 }
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	153 }
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	154
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	155 out:
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	156 if (buf) {
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	157 buf_burn(buf);
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	158 buf_free(buf);
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	159 }
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	160
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	161 if (fn_temp) {
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	162 unlink(fn_temp);
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	163 m_free(fn_temp);
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	164 }
185c14fa504d Use atomic key generation in all cases Matt Johnston <matt@ucc.asn.au> parents: 1295 diff changeset	165
846 b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	166 return ret;
b298bb438625 refactor key generation, make it generate as required. Matt Johnston <matt@ucc.asn.au> parents: diff changeset	167 }

Mercurial > dropbear

annotate gensignkey.c @ 1505:55120acb9994