dropbear: libtomcrypt/src/prngs/fortuna.c annotate

annotate libtomcrypt/src/prngs/fortuna.c @ 1749:32307118bc26

Add ubsan fuzz run to Travis CI too

author	Matt Johnston <matt@ucc.asn.au>
date	Mon, 19 Oct 2020 23:38:11 +0800
parents	e9dba7abd939
children

rev	line source
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	1 /* LibTomCrypt, modular cryptographic library -- Tom St Denis
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	2 *
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	3 * LibTomCrypt is a library that provides various cryptographic
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	4 * algorithms in a highly modular and flexible manner.
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	5 *
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	6 * The library is free for all purposes without any express
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	7 * guarantee it works.
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	8 */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	9 #include "tomcrypt.h"
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	10
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	11 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	12 @file fortuna.c
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	13 Fortuna PRNG, Tom St Denis
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	14 */
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	15
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	16 /* Implementation of Fortuna by Tom St Denis
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	17
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	18 We deviate slightly here for reasons of simplicity [and to fit in the API]. First all "sources"
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	19 in the AddEntropy function are fixed to 0. Second since no reliable timer is provided
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	20 we reseed automatically when len(pool0) >= 64 or every LTC_FORTUNA_WD calls to the read function */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	21
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	22 #ifdef LTC_FORTUNA
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	23
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	24 /* requries LTC_SHA256 and AES */
f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	25 #if !(defined(LTC_RIJNDAEL) && defined(LTC_SHA256))
f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	26 #error LTC_FORTUNA requires LTC_SHA256 and LTC_RIJNDAEL (AES)
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	27 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	28
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	29 #ifndef LTC_FORTUNA_POOLS
f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	30 #warning LTC_FORTUNA_POOLS was not previously defined (old headers?)
f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	31 #define LTC_FORTUNA_POOLS 32
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	32 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	33
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	34 #if LTC_FORTUNA_POOLS < 4 \|\| LTC_FORTUNA_POOLS > 32
f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	35 #error LTC_FORTUNA_POOLS must be in [4..32]
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	36 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	37
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	38 const struct ltc_prng_descriptor fortuna_desc = {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	39 "fortuna",
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	40 (32 * LTC_FORTUNA_POOLS), /* default: 1024 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	41 &fortuna_start,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	42 &fortuna_add_entropy,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	43 &fortuna_ready,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	44 &fortuna_read,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	45 &fortuna_done,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	46 &fortuna_export,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	47 &fortuna_import,
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	48 &fortuna_test
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	49 };
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	50
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	51 /* update the IV */
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	52 static void _fortuna_update_iv(prng_state *prng)
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	53 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	54 int x;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	55 unsigned char *IV;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	56 /* update IV */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	57 IV = prng->fortuna.IV;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	58 for (x = 0; x < 16; x++) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	59 IV[x] = (IV[x] + 1) & 255;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	60 if (IV[x] != 0) break;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	61 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	62 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	63
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	64 /* reseed the PRNG */
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	65 static int _fortuna_reseed(prng_state *prng)
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	66 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	67 unsigned char tmp[MAXBLOCKSIZE];
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	68 hash_state md;
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	69 ulong64 reset_cnt;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	70 int err, x;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	71
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	72
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	73 /* new K == LTC_SHA256(K \|\| s) where s == LTC_SHA256(P0) \|\| LTC_SHA256(P1) ... */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	74 sha256_init(&md);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	75 if ((err = sha256_process(&md, prng->fortuna.K, 32)) != CRYPT_OK) {
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	76 sha256_done(&md, tmp);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	77 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	78 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	79
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	80 reset_cnt = prng->fortuna.reset_cnt + 1;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	81
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	82 for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	83 if (x == 0 \|\| ((reset_cnt >> (x-1)) & 1) == 0) {
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	84 /* terminate this hash */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	85 if ((err = sha256_done(&prng->fortuna.pool[x], tmp)) != CRYPT_OK) {
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	86 sha256_done(&md, tmp);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	87 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	88 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	89 /* add it to the string */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	90 if ((err = sha256_process(&md, tmp, 32)) != CRYPT_OK) {
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	91 sha256_done(&md, tmp);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	92 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	93 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	94 /* reset this pool */
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	95 if ((err = sha256_init(&prng->fortuna.pool[x])) != CRYPT_OK) {
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	96 sha256_done(&md, tmp);
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	97 return err;
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	98 }
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	99 } else {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	100 break;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	101 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	102 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	103
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	104 /* finish key */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	105 if ((err = sha256_done(&md, prng->fortuna.K)) != CRYPT_OK) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	106 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	107 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	108 if ((err = rijndael_setup(prng->fortuna.K, 32, 0, &prng->fortuna.skey)) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	109 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	110 }
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	111 _fortuna_update_iv(prng);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	112
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	113 /* reset/update internals */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	114 prng->fortuna.pool0_len = 0;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	115 prng->fortuna.wd = 0;
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	116 prng->fortuna.reset_cnt = reset_cnt;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	117
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	118
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	119 #ifdef LTC_CLEAN_STACK
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	120 zeromem(&md, sizeof(md));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	121 zeromem(tmp, sizeof(tmp));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	122 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	123
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	124 return CRYPT_OK;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	125 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	126
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	127 /**
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	128 "Update Seed File"-compliant update of K
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	129
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	130 @param in The PRNG state
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	131 @param inlen Size of the state
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	132 @param prng The PRNG to import
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	133 @return CRYPT_OK if successful
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	134 */
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	135 static int _fortuna_update_seed(const unsigned char in, unsigned long inlen, prng_state prng)
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	136 {
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	137 int err;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	138 unsigned char tmp[MAXBLOCKSIZE];
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	139 hash_state md;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	140
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	141 LTC_MUTEX_LOCK(&prng->lock);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	142 /* new K = LTC_SHA256(K \|\| in) */
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	143 sha256_init(&md);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	144 if ((err = sha256_process(&md, prng->fortuna.K, 32)) != CRYPT_OK) {
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	145 sha256_done(&md, tmp);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	146 goto LBL_UNLOCK;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	147 }
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	148 if ((err = sha256_process(&md, in, inlen)) != CRYPT_OK) {
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	149 sha256_done(&md, tmp);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	150 goto LBL_UNLOCK;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	151 }
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	152 /* finish key */
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	153 if ((err = sha256_done(&md, prng->fortuna.K)) != CRYPT_OK) {
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	154 goto LBL_UNLOCK;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	155 }
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	156 _fortuna_update_iv(prng);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	157
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	158 LBL_UNLOCK:
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	159 LTC_MUTEX_UNLOCK(&prng->lock);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	160 #ifdef LTC_CLEAN_STACK
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	161 zeromem(&md, sizeof(md));
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	162 #endif
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	163
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	164 return err;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	165 }
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	166
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	167 /**
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	168 Start the PRNG
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	169 @param prng [out] The PRNG state to initialize
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	170 @return CRYPT_OK if successful
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	171 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	172 int fortuna_start(prng_state *prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	173 {
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	174 int err, x, y;
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	175 unsigned char tmp[MAXBLOCKSIZE];
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	176
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	177 LTC_ARGCHK(prng != NULL);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	178 prng->ready = 0;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	179
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	180 /* initialize the pools */
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	181 for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	182 if ((err = sha256_init(&prng->fortuna.pool[x])) != CRYPT_OK) {
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	183 for (y = 0; y < x; y++) {
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	184 sha256_done(&prng->fortuna.pool[y], tmp);
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	185 }
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	186 return err;
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	187 }
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	188 }
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	189 prng->fortuna.pool_idx = prng->fortuna.pool0_len = prng->fortuna.wd = 0;
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	190 prng->fortuna.reset_cnt = 0;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	191
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	192 /* reset bufs */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	193 zeromem(prng->fortuna.K, 32);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	194 if ((err = rijndael_setup(prng->fortuna.K, 32, 0, &prng->fortuna.skey)) != CRYPT_OK) {
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	195 for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	196 sha256_done(&prng->fortuna.pool[x], tmp);
0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	197 }
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	198 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	199 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	200 zeromem(prng->fortuna.IV, 16);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	201
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	202 LTC_MUTEX_INIT(&prng->lock)
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	203
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	204 return CRYPT_OK;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	205 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	206
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	207 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	208 Add entropy to the PRNG state
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	209 @param in The data to add
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	210 @param inlen Length of the data to add
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	211 @param prng PRNG state to update
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	212 @return CRYPT_OK if successful
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	213 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	214 int fortuna_add_entropy(const unsigned char in, unsigned long inlen, prng_state prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	215 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	216 unsigned char tmp[2];
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	217 int err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	218
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	219 LTC_ARGCHK(prng != NULL);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	220 LTC_ARGCHK(in != NULL);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	221 LTC_ARGCHK(inlen > 0);
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	222
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	223 /* ensure inlen <= 32 */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	224 if (inlen > 32) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	225 inlen = 32;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	226 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	227
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	228 /* add s \|\| length(in) \|\| in to pool[pool_idx] */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	229 tmp[0] = 0;
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	230 tmp[1] = (unsigned char)inlen;
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	231
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	232 LTC_MUTEX_LOCK(&prng->lock);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	233 if ((err = sha256_process(&prng->fortuna.pool[prng->fortuna.pool_idx], tmp, 2)) != CRYPT_OK) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	234 goto LBL_UNLOCK;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	235 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	236 if ((err = sha256_process(&prng->fortuna.pool[prng->fortuna.pool_idx], in, inlen)) != CRYPT_OK) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	237 goto LBL_UNLOCK;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	238 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	239 if (prng->fortuna.pool_idx == 0) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	240 prng->fortuna.pool0_len += inlen;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	241 }
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	242 if (++(prng->fortuna.pool_idx) == LTC_FORTUNA_POOLS) {
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	243 prng->fortuna.pool_idx = 0;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	244 }
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	245 err = CRYPT_OK; /* success */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	246
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	247 LBL_UNLOCK:
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	248 LTC_MUTEX_UNLOCK(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	249 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	250 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	251
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	252 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	253 Make the PRNG ready to read from
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	254 @param prng The PRNG to make active
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	255 @return CRYPT_OK if successful
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	256 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	257 int fortuna_ready(prng_state *prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	258 {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	259 int err;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	260 LTC_ARGCHK(prng != NULL);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	261
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	262 LTC_MUTEX_LOCK(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	263 err = _fortuna_reseed(prng);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	264 prng->ready = (err == CRYPT_OK) ? 1 : 0;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	265
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	266 LTC_MUTEX_UNLOCK(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	267 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	268 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	269
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	270 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	271 Read from the PRNG
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	272 @param out Destination
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	273 @param outlen Length of output
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	274 @param prng The active PRNG to read from
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	275 @return Number of octets read
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	276 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	277 unsigned long fortuna_read(unsigned char out, unsigned long outlen, prng_state prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	278 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	279 unsigned char tmp[16];
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	280 unsigned long tlen = 0;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	281
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	282 if (outlen == 0 \|\| prng == NULL \|\| out == NULL) return 0;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	283
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	284 LTC_MUTEX_LOCK(&prng->lock);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	285
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	286 if (!prng->ready) {
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	287 goto LBL_UNLOCK;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	288 }
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	289
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	290 /* do we have to reseed? */
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	291 if ((++prng->fortuna.wd == LTC_FORTUNA_WD) && (prng->fortuna.pool0_len >= 64)) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	292 if (_fortuna_reseed(prng) != CRYPT_OK) {
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	293 goto LBL_UNLOCK;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	294 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	295 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	296
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	297 /* ensure that one reseed happened before allowing to read */
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	298 if (prng->fortuna.reset_cnt == 0) {
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	299 goto LBL_UNLOCK;
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	300 }
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	301
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	302 /* now generate the blocks required */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	303 tlen = outlen;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	304
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	305 /* handle whole blocks without the extra XMEMCPY */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	306 while (outlen >= 16) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	307 /* encrypt the IV and store it */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	308 rijndael_ecb_encrypt(prng->fortuna.IV, out, &prng->fortuna.skey);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	309 out += 16;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	310 outlen -= 16;
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	311 _fortuna_update_iv(prng);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	312 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	313
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	314 /* left over bytes? */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	315 if (outlen > 0) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	316 rijndael_ecb_encrypt(prng->fortuna.IV, tmp, &prng->fortuna.skey);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	317 XMEMCPY(out, tmp, outlen);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	318 _fortuna_update_iv(prng);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	319 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	320
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	321 /* generate new key */
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	322 rijndael_ecb_encrypt(prng->fortuna.IV, prng->fortuna.K , &prng->fortuna.skey);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	323 _fortuna_update_iv(prng);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	324
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	325 rijndael_ecb_encrypt(prng->fortuna.IV, prng->fortuna.K+16, &prng->fortuna.skey);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	326 _fortuna_update_iv(prng);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	327
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	328 if (rijndael_setup(prng->fortuna.K, 32, 0, &prng->fortuna.skey) != CRYPT_OK) {
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	329 tlen = 0;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	330 }
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	331
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	332 LBL_UNLOCK:
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	333 #ifdef LTC_CLEAN_STACK
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	334 zeromem(tmp, sizeof(tmp));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	335 #endif
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	336 LTC_MUTEX_UNLOCK(&prng->lock);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	337 return tlen;
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	338 }
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	339
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	340 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	341 Terminate the PRNG
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	342 @param prng The PRNG to terminate
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	343 @return CRYPT_OK if successful
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	344 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	345 int fortuna_done(prng_state *prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	346 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	347 int err, x;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	348 unsigned char tmp[32];
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	349
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	350 LTC_ARGCHK(prng != NULL);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	351
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	352 LTC_MUTEX_LOCK(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	353 prng->ready = 0;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	354
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	355 /* terminate all the hashes */
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	356 for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	357 if ((err = sha256_done(&(prng->fortuna.pool[x]), tmp)) != CRYPT_OK) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	358 goto LBL_UNLOCK;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	359 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	360 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	361 /* call cipher done when we invent one ;-) */
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	362 err = CRYPT_OK; /* success */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	363
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	364 LBL_UNLOCK:
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	365 #ifdef LTC_CLEAN_STACK
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	366 zeromem(tmp, sizeof(tmp));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	367 #endif
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	368 LTC_MUTEX_UNLOCK(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	369 LTC_MUTEX_DESTROY(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	370 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	371 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	372
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	373 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	374 Export the PRNG state
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	375 @param out [out] Destination
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	376 @param outlen [in/out] Max size and resulting size of the state
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	377 @param prng The PRNG to export
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	378 @return CRYPT_OK if successful
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	379 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	380 int fortuna_export(unsigned char out, unsigned long outlen, prng_state *prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	381 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	382 int x, err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	383 hash_state *md;
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	384 unsigned long len = fortuna_desc.export_size;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	385
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	386 LTC_ARGCHK(out != NULL);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	387 LTC_ARGCHK(outlen != NULL);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	388 LTC_ARGCHK(prng != NULL);
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	389
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	390 LTC_MUTEX_LOCK(&prng->lock);
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	391
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	392 if (!prng->ready) {
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	393 err = CRYPT_ERROR;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	394 goto LBL_UNLOCK;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	395 }
382 0cbe8f6dbf9e propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 2af22fb4e878750b88f80f90d439b316d229796f) Matt Johnston <matt@ucc.asn.au> parents: 285 diff changeset	396
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	397 /* we'll write bytes for s&g's */
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	398 if (*outlen < len) {
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	399 *outlen = len;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	400 err = CRYPT_BUFFER_OVERFLOW;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	401 goto LBL_UNLOCK;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	402 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	403
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	404 md = XMALLOC(sizeof(hash_state));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	405 if (md == NULL) {
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	406 err = CRYPT_MEM;
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	407 goto LBL_UNLOCK;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	408 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	409
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	410 /* to emit the state we copy each pool, terminate it then hash it again so
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	411 * an attacker who sees the state can't determine the current state of the PRNG
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	412 */
1435 f849a5ca2efc update to libtomcrypt 1.17 (with Dropbear changes) Matt Johnston <matt@ucc.asn.au> parents: 382 diff changeset	413 for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	414 /* copy the PRNG */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	415 XMEMCPY(md, &(prng->fortuna.pool[x]), sizeof(*md));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	416
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	417 /* terminate it */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	418 if ((err = sha256_done(md, out+x*32)) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	419 goto LBL_ERR;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	420 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	421
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	422 /* now hash it */
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	423 if ((err = sha256_init(md)) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	424 goto LBL_ERR;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	425 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	426 if ((err = sha256_process(md, out+x*32, 32)) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	427 goto LBL_ERR;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	428 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	429 if ((err = sha256_done(md, out+x*32)) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	430 goto LBL_ERR;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	431 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	432 }
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	433 *outlen = len;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	434 err = CRYPT_OK;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	435
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	436 LBL_ERR:
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	437 #ifdef LTC_CLEAN_STACK
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	438 zeromem(md, sizeof(*md));
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	439 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	440 XFREE(md);
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	441 LBL_UNLOCK:
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	442 LTC_MUTEX_UNLOCK(&prng->lock);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	443 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	444 }
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	445
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	446 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	447 Import a PRNG state
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	448 @param in The PRNG state
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	449 @param inlen Size of the state
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	450 @param prng The PRNG to import
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	451 @return CRYPT_OK if successful
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	452 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	453 int fortuna_import(const unsigned char in, unsigned long inlen, prng_state prng)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	454 {
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	455 int err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	456
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	457 LTC_ARGCHK(in != NULL);
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	458 LTC_ARGCHK(prng != NULL);
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	459
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	460 if (inlen < (unsigned long)fortuna_desc.export_size) {
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	461 return CRYPT_INVALID_ARG;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	462 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	463
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	464 if ((err = fortuna_start(prng)) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	465 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	466 }
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	467
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	468 if ((err = _fortuna_update_seed(in, inlen, prng)) != CRYPT_OK) {
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	469 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	470 }
1711 e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	471
e9dba7abd939 Merge libtomcrypt v1.18.2 Matt Johnston <matt@ucc.asn.au> parents: 1471 diff changeset	472 return err;
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	473 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	474
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	475 /**
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	476 PRNG self-test
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	477 @return CRYPT_OK if successful, CRYPT_NOP if self-testing has been disabled
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	478 */
285 1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	479 int fortuna_test(void)
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	480 {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	481 #ifndef LTC_TEST
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	482 return CRYPT_NOP;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	483 #else
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	484 int err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	485
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	486 if ((err = sha256_test()) != CRYPT_OK) {
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	487 return err;
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	488 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	489 return rijndael_test();
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	490 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	491 }
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	492
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	493 #endif
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	494
1b9e69c058d2 propagate from branch 'au.asn.ucc.matt.ltc.dropbear' (head 20dccfc09627970a312d77fb41dc2970b62689c3) Matt Johnston <matt@ucc.asn.au> parents: diff changeset	495
1471 6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	496 /* ref: $Format:%D$ */
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	497 /* git commit: $Format:%H$ */
6dba84798cd5 Update to libtomcrypt 1.18.1, merged with Dropbear changes Matt Johnston <matt@ucc.asn.au> parents: 1435 diff changeset	498 /* commit time: $Format:%ai$ */

Mercurial > dropbear

annotate libtomcrypt/src/prngs/fortuna.c @ 1749:32307118bc26