From a3a199e14bbc064187d7375f1183e51e0a073a22 Mon Sep 17 00:00:00 2001 From: Larry Bugbee Date: Tue, 8 Aug 2017 19:04:04 +0200 Subject: [PATCH] update crypt_sizes.c --- src/misc/crypt/crypt_sizes.c | 127 +++++++++++++++++++---------------- 1 file changed, 69 insertions(+), 58 deletions(-) diff --git a/src/misc/crypt/crypt_sizes.c b/src/misc/crypt/crypt_sizes.c index 45f029c..fa3e684 100644 --- a/src/misc/crypt/crypt_sizes.c +++ b/src/misc/crypt/crypt_sizes.c @@ -30,8 +30,11 @@ static const crypt_size _crypt_sizes[] = { /* hash state sizes */ _SZ_STRINGIFY_S(ltc_hash_descriptor), _SZ_STRINGIFY_T(hash_state), -#ifdef LTC_SHA256 - _SZ_STRINGIFY_S(sha256_state), +#ifdef LTC_CHC_HASH + _SZ_STRINGIFY_S(chc_state), +#endif +#ifdef LTC_WHIRLPOOL + _SZ_STRINGIFY_S(whirlpool_state), #endif #ifdef LTC_SHA3 _SZ_STRINGIFY_S(sha3_state), @@ -39,17 +42,23 @@ static const crypt_size _crypt_sizes[] = { #ifdef LTC_SHA512 _SZ_STRINGIFY_S(sha512_state), #endif -#ifdef LTC_WHIRLPOOL - _SZ_STRINGIFY_S(whirlpool_state), +#ifdef LTC_SHA256 + _SZ_STRINGIFY_S(sha256_state), #endif -#ifdef LTC_MD2 - _SZ_STRINGIFY_S(md2_state), +#ifdef LTC_SHA1 + _SZ_STRINGIFY_S(sha1_state), +#endif +#ifdef LTC_MD5 + _SZ_STRINGIFY_S(md5_state), #endif #ifdef LTC_MD4 _SZ_STRINGIFY_S(md4_state), #endif -#ifdef LTC_MD5 - _SZ_STRINGIFY_S(md5_state), +#ifdef LTC_MD2 + _SZ_STRINGIFY_S(md2_state), +#endif +#ifdef LTC_TIGER + _SZ_STRINGIFY_S(tiger_state), #endif #ifdef LTC_RIPEMD128 _SZ_STRINGIFY_S(rmd128_state), @@ -63,21 +72,12 @@ static const crypt_size _crypt_sizes[] = { #ifdef LTC_RIPEMD320 _SZ_STRINGIFY_S(rmd320_state), #endif -#ifdef LTC_SHA1 - _SZ_STRINGIFY_S(sha1_state), -#endif -#ifdef LTC_TIGER - _SZ_STRINGIFY_S(tiger_state), -#endif #ifdef LTC_BLAKE2S _SZ_STRINGIFY_S(blake2s_state), #endif #ifdef LTC_BLAKE2B _SZ_STRINGIFY_S(blake2b_state), #endif -#ifdef LTC_CHC_HASH - _SZ_STRINGIFY_S(chc_state), -#endif /* block cipher key sizes */ _SZ_STRINGIFY_S(ltc_cipher_descriptor), @@ -142,55 +142,57 @@ static const crypt_size _crypt_sizes[] = { #endif /* mode sizes */ -#ifdef LTC_CBC_MODE - _SZ_STRINGIFY_T(symmetric_CBC), +#ifdef LTC_ECB_MODE + _SZ_STRINGIFY_T(symmetric_ECB), #endif #ifdef LTC_CFB_MODE _SZ_STRINGIFY_T(symmetric_CFB), #endif +#ifdef LTC_OFB_MODE + _SZ_STRINGIFY_T(symmetric_OFB), +#endif +#ifdef LTC_CBC_MODE + _SZ_STRINGIFY_T(symmetric_CBC), +#endif #ifdef LTC_CTR_MODE _SZ_STRINGIFY_T(symmetric_CTR), #endif -#ifdef LTC_ECB_MODE - _SZ_STRINGIFY_T(symmetric_ECB), -#endif -#ifdef LTC_F8_MODE - _SZ_STRINGIFY_T(symmetric_F8), -#endif #ifdef LTC_LRW_MODE _SZ_STRINGIFY_T(symmetric_LRW), #endif -#ifdef LTC_OFB_MODE - _SZ_STRINGIFY_T(symmetric_OFB), +#ifdef LTC_F8_MODE + _SZ_STRINGIFY_T(symmetric_F8), +#endif +#ifdef LTC_XTS_MODE + _SZ_STRINGIFY_T(symmetric_xts), +#endif + + /* stream cipher sizes */ +#ifdef LTC_CHACHA + _SZ_STRINGIFY_T(chacha_state), +#endif +#ifdef LTC_RC4_STREAM + _SZ_STRINGIFY_T(rc4_state), +#endif +#ifdef LTC_SOBER128_STREAM + _SZ_STRINGIFY_T(sober128_state), #endif /* MAC sizes -- no states for ccm, lrw */ -#ifdef LTC_F9_MODE - _SZ_STRINGIFY_T(f9_state), -#endif #ifdef LTC_HMAC _SZ_STRINGIFY_T(hmac_state), #endif #ifdef LTC_OMAC _SZ_STRINGIFY_T(omac_state), #endif -#ifdef LTC_PELICAN - _SZ_STRINGIFY_T(pelican_state), -#endif #ifdef LTC_PMAC _SZ_STRINGIFY_T(pmac_state), #endif #ifdef LTC_POLY1305 _SZ_STRINGIFY_T(poly1305_state), #endif -#ifdef LTC_BLAKE2SMAC - _SZ_STRINGIFY_T(blake2smac_state), -#endif -#ifdef LTC_BLAKE2BMAC - _SZ_STRINGIFY_T(blake2bmac_state), -#endif -#ifdef LTC_XCBC - _SZ_STRINGIFY_T(xcbc_state), +#ifdef LTC_EAX_MODE + _SZ_STRINGIFY_T(eax_state), #endif #ifdef LTC_OCB_MODE _SZ_STRINGIFY_T(ocb_state), @@ -198,17 +200,23 @@ static const crypt_size _crypt_sizes[] = { #ifdef LTC_OCB3_MODE _SZ_STRINGIFY_T(ocb3_state), #endif -#ifdef LTC_CHACHA20POLY1305_MODE - _SZ_STRINGIFY_T(chacha20poly1305_state), +#ifdef LTC_CCM_MODE + _SZ_STRINGIFY_T(ccm_state), #endif #ifdef LTC_GCM_MODE _SZ_STRINGIFY_T(gcm_state), #endif -#ifdef LTC_EAX_MODE - _SZ_STRINGIFY_T(eax_state), +#ifdef LTC_PELICAN + _SZ_STRINGIFY_T(pelican_state), #endif -#ifdef LTC_CCM_MODE - _SZ_STRINGIFY_T(ccm_state), +#ifdef LTC_XCBC + _SZ_STRINGIFY_T(xcbc_state), +#endif +#ifdef LTC_F9_MODE + _SZ_STRINGIFY_T(f9_state), +#endif +#ifdef LTC_CHACHA20POLY1305_MODE + _SZ_STRINGIFY_T(chacha20poly1305_state), #endif /* asymmetric keys */ @@ -219,16 +227,27 @@ static const crypt_size _crypt_sizes[] = { _SZ_STRINGIFY_T(dsa_key), #endif #ifdef LTC_MDH + _SZ_STRINGIFY_T(ltc_dh_set_type), _SZ_STRINGIFY_T(dh_key), #endif #ifdef LTC_MECC _SZ_STRINGIFY_T(ltc_ecc_set_type), - _SZ_STRINGIFY_T(ecc_key), _SZ_STRINGIFY_T(ecc_point), + _SZ_STRINGIFY_T(ecc_key), #endif #ifdef LTC_MKAT _SZ_STRINGIFY_T(katja_key), #endif +#ifdef LTC_SOURCE + _SZ_STRINGIFY_T(oid_st), +#endif + + /* DER handling */ +#ifdef LTC_DER + _SZ_STRINGIFY_T(ltc_asn1_list), /* a list entry */ + _SZ_STRINGIFY_T(ltc_utctime), + _SZ_STRINGIFY_T(ltc_generalizedtime), +#endif /* prng state sizes */ _SZ_STRINGIFY_S(ltc_prng_descriptor), @@ -251,22 +270,14 @@ static const crypt_size _crypt_sizes[] = { /* sprng has no state as it uses other potentially available sources */ /* like /dev/random. See Developers Guide for more info. */ -#ifdef LTC_SOBER128_STREAM - _SZ_STRINGIFY_T(sober128_state), -#endif -#ifdef LTC_RC4_STREAM - _SZ_STRINGIFY_T(rc4_state), -#endif -#ifdef LTC_CHACHA - _SZ_STRINGIFY_T(chacha_state), -#endif - #ifdef LTC_ADLER32 _SZ_STRINGIFY_T(adler32_state), #endif #ifdef LTC_CRC32 _SZ_STRINGIFY_T(crc32_state), #endif + + }; /* crypt_get_size()