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

comparison libtomcrypt/src/prngs/fortuna.c @ 1435:f849a5ca2efc

update to libtomcrypt 1.17 (with Dropbear changes)

author	Matt Johnston <matt@ucc.asn.au>
date	Sat, 24 Jun 2017 17:50:50 +0800
parents	0cbe8f6dbf9e
children	6dba84798cd5

comparison

equal deleted inserted replaced

-:27b9ddb06b09
+:f849a5ca2efc
 * algorithms in a highly modular and flexible manner.
 *
 * The library is free for all purposes without any express
 * guarantee it works.
 *
-* Tom St Denis, [email protected], http://libtomcrypt.com
+* Tom St Denis, [email protected], http://libtom.org
 */
 #include "tomcrypt.h"
 /**
 @file fortuna.c
 /* Implementation of Fortuna by Tom St Denis
 We deviate slightly here for reasons of simplicity [and to fit in the API].  First all "sources"
 in the AddEntropy function are fixed to 0.  Second since no reliable timer is provided
-we reseed automatically when len(pool0) >= 64 or every FORTUNA_WD calls to the read function */
+we reseed automatically when len(pool0) >= 64 or every LTC_FORTUNA_WD calls to the read function */
-#ifdef FORTUNA
+#ifdef LTC_FORTUNA
-/* requries SHA256 and AES  */
+/* requries LTC_SHA256 and AES  */
-#if !(defined(RIJNDAEL) && defined(SHA256))
+#if !(defined(LTC_RIJNDAEL) && defined(LTC_SHA256))
-#error FORTUNA requires SHA256 and RIJNDAEL (AES)
+#error LTC_FORTUNA requires LTC_SHA256 and LTC_RIJNDAEL (AES)
 #endif
-#ifndef FORTUNA_POOLS
+#ifndef LTC_FORTUNA_POOLS
-#warning FORTUNA_POOLS was not previously defined (old headers?)
+#warning LTC_FORTUNA_POOLS was not previously defined (old headers?)
-#define FORTUNA_POOLS 32
+#define LTC_FORTUNA_POOLS 32
 #endif
-#if FORTUNA_POOLS < 4 || FORTUNA_POOLS > 32
+#if LTC_FORTUNA_POOLS < 4 || LTC_FORTUNA_POOLS > 32
-#error FORTUNA_POOLS must be in [4..32]
+#error LTC_FORTUNA_POOLS must be in [4..32]
 #endif
 const struct ltc_prng_descriptor fortuna_desc = {
 "fortuna", 1024,
 &fortuna_start,
 hash_state    md;
 int           err, x;
 ++prng->fortuna.reset_cnt;
-/* new K == SHA256(K || s) where s == SHA256(P0) || SHA256(P1) ... */
+/* new K == LTC_SHA256(K || s) where s == LTC_SHA256(P0) || LTC_SHA256(P1) ... */
 sha256_init(&md);
 if ((err = sha256_process(&md, prng->fortuna.K, 32)) != CRYPT_OK) {
 sha256_done(&md, tmp);
 return err;
 }
-for (x = 0; x < FORTUNA_POOLS; x++) {
+for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
 if (x == 0 || ((prng->fortuna.reset_cnt >> (x-1)) & 1) == 0) {
 /* terminate this hash */
 if ((err = sha256_done(&prng->fortuna.pool[x], tmp)) != CRYPT_OK) {
 sha256_done(&md, tmp);
 return err;
 unsigned char tmp[MAXBLOCKSIZE];
 LTC_ARGCHK(prng != NULL);
 /* initialize the pools */
-for (x = 0; x < FORTUNA_POOLS; x++) {
+for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
 if ((err = sha256_init(&prng->fortuna.pool[x])) != CRYPT_OK) {
 for (y = 0; y < x; y++) {
 sha256_done(&prng->fortuna.pool[y], tmp);
 }
 return err;
 prng->fortuna.reset_cnt = 0;
 /* reset bufs */
 zeromem(prng->fortuna.K, 32);
 if ((err = rijndael_setup(prng->fortuna.K, 32, 0, &prng->fortuna.skey)) != CRYPT_OK) {
-for (x = 0; x < FORTUNA_POOLS; x++) {
+for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
 sha256_done(&prng->fortuna.pool[x], tmp);
 }
 return err;
 }
 zeromem(prng->fortuna.IV, 16);
 return err;
 }
 if (prng->fortuna.pool_idx == 0) {
 prng->fortuna.pool0_len += inlen;
 }
-if (++(prng->fortuna.pool_idx) == FORTUNA_POOLS) {
+if (++(prng->fortuna.pool_idx) == LTC_FORTUNA_POOLS) {
 prng->fortuna.pool_idx = 0;
 }
 LTC_MUTEX_UNLOCK(&prng->fortuna.prng_lock);
 return CRYPT_OK;
 LTC_ARGCHK(prng != NULL);
 LTC_MUTEX_LOCK(&prng->fortuna.prng_lock);
 /* do we have to reseed? */
-if (++prng->fortuna.wd == FORTUNA_WD || prng->fortuna.pool0_len >= 64) {
+if (++prng->fortuna.wd == LTC_FORTUNA_WD || prng->fortuna.pool0_len >= 64) {
 if ((err = fortuna_reseed(prng)) != CRYPT_OK) {
 LTC_MUTEX_UNLOCK(&prng->fortuna.prng_lock);
 return 0;
 }
 }
 LTC_ARGCHK(prng != NULL);
 LTC_MUTEX_LOCK(&prng->fortuna.prng_lock);
 /* terminate all the hashes */
-for (x = 0; x < FORTUNA_POOLS; x++) {
+for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
 if ((err = sha256_done(&(prng->fortuna.pool[x]), tmp)) != CRYPT_OK) {
 LTC_MUTEX_UNLOCK(&prng->fortuna.prng_lock);
 return err;
 }
 }
 LTC_ARGCHK(prng   != NULL);
 LTC_MUTEX_LOCK(&prng->fortuna.prng_lock);
 /* we'll write bytes for s&g's */
-if (*outlen < 32*FORTUNA_POOLS) {
+if (*outlen < 32*LTC_FORTUNA_POOLS) {
 LTC_MUTEX_UNLOCK(&prng->fortuna.prng_lock);
-*outlen = 32*FORTUNA_POOLS;
+*outlen = 32*LTC_FORTUNA_POOLS;
 return CRYPT_BUFFER_OVERFLOW;
 }
 md = XMALLOC(sizeof(hash_state));
 if (md == NULL) {
 }
 /* to emit the state we copy each pool, terminate it then hash it again so
 * an attacker who sees the state can't determine the current state of the PRNG
 */
-for (x = 0; x < FORTUNA_POOLS; x++) {
+for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
 /* copy the PRNG */
 XMEMCPY(md, &(prng->fortuna.pool[x]), sizeof(*md));
 /* terminate it */
 if ((err = sha256_done(md, out+x*32)) != CRYPT_OK) {
 }
 if ((err = sha256_done(md, out+x*32)) != CRYPT_OK) {
 goto LBL_ERR;
 }
 }
-*outlen = 32*FORTUNA_POOLS;
+*outlen = 32*LTC_FORTUNA_POOLS;
 err = CRYPT_OK;
 LBL_ERR:
 #ifdef LTC_CLEAN_STACK
 zeromem(md, sizeof(*md));
 int err, x;
 LTC_ARGCHK(in   != NULL);
 LTC_ARGCHK(prng != NULL);
-if (inlen != 32*FORTUNA_POOLS) {
+if (inlen != 32*LTC_FORTUNA_POOLS) {
 return CRYPT_INVALID_ARG;
 }
 if ((err = fortuna_start(prng)) != CRYPT_OK) {
 return err;
 }
-for (x = 0; x < FORTUNA_POOLS; x++) {
+for (x = 0; x < LTC_FORTUNA_POOLS; x++) {
 if ((err = fortuna_add_entropy(in+x*32, 32, prng)) != CRYPT_OK) {
 return err;
 }
 }
 return err;
 }
 #endif
-/* $Source: /cvs/libtom/libtomcrypt/src/prngs/fortuna.c,v $ */
+/* $Source$ */
-/* $Revision: 1.12 $ */
+/* $Revision$ */
-/* $Date: 2006/12/04 21:34:03 $ */
+/* $Date$ */

Mercurial > dropbear

comparison libtomcrypt/src/prngs/fortuna.c @ 1435:f849a5ca2efc