From 9e36f0475f011912ee0897aa6487d7b9c190600e Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Sun, 30 Jun 2013 14:34:05 +0200 Subject: [PATCH] SHA2 renamed to SHA256, SHA4 renamed to SHA512 and functions accordingly The SHA4 name was not clear with regards to the new SHA-3 standard. So SHA2 and SHA4 have been renamed to better represent what they are: SHA256 and SHA512 modules. --- ChangeLog | 1 + include/polarssl/config.h | 22 +- include/polarssl/entropy.h | 4 +- include/polarssl/error.h | 4 +- include/polarssl/md_wrap.h | 4 +- include/polarssl/sha2.h | 42 ++-- include/polarssl/sha4.h | 40 ++-- include/polarssl/ssl.h | 8 +- library/entropy.c | 20 +- library/error.c | 20 +- library/md.c | 12 +- library/md_wrap.c | 104 ++++----- library/sha2.c | 150 ++++++------ library/sha4.c | 148 ++++++------ library/ssl_ciphersuites.c | 88 +++---- library/ssl_cli.c | 8 +- library/ssl_srv.c | 8 +- library/ssl_tls.c | 82 +++---- library/x509parse.c | 4 +- programs/aes/aescrypt2.c | 54 ++--- programs/hash/sha2sum.c | 28 +-- programs/test/benchmark.c | 12 +- programs/test/selftest.c | 8 +- scripts/generate_errors.pl | 2 +- tests/suites/test_suite_hmac_shax.data | 50 ++-- tests/suites/test_suite_hmac_shax.function | 8 +- tests/suites/test_suite_md.data | 252 ++++++++++----------- tests/suites/test_suite_rsa.data | 68 +++--- tests/suites/test_suite_shax.data | 104 ++++----- tests/suites/test_suite_shax.function | 24 +- tests/suites/test_suite_x509parse.data | 10 +- tests/suites/test_suite_x509write.data | 8 +- 32 files changed, 700 insertions(+), 697 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5a4420582..66a5c9cd2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -21,6 +21,7 @@ Changes and maximum protocol version * Renamed error_strerror() to the less conflicting polarssl_strerror() (Ability to keep old as well with POLARSSL_ERROR_STRERROR_BC) + * SHA2 renamed to SHA256, SHA4 renamed to SHA512 and functions accordingly Bugfix * Fixed parse error in ssl_parse_certificate_request() diff --git a/include/polarssl/config.h b/include/polarssl/config.h index 1e36a490b..ae973ed02 100644 --- a/include/polarssl/config.h +++ b/include/polarssl/config.h @@ -129,8 +129,8 @@ #define POLARSSL_MD4_ALT #define POLARSSL_MD5_ALT #define POLARSSL_SHA1_ALT -#define POLARSSL_SHA2_ALT -#define POLARSSL_SHA4_ALT +#define POLARSSL_SHA256_ALT +#define POLARSSL_SHA512_ALT */ /** @@ -789,7 +789,7 @@ * Module: library/entropy.c * Caller: * - * Requires: POLARSSL_SHA4_C + * Requires: POLARSSL_SHA512_C * * This module provides a generic entropy pool */ @@ -1043,31 +1043,33 @@ #define POLARSSL_SHA1_C /** - * \def POLARSSL_SHA2_C + * \def POLARSSL_SHA256_C * * Enable the SHA-224 and SHA-256 cryptographic hash algorithms. + * (Used to be POLARSSL_SHA2_C) * - * Module: library/sha2.c + * Module: library/sha256.c * Caller: library/md_wrap.c * library/x509parse.c * * This module adds support for SHA-224 and SHA-256. * This module is required for the SSL/TLS 1.2 PRF function. */ -#define POLARSSL_SHA2_C +#define POLARSSL_SHA256_C /** - * \def POLARSSL_SHA4_C + * \def POLARSSL_SHA512_C * * Enable the SHA-384 and SHA-512 cryptographic hash algorithms. + * (Used to be POLARSSL_SHA4_C) * - * Module: library/sha4.c + * Module: library/sha512.c * Caller: library/md_wrap.c * library/x509parse.c * * This module adds support for SHA-384 and SHA-512. */ -#define POLARSSL_SHA4_C +#define POLARSSL_SHA512_C /** * \def POLARSSL_SSL_CACHE_C @@ -1265,7 +1267,7 @@ #error "POLARSSL_ECP_C defined, but not all prerequisites" #endif -#if defined(POLARSSL_ENTROPY_C) && !defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_ENTROPY_C) && !defined(POLARSSL_SHA512_C) #error "POLARSSL_ENTROPY_C defined, but not all prerequisites" #endif diff --git a/include/polarssl/entropy.h b/include/polarssl/entropy.h index 039f5cd6b..539e5cb2c 100644 --- a/include/polarssl/entropy.h +++ b/include/polarssl/entropy.h @@ -81,9 +81,9 @@ source_state; /** * \brief Entropy context structure */ -typedef struct +typedef struct { - sha4_context accumulator; + sha512_context accumulator; int source_count; source_state source[ENTROPY_MAX_SOURCES]; #if defined(POLARSSL_HAVEGE_C) diff --git a/include/polarssl/error.h b/include/polarssl/error.h index 366864c4b..c32615493 100644 --- a/include/polarssl/error.h +++ b/include/polarssl/error.h @@ -68,8 +68,8 @@ * MD4 1 0x0072-0x0072 * MD5 1 0x0074-0x0074 * SHA1 1 0x0076-0x0076 - * SHA2 1 0x0078-0x0078 - * SHA4 1 0x007A-0x007A + * SHA256 1 0x0078-0x0078 + * SHA512 1 0x007A-0x007A * PBKDF2 1 0x007C-0x007C * * High-level module nr (3 bits - 0x1...-0x8...) diff --git a/include/polarssl/md_wrap.h b/include/polarssl/md_wrap.h index 46849d033..a41c875fc 100644 --- a/include/polarssl/md_wrap.h +++ b/include/polarssl/md_wrap.h @@ -48,11 +48,11 @@ extern const md_info_t md5_info; #if defined(POLARSSL_SHA1_C) extern const md_info_t sha1_info; #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) extern const md_info_t sha224_info; extern const md_info_t sha256_info; #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) extern const md_info_t sha384_info; extern const md_info_t sha512_info; #endif diff --git a/include/polarssl/sha2.h b/include/polarssl/sha2.h index 9df46fb38..09ba87cdf 100644 --- a/include/polarssl/sha2.h +++ b/include/polarssl/sha2.h @@ -38,9 +38,9 @@ typedef UINT32 uint32_t; #include #endif -#define POLARSSL_ERR_SHA2_FILE_IO_ERROR -0x0078 /**< Read/write error in file. */ +#define POLARSSL_ERR_SHA256_FILE_IO_ERROR -0x0078 /**< Read/write error in file. */ -#if !defined(POLARSSL_SHA2_ALT) +#if !defined(POLARSSL_SHA256_ALT) // Regular implementation // @@ -61,7 +61,7 @@ typedef struct unsigned char opad[64]; /*!< HMAC: outer padding */ int is224; /*!< 0 => SHA-256, else SHA-224 */ } -sha2_context; +sha256_context; /** * \brief SHA-256 context setup @@ -69,7 +69,7 @@ sha2_context; * \param ctx context to be initialized * \param is224 0 = use SHA256, 1 = use SHA224 */ -void sha2_starts( sha2_context *ctx, int is224 ); +void sha256_starts( sha256_context *ctx, int is224 ); /** * \brief SHA-256 process buffer @@ -78,7 +78,7 @@ void sha2_starts( sha2_context *ctx, int is224 ); * \param input buffer holding the data * \param ilen length of the input data */ -void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ); +void sha256_update( sha256_context *ctx, const unsigned char *input, size_t ilen ); /** * \brief SHA-256 final digest @@ -86,18 +86,18 @@ void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ); * \param ctx SHA-256 context * \param output SHA-224/256 checksum result */ -void sha2_finish( sha2_context *ctx, unsigned char output[32] ); +void sha256_finish( sha256_context *ctx, unsigned char output[32] ); /* Internal use */ -void sha2_process( sha2_context *ctx, const unsigned char data[64] ); +void sha256_process( sha256_context *ctx, const unsigned char data[64] ); #ifdef __cplusplus } #endif -#else /* POLARSSL_SHA2_ALT */ +#else /* POLARSSL_SHA256_ALT */ #include "sha2_alt.h" -#endif /* POLARSSL_SHA2_ALT */ +#endif /* POLARSSL_SHA256_ALT */ #ifdef __cplusplus extern "C" { @@ -111,7 +111,7 @@ extern "C" { * \param output SHA-224/256 checksum result * \param is224 0 = use SHA256, 1 = use SHA224 */ -void sha2( const unsigned char *input, size_t ilen, +void sha256( const unsigned char *input, size_t ilen, unsigned char output[32], int is224 ); /** @@ -121,9 +121,9 @@ void sha2( const unsigned char *input, size_t ilen, * \param output SHA-224/256 checksum result * \param is224 0 = use SHA256, 1 = use SHA224 * - * \return 0 if successful, or POLARSSL_ERR_SHA2_FILE_IO_ERROR + * \return 0 if successful, or POLARSSL_ERR_SHA256_FILE_IO_ERROR */ -int sha2_file( const char *path, unsigned char output[32], int is224 ); +int sha256_file( const char *path, unsigned char output[32], int is224 ); /** * \brief SHA-256 HMAC context setup @@ -133,8 +133,8 @@ int sha2_file( const char *path, unsigned char output[32], int is224 ); * \param keylen length of the HMAC key * \param is224 0 = use SHA256, 1 = use SHA224 */ -void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keylen, - int is224 ); +void sha256_hmac_starts( sha256_context *ctx, const unsigned char *key, + size_t keylen, int is224 ); /** * \brief SHA-256 HMAC process buffer @@ -143,7 +143,7 @@ void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keyle * \param input buffer holding the data * \param ilen length of the input data */ -void sha2_hmac_update( sha2_context *ctx, const unsigned char *input, size_t ilen ); +void sha256_hmac_update( sha256_context *ctx, const unsigned char *input, size_t ilen ); /** * \brief SHA-256 HMAC final digest @@ -151,14 +151,14 @@ void sha2_hmac_update( sha2_context *ctx, const unsigned char *input, size_t ile * \param ctx HMAC context * \param output SHA-224/256 HMAC checksum result */ -void sha2_hmac_finish( sha2_context *ctx, unsigned char output[32] ); +void sha256_hmac_finish( sha256_context *ctx, unsigned char output[32] ); /** * \brief SHA-256 HMAC context reset * * \param ctx HMAC context to be reset */ -void sha2_hmac_reset( sha2_context *ctx ); +void sha256_hmac_reset( sha256_context *ctx ); /** * \brief Output = HMAC-SHA-256( hmac key, input buffer ) @@ -170,16 +170,16 @@ void sha2_hmac_reset( sha2_context *ctx ); * \param output HMAC-SHA-224/256 result * \param is224 0 = use SHA256, 1 = use SHA224 */ -void sha2_hmac( const unsigned char *key, size_t keylen, - const unsigned char *input, size_t ilen, - unsigned char output[32], int is224 ); +void sha256_hmac( const unsigned char *key, size_t keylen, + const unsigned char *input, size_t ilen, + unsigned char output[32], int is224 ); /** * \brief Checkup routine * * \return 0 if successful, or 1 if the test failed */ -int sha2_self_test( int verbose ); +int sha256_self_test( int verbose ); #ifdef __cplusplus } diff --git a/include/polarssl/sha4.h b/include/polarssl/sha4.h index 450ef5998..711353a38 100644 --- a/include/polarssl/sha4.h +++ b/include/polarssl/sha4.h @@ -39,9 +39,9 @@ #define UL64(x) x##ULL #endif -#define POLARSSL_ERR_SHA4_FILE_IO_ERROR -0x007A /**< Read/write error in file. */ +#define POLARSSL_ERR_SHA512_FILE_IO_ERROR -0x007A /**< Read/write error in file. */ -#if !defined(POLARSSL_SHA1_ALT) +#if !defined(POLARSSL_SHA512_ALT) // Regular implementation // @@ -62,7 +62,7 @@ typedef struct unsigned char opad[128]; /*!< HMAC: outer padding */ int is384; /*!< 0 => SHA-512, else SHA-384 */ } -sha4_context; +sha512_context; /** * \brief SHA-512 context setup @@ -70,7 +70,7 @@ sha4_context; * \param ctx context to be initialized * \param is384 0 = use SHA512, 1 = use SHA384 */ -void sha4_starts( sha4_context *ctx, int is384 ); +void sha512_starts( sha512_context *ctx, int is384 ); /** * \brief SHA-512 process buffer @@ -79,7 +79,7 @@ void sha4_starts( sha4_context *ctx, int is384 ); * \param input buffer holding the data * \param ilen length of the input data */ -void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen ); +void sha512_update( sha512_context *ctx, const unsigned char *input, size_t ilen ); /** * \brief SHA-512 final digest @@ -87,15 +87,15 @@ void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen ); * \param ctx SHA-512 context * \param output SHA-384/512 checksum result */ -void sha4_finish( sha4_context *ctx, unsigned char output[64] ); +void sha512_finish( sha512_context *ctx, unsigned char output[64] ); #ifdef __cplusplus } #endif -#else /* POLARSSL_SHA4_ALT */ +#else /* POLARSSL_SHA512_ALT */ #include "sha4_alt.h" -#endif /* POLARSSL_SHA4_ALT */ +#endif /* POLARSSL_SHA512_ALT */ #ifdef __cplusplus extern "C" { @@ -109,8 +109,8 @@ extern "C" { * \param output SHA-384/512 checksum result * \param is384 0 = use SHA512, 1 = use SHA384 */ -void sha4( const unsigned char *input, size_t ilen, - unsigned char output[64], int is384 ); +void sha512( const unsigned char *input, size_t ilen, + unsigned char output[64], int is384 ); /** * \brief Output = SHA-512( file contents ) @@ -119,9 +119,9 @@ void sha4( const unsigned char *input, size_t ilen, * \param output SHA-384/512 checksum result * \param is384 0 = use SHA512, 1 = use SHA384 * - * \return 0 if successful, or POLARSSL_ERR_SHA4_FILE_IO_ERROR + * \return 0 if successful, or POLARSSL_ERR_SHA512_FILE_IO_ERROR */ -int sha4_file( const char *path, unsigned char output[64], int is384 ); +int sha512_file( const char *path, unsigned char output[64], int is384 ); /** * \brief SHA-512 HMAC context setup @@ -131,8 +131,8 @@ int sha4_file( const char *path, unsigned char output[64], int is384 ); * \param key HMAC secret key * \param keylen length of the HMAC key */ -void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keylen, - int is384 ); +void sha512_hmac_starts( sha512_context *ctx, const unsigned char *key, + size_t keylen, int is384 ); /** * \brief SHA-512 HMAC process buffer @@ -141,7 +141,7 @@ void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keyle * \param input buffer holding the data * \param ilen length of the input data */ -void sha4_hmac_update( sha4_context *ctx, const unsigned char *input, size_t ilen ); +void sha512_hmac_update( sha512_context *ctx, const unsigned char *input, size_t ilen ); /** * \brief SHA-512 HMAC final digest @@ -149,14 +149,14 @@ void sha4_hmac_update( sha4_context *ctx, const unsigned char *input, size_t ile * \param ctx HMAC context * \param output SHA-384/512 HMAC checksum result */ -void sha4_hmac_finish( sha4_context *ctx, unsigned char output[64] ); +void sha512_hmac_finish( sha512_context *ctx, unsigned char output[64] ); /** * \brief SHA-512 HMAC context reset * * \param ctx HMAC context to be reset */ -void sha4_hmac_reset( sha4_context *ctx ); +void sha512_hmac_reset( sha512_context *ctx ); /** * \brief Output = HMAC-SHA-512( hmac key, input buffer ) @@ -168,7 +168,7 @@ void sha4_hmac_reset( sha4_context *ctx ); * \param output HMAC-SHA-384/512 result * \param is384 0 = use SHA512, 1 = use SHA384 */ -void sha4_hmac( const unsigned char *key, size_t keylen, +void sha512_hmac( const unsigned char *key, size_t keylen, const unsigned char *input, size_t ilen, unsigned char output[64], int is384 ); @@ -177,10 +177,10 @@ void sha4_hmac( const unsigned char *key, size_t keylen, * * \return 0 if successful, or 1 if the test failed */ -int sha4_self_test( int verbose ); +int sha512_self_test( int verbose ); /* Internal use */ -void sha4_process( sha4_context *ctx, const unsigned char data[128] ); +void sha512_process( sha512_context *ctx, const unsigned char data[128] ); #ifdef __cplusplus } diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h index e0e4bd852..01d883927 100644 --- a/include/polarssl/ssl.h +++ b/include/polarssl/ssl.h @@ -382,10 +382,10 @@ struct _ssl_handshake_params /* * Checksum contexts */ - md5_context fin_md5; - sha1_context fin_sha1; - sha2_context fin_sha2; - sha4_context fin_sha4; + md5_context fin_md5; + sha1_context fin_sha1; + sha256_context fin_sha256; + sha512_context fin_sha512; void (*update_checksum)(ssl_context *, const unsigned char *, size_t); void (*calc_verify)(ssl_context *, unsigned char *); diff --git a/library/entropy.c b/library/entropy.c index 253ae3dca..a6704d75e 100644 --- a/library/entropy.c +++ b/library/entropy.c @@ -40,7 +40,7 @@ void entropy_init( entropy_context *ctx ) { memset( ctx, 0, sizeof(entropy_context) ); - sha4_starts( &ctx->accumulator, 0 ); + sha512_starts( &ctx->accumulator, 0 ); #if defined(POLARSSL_HAVEGE_C) havege_init( &ctx->havege_data ); #endif @@ -91,7 +91,7 @@ static int entropy_update( entropy_context *ctx, unsigned char source_id, if( use_len > ENTROPY_BLOCK_SIZE ) { - sha4( data, len, tmp, 0 ); + sha512( data, len, tmp, 0 ); p = tmp; use_len = ENTROPY_BLOCK_SIZE; @@ -100,8 +100,8 @@ static int entropy_update( entropy_context *ctx, unsigned char source_id, header[0] = source_id; header[1] = use_len & 0xFF; - sha4_update( &ctx->accumulator, header, 2 ); - sha4_update( &ctx->accumulator, p, use_len ); + sha512_update( &ctx->accumulator, header, 2 ); + sha512_update( &ctx->accumulator, p, use_len ); return( 0 ); } @@ -179,19 +179,19 @@ int entropy_func( void *data, unsigned char *output, size_t len ) memset( buf, 0, ENTROPY_BLOCK_SIZE ); - sha4_finish( &ctx->accumulator, buf ); - + sha512_finish( &ctx->accumulator, buf ); + /* * Perform second SHA-512 on entropy */ - sha4( buf, ENTROPY_BLOCK_SIZE, buf, 0 ); + sha512( buf, ENTROPY_BLOCK_SIZE, buf, 0 ); /* * Reset accumulator and counters and recycle existing entropy */ - memset( &ctx->accumulator, 0, sizeof( sha4_context ) ); - sha4_starts( &ctx->accumulator, 0 ); - sha4_update( &ctx->accumulator, buf, ENTROPY_BLOCK_SIZE ); + memset( &ctx->accumulator, 0, sizeof( sha512_context ) ); + sha512_starts( &ctx->accumulator, 0 ); + sha512_update( &ctx->accumulator, buf, ENTROPY_BLOCK_SIZE ); for( i = 0; i < ctx->source_count; i++ ) ctx->source[i].size = 0; diff --git a/library/error.c b/library/error.c index aa0e24efa..22a637112 100644 --- a/library/error.c +++ b/library/error.c @@ -129,11 +129,11 @@ #include "polarssl/sha1.h" #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) #include "polarssl/sha2.h" #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) #include "polarssl/sha4.h" #endif @@ -594,15 +594,15 @@ void polarssl_strerror( int ret, char *buf, size_t buflen ) snprintf( buf, buflen, "SHA1 - Read/write error in file" ); #endif /* POLARSSL_SHA1_C */ -#if defined(POLARSSL_SHA2_C) - if( use_ret == -(POLARSSL_ERR_SHA2_FILE_IO_ERROR) ) - snprintf( buf, buflen, "SHA2 - Read/write error in file" ); -#endif /* POLARSSL_SHA2_C */ +#if defined(POLARSSL_SHA256_C) + if( use_ret == -(POLARSSL_ERR_SHA256_FILE_IO_ERROR) ) + snprintf( buf, buflen, "SHA256 - Read/write error in file" ); +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) - if( use_ret == -(POLARSSL_ERR_SHA4_FILE_IO_ERROR) ) - snprintf( buf, buflen, "SHA4 - Read/write error in file" ); -#endif /* POLARSSL_SHA4_C */ +#if defined(POLARSSL_SHA512_C) + if( use_ret == -(POLARSSL_ERR_SHA512_FILE_IO_ERROR) ) + snprintf( buf, buflen, "SHA512 - Read/write error in file" ); +#endif /* POLARSSL_SHA512_C */ #if defined(POLARSSL_XTEA_C) if( use_ret == -(POLARSSL_ERR_XTEA_INVALID_INPUT_LENGTH) ) diff --git a/library/md.c b/library/md.c index 07a93ec55..716c01611 100644 --- a/library/md.c +++ b/library/md.c @@ -58,12 +58,12 @@ static const int supported_digests[] = { POLARSSL_MD_SHA1, #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) POLARSSL_MD_SHA224, POLARSSL_MD_SHA256, #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) POLARSSL_MD_SHA384, POLARSSL_MD_SHA512, #endif @@ -98,13 +98,13 @@ const md_info_t *md_info_from_string( const char *md_name ) if( !strcasecmp( "SHA1", md_name ) || !strcasecmp( "SHA", md_name ) ) return md_info_from_type( POLARSSL_MD_SHA1 ); #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) if( !strcasecmp( "SHA224", md_name ) ) return md_info_from_type( POLARSSL_MD_SHA224 ); if( !strcasecmp( "SHA256", md_name ) ) return md_info_from_type( POLARSSL_MD_SHA256 ); #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) if( !strcasecmp( "SHA384", md_name ) ) return md_info_from_type( POLARSSL_MD_SHA384 ); if( !strcasecmp( "SHA512", md_name ) ) @@ -133,13 +133,13 @@ const md_info_t *md_info_from_type( md_type_t md_type ) case POLARSSL_MD_SHA1: return &sha1_info; #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) case POLARSSL_MD_SHA224: return &sha224_info; case POLARSSL_MD_SHA256: return &sha256_info; #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) case POLARSSL_MD_SHA384: return &sha384_info; case POLARSSL_MD_SHA512: diff --git a/library/md_wrap.c b/library/md_wrap.c index f98550fea..2621d222e 100644 --- a/library/md_wrap.c +++ b/library/md_wrap.c @@ -49,11 +49,11 @@ #include "polarssl/sha1.h" #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) #include "polarssl/sha2.h" #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) #include "polarssl/sha4.h" #endif @@ -400,33 +400,33 @@ const md_info_t sha1_info = { /* * Wrappers for generic message digests */ -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) static void sha224_starts_wrap( void *ctx ) { - sha2_starts( (sha2_context *) ctx, 1 ); + sha256_starts( (sha256_context *) ctx, 1 ); } static void sha224_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha2_update( (sha2_context *) ctx, input, ilen ); + sha256_update( (sha256_context *) ctx, input, ilen ); } static void sha224_finish_wrap( void *ctx, unsigned char *output ) { - sha2_finish( (sha2_context *) ctx, output ); + sha256_finish( (sha256_context *) ctx, output ); } static void sha224_wrap( const unsigned char *input, size_t ilen, unsigned char *output ) { - sha2( input, ilen, output, 1 ); + sha256( input, ilen, output, 1 ); } static int sha224_file_wrap( const char *path, unsigned char *output ) { #if defined(POLARSSL_FS_IO) - return sha2_file( path, output, 1 ); + return sha256_file( path, output, 1 ); #else ((void) path); ((void) output); @@ -436,34 +436,34 @@ static int sha224_file_wrap( const char *path, unsigned char *output ) static void sha224_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen ) { - sha2_hmac_starts( (sha2_context *) ctx, key, keylen, 1 ); + sha256_hmac_starts( (sha256_context *) ctx, key, keylen, 1 ); } static void sha224_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha2_hmac_update( (sha2_context *) ctx, input, ilen ); + sha256_hmac_update( (sha256_context *) ctx, input, ilen ); } static void sha224_hmac_finish_wrap( void *ctx, unsigned char *output ) { - sha2_hmac_finish( (sha2_context *) ctx, output ); + sha256_hmac_finish( (sha256_context *) ctx, output ); } static void sha224_hmac_reset_wrap( void *ctx ) { - sha2_hmac_reset( (sha2_context *) ctx ); + sha256_hmac_reset( (sha256_context *) ctx ); } static void sha224_hmac_wrap( const unsigned char *key, size_t keylen, const unsigned char *input, size_t ilen, unsigned char *output ) { - sha2_hmac( key, keylen, input, ilen, output, 1 ); + sha256_hmac( key, keylen, input, ilen, output, 1 ); } static void * sha224_ctx_alloc( void ) { - return malloc( sizeof( sha2_context ) ); + return malloc( sizeof( sha256_context ) ); } static void sha224_ctx_free( void *ctx ) @@ -473,7 +473,7 @@ static void sha224_ctx_free( void *ctx ) static void sha224_process_wrap( void *ctx, const unsigned char *data ) { - sha2_process( (sha2_context *) ctx, data ); + sha256_process( (sha256_context *) ctx, data ); } const md_info_t sha224_info = { @@ -497,29 +497,29 @@ const md_info_t sha224_info = { static void sha256_starts_wrap( void *ctx ) { - sha2_starts( (sha2_context *) ctx, 0 ); + sha256_starts( (sha256_context *) ctx, 0 ); } static void sha256_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha2_update( (sha2_context *) ctx, input, ilen ); + sha256_update( (sha256_context *) ctx, input, ilen ); } static void sha256_finish_wrap( void *ctx, unsigned char *output ) { - sha2_finish( (sha2_context *) ctx, output ); + sha256_finish( (sha256_context *) ctx, output ); } static void sha256_wrap( const unsigned char *input, size_t ilen, unsigned char *output ) { - sha2( input, ilen, output, 0 ); + sha256( input, ilen, output, 0 ); } static int sha256_file_wrap( const char *path, unsigned char *output ) { #if defined(POLARSSL_FS_IO) - return sha2_file( path, output, 0 ); + return sha256_file( path, output, 0 ); #else ((void) path); ((void) output); @@ -529,34 +529,34 @@ static int sha256_file_wrap( const char *path, unsigned char *output ) static void sha256_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen ) { - sha2_hmac_starts( (sha2_context *) ctx, key, keylen, 0 ); + sha256_hmac_starts( (sha256_context *) ctx, key, keylen, 0 ); } static void sha256_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha2_hmac_update( (sha2_context *) ctx, input, ilen ); + sha256_hmac_update( (sha256_context *) ctx, input, ilen ); } static void sha256_hmac_finish_wrap( void *ctx, unsigned char *output ) { - sha2_hmac_finish( (sha2_context *) ctx, output ); + sha256_hmac_finish( (sha256_context *) ctx, output ); } static void sha256_hmac_reset_wrap( void *ctx ) { - sha2_hmac_reset( (sha2_context *) ctx ); + sha256_hmac_reset( (sha256_context *) ctx ); } static void sha256_hmac_wrap( const unsigned char *key, size_t keylen, const unsigned char *input, size_t ilen, unsigned char *output ) { - sha2_hmac( key, keylen, input, ilen, output, 0 ); + sha256_hmac( key, keylen, input, ilen, output, 0 ); } static void * sha256_ctx_alloc( void ) { - return malloc( sizeof( sha2_context ) ); + return malloc( sizeof( sha256_context ) ); } static void sha256_ctx_free( void *ctx ) @@ -566,7 +566,7 @@ static void sha256_ctx_free( void *ctx ) static void sha256_process_wrap( void *ctx, const unsigned char *data ) { - sha2_process( (sha2_context *) ctx, data ); + sha256_process( (sha256_context *) ctx, data ); } const md_info_t sha256_info = { @@ -590,33 +590,33 @@ const md_info_t sha256_info = { #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) static void sha384_starts_wrap( void *ctx ) { - sha4_starts( (sha4_context *) ctx, 1 ); + sha512_starts( (sha512_context *) ctx, 1 ); } static void sha384_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha4_update( (sha4_context *) ctx, input, ilen ); + sha512_update( (sha512_context *) ctx, input, ilen ); } static void sha384_finish_wrap( void *ctx, unsigned char *output ) { - sha4_finish( (sha4_context *) ctx, output ); + sha512_finish( (sha512_context *) ctx, output ); } static void sha384_wrap( const unsigned char *input, size_t ilen, unsigned char *output ) { - sha4( input, ilen, output, 1 ); + sha512( input, ilen, output, 1 ); } static int sha384_file_wrap( const char *path, unsigned char *output ) { #if defined(POLARSSL_FS_IO) - return sha4_file( path, output, 1 ); + return sha512_file( path, output, 1 ); #else ((void) path); ((void) output); @@ -626,34 +626,34 @@ static int sha384_file_wrap( const char *path, unsigned char *output ) static void sha384_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen ) { - sha4_hmac_starts( (sha4_context *) ctx, key, keylen, 1 ); + sha512_hmac_starts( (sha512_context *) ctx, key, keylen, 1 ); } static void sha384_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha4_hmac_update( (sha4_context *) ctx, input, ilen ); + sha512_hmac_update( (sha512_context *) ctx, input, ilen ); } static void sha384_hmac_finish_wrap( void *ctx, unsigned char *output ) { - sha4_hmac_finish( (sha4_context *) ctx, output ); + sha512_hmac_finish( (sha512_context *) ctx, output ); } static void sha384_hmac_reset_wrap( void *ctx ) { - sha4_hmac_reset( (sha4_context *) ctx ); + sha512_hmac_reset( (sha512_context *) ctx ); } static void sha384_hmac_wrap( const unsigned char *key, size_t keylen, const unsigned char *input, size_t ilen, unsigned char *output ) { - sha4_hmac( key, keylen, input, ilen, output, 1 ); + sha512_hmac( key, keylen, input, ilen, output, 1 ); } static void * sha384_ctx_alloc( void ) { - return malloc( sizeof( sha4_context ) ); + return malloc( sizeof( sha512_context ) ); } static void sha384_ctx_free( void *ctx ) @@ -663,7 +663,7 @@ static void sha384_ctx_free( void *ctx ) static void sha384_process_wrap( void *ctx, const unsigned char *data ) { - sha4_process( (sha4_context *) ctx, data ); + sha512_process( (sha512_context *) ctx, data ); } const md_info_t sha384_info = { @@ -687,29 +687,29 @@ const md_info_t sha384_info = { static void sha512_starts_wrap( void *ctx ) { - sha4_starts( (sha4_context *) ctx, 0 ); + sha512_starts( (sha512_context *) ctx, 0 ); } static void sha512_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha4_update( (sha4_context *) ctx, input, ilen ); + sha512_update( (sha512_context *) ctx, input, ilen ); } static void sha512_finish_wrap( void *ctx, unsigned char *output ) { - sha4_finish( (sha4_context *) ctx, output ); + sha512_finish( (sha512_context *) ctx, output ); } static void sha512_wrap( const unsigned char *input, size_t ilen, unsigned char *output ) { - sha4( input, ilen, output, 0 ); + sha512( input, ilen, output, 0 ); } static int sha512_file_wrap( const char *path, unsigned char *output ) { #if defined(POLARSSL_FS_IO) - return sha4_file( path, output, 0 ); + return sha512_file( path, output, 0 ); #else ((void) path); ((void) output); @@ -719,34 +719,34 @@ static int sha512_file_wrap( const char *path, unsigned char *output ) static void sha512_hmac_starts_wrap( void *ctx, const unsigned char *key, size_t keylen ) { - sha4_hmac_starts( (sha4_context *) ctx, key, keylen, 0 ); + sha512_hmac_starts( (sha512_context *) ctx, key, keylen, 0 ); } static void sha512_hmac_update_wrap( void *ctx, const unsigned char *input, size_t ilen ) { - sha4_hmac_update( (sha4_context *) ctx, input, ilen ); + sha512_hmac_update( (sha512_context *) ctx, input, ilen ); } static void sha512_hmac_finish_wrap( void *ctx, unsigned char *output ) { - sha4_hmac_finish( (sha4_context *) ctx, output ); + sha512_hmac_finish( (sha512_context *) ctx, output ); } static void sha512_hmac_reset_wrap( void *ctx ) { - sha4_hmac_reset( (sha4_context *) ctx ); + sha512_hmac_reset( (sha512_context *) ctx ); } static void sha512_hmac_wrap( const unsigned char *key, size_t keylen, const unsigned char *input, size_t ilen, unsigned char *output ) { - sha4_hmac( key, keylen, input, ilen, output, 0 ); + sha512_hmac( key, keylen, input, ilen, output, 0 ); } static void * sha512_ctx_alloc( void ) { - return malloc( sizeof( sha4_context ) ); + return malloc( sizeof( sha512_context ) ); } static void sha512_ctx_free( void *ctx ) @@ -756,7 +756,7 @@ static void sha512_ctx_free( void *ctx ) static void sha512_process_wrap( void *ctx, const unsigned char *data ) { - sha4_process( (sha4_context *) ctx, data ); + sha512_process( (sha512_context *) ctx, data ); } const md_info_t sha512_info = { diff --git a/library/sha2.c b/library/sha2.c index 20772eca2..ffd00fcfc 100644 --- a/library/sha2.c +++ b/library/sha2.c @@ -30,7 +30,7 @@ #include "polarssl/config.h" -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) #include "polarssl/sha2.h" @@ -38,7 +38,7 @@ #include #endif -#if !defined(POLARSSL_SHA2_ALT) +#if !defined(POLARSSL_SHA256_ALT) /* * 32-bit integer manipulation macros (big endian) @@ -66,7 +66,7 @@ /* * SHA-256 context setup */ -void sha2_starts( sha2_context *ctx, int is224 ) +void sha256_starts( sha256_context *ctx, int is224 ) { ctx->total[0] = 0; ctx->total[1] = 0; @@ -99,7 +99,7 @@ void sha2_starts( sha2_context *ctx, int is224 ) ctx->is224 = is224; } -void sha2_process( sha2_context *ctx, const unsigned char data[64] ) +void sha256_process( sha256_context *ctx, const unsigned char data[64] ) { uint32_t temp1, temp2, W[64]; uint32_t A, B, C, D, E, F, G, H; @@ -233,7 +233,7 @@ void sha2_process( sha2_context *ctx, const unsigned char data[64] ) /* * SHA-256 process buffer */ -void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) +void sha256_update( sha256_context *ctx, const unsigned char *input, size_t ilen ) { size_t fill; uint32_t left; @@ -253,7 +253,7 @@ void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) if( left && ilen >= fill ) { memcpy( (void *) (ctx->buffer + left), input, fill ); - sha2_process( ctx, ctx->buffer ); + sha256_process( ctx, ctx->buffer ); input += fill; ilen -= fill; left = 0; @@ -261,7 +261,7 @@ void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) while( ilen >= 64 ) { - sha2_process( ctx, input ); + sha256_process( ctx, input ); input += 64; ilen -= 64; } @@ -270,7 +270,7 @@ void sha2_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) memcpy( (void *) (ctx->buffer + left), input, ilen ); } -static const unsigned char sha2_padding[64] = +static const unsigned char sha256_padding[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -281,7 +281,7 @@ static const unsigned char sha2_padding[64] = /* * SHA-256 final digest */ -void sha2_finish( sha2_context *ctx, unsigned char output[32] ) +void sha256_finish( sha256_context *ctx, unsigned char output[32] ) { uint32_t last, padn; uint32_t high, low; @@ -297,8 +297,8 @@ void sha2_finish( sha2_context *ctx, unsigned char output[32] ) last = ctx->total[0] & 0x3F; padn = ( last < 56 ) ? ( 56 - last ) : ( 120 - last ); - sha2_update( ctx, sha2_padding, padn ); - sha2_update( ctx, msglen, 8 ); + sha256_update( ctx, sha256_padding, padn ); + sha256_update( ctx, msglen, 8 ); PUT_UINT32_BE( ctx->state[0], output, 0 ); PUT_UINT32_BE( ctx->state[1], output, 4 ); @@ -312,50 +312,50 @@ void sha2_finish( sha2_context *ctx, unsigned char output[32] ) PUT_UINT32_BE( ctx->state[7], output, 28 ); } -#endif /* !POLARSSL_SHA2_ALT */ +#endif /* !POLARSSL_SHA256_ALT */ /* * output = SHA-256( input buffer ) */ -void sha2( const unsigned char *input, size_t ilen, - unsigned char output[32], int is224 ) +void sha256( const unsigned char *input, size_t ilen, + unsigned char output[32], int is224 ) { - sha2_context ctx; + sha256_context ctx; - sha2_starts( &ctx, is224 ); - sha2_update( &ctx, input, ilen ); - sha2_finish( &ctx, output ); + sha256_starts( &ctx, is224 ); + sha256_update( &ctx, input, ilen ); + sha256_finish( &ctx, output ); - memset( &ctx, 0, sizeof( sha2_context ) ); + memset( &ctx, 0, sizeof( sha256_context ) ); } #if defined(POLARSSL_FS_IO) /* * output = SHA-256( file contents ) */ -int sha2_file( const char *path, unsigned char output[32], int is224 ) +int sha256_file( const char *path, unsigned char output[32], int is224 ) { FILE *f; size_t n; - sha2_context ctx; + sha256_context ctx; unsigned char buf[1024]; if( ( f = fopen( path, "rb" ) ) == NULL ) - return( POLARSSL_ERR_SHA2_FILE_IO_ERROR ); + return( POLARSSL_ERR_SHA256_FILE_IO_ERROR ); - sha2_starts( &ctx, is224 ); + sha256_starts( &ctx, is224 ); while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) - sha2_update( &ctx, buf, n ); + sha256_update( &ctx, buf, n ); - sha2_finish( &ctx, output ); + sha256_finish( &ctx, output ); - memset( &ctx, 0, sizeof( sha2_context ) ); + memset( &ctx, 0, sizeof( sha256_context ) ); if( ferror( f ) != 0 ) { fclose( f ); - return( POLARSSL_ERR_SHA2_FILE_IO_ERROR ); + return( POLARSSL_ERR_SHA256_FILE_IO_ERROR ); } fclose( f ); @@ -366,15 +366,15 @@ int sha2_file( const char *path, unsigned char output[32], int is224 ) /* * SHA-256 HMAC context setup */ -void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keylen, - int is224 ) +void sha256_hmac_starts( sha256_context *ctx, const unsigned char *key, + size_t keylen, int is224 ) { size_t i; unsigned char sum[32]; if( keylen > 64 ) { - sha2( key, keylen, sum, is224 ); + sha256( key, keylen, sum, is224 ); keylen = ( is224 ) ? 28 : 32; key = sum; } @@ -388,8 +388,8 @@ void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keyle ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] ); } - sha2_starts( ctx, is224 ); - sha2_update( ctx, ctx->ipad, 64 ); + sha256_starts( ctx, is224 ); + sha256_update( ctx, ctx->ipad, 64 ); memset( sum, 0, sizeof( sum ) ); } @@ -397,15 +397,15 @@ void sha2_hmac_starts( sha2_context *ctx, const unsigned char *key, size_t keyle /* * SHA-256 HMAC process buffer */ -void sha2_hmac_update( sha2_context *ctx, const unsigned char *input, size_t ilen ) +void sha256_hmac_update( sha256_context *ctx, const unsigned char *input, size_t ilen ) { - sha2_update( ctx, input, ilen ); + sha256_update( ctx, input, ilen ); } /* * SHA-256 HMAC final digest */ -void sha2_hmac_finish( sha2_context *ctx, unsigned char output[32] ) +void sha256_hmac_finish( sha256_context *ctx, unsigned char output[32] ) { int is224, hlen; unsigned char tmpbuf[32]; @@ -413,11 +413,11 @@ void sha2_hmac_finish( sha2_context *ctx, unsigned char output[32] ) is224 = ctx->is224; hlen = ( is224 == 0 ) ? 32 : 28; - sha2_finish( ctx, tmpbuf ); - sha2_starts( ctx, is224 ); - sha2_update( ctx, ctx->opad, 64 ); - sha2_update( ctx, tmpbuf, hlen ); - sha2_finish( ctx, output ); + sha256_finish( ctx, tmpbuf ); + sha256_starts( ctx, is224 ); + sha256_update( ctx, ctx->opad, 64 ); + sha256_update( ctx, tmpbuf, hlen ); + sha256_finish( ctx, output ); memset( tmpbuf, 0, sizeof( tmpbuf ) ); } @@ -425,45 +425,45 @@ void sha2_hmac_finish( sha2_context *ctx, unsigned char output[32] ) /* * SHA-256 HMAC context reset */ -void sha2_hmac_reset( sha2_context *ctx ) +void sha256_hmac_reset( sha256_context *ctx ) { - sha2_starts( ctx, ctx->is224 ); - sha2_update( ctx, ctx->ipad, 64 ); + sha256_starts( ctx, ctx->is224 ); + sha256_update( ctx, ctx->ipad, 64 ); } /* * output = HMAC-SHA-256( hmac key, input buffer ) */ -void sha2_hmac( const unsigned char *key, size_t keylen, - const unsigned char *input, size_t ilen, - unsigned char output[32], int is224 ) +void sha256_hmac( const unsigned char *key, size_t keylen, + const unsigned char *input, size_t ilen, + unsigned char output[32], int is224 ) { - sha2_context ctx; + sha256_context ctx; - sha2_hmac_starts( &ctx, key, keylen, is224 ); - sha2_hmac_update( &ctx, input, ilen ); - sha2_hmac_finish( &ctx, output ); + sha256_hmac_starts( &ctx, key, keylen, is224 ); + sha256_hmac_update( &ctx, input, ilen ); + sha256_hmac_finish( &ctx, output ); - memset( &ctx, 0, sizeof( sha2_context ) ); + memset( &ctx, 0, sizeof( sha256_context ) ); } #if defined(POLARSSL_SELF_TEST) /* * FIPS-180-2 test vectors */ -static unsigned char sha2_test_buf[3][57] = +static unsigned char sha256_test_buf[3][57] = { { "abc" }, { "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq" }, { "" } }; -static const int sha2_test_buflen[3] = +static const int sha256_test_buflen[3] = { 3, 56, 1000 }; -static const unsigned char sha2_test_sum[6][32] = +static const unsigned char sha256_test_sum[6][32] = { /* * SHA-224 test vectors @@ -501,7 +501,7 @@ static const unsigned char sha2_test_sum[6][32] = /* * RFC 4231 test vectors */ -static unsigned char sha2_hmac_test_key[7][26] = +static unsigned char sha256_hmac_test_key[7][26] = { { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B" "\x0B\x0B\x0B\x0B" }, @@ -516,12 +516,12 @@ static unsigned char sha2_hmac_test_key[7][26] = { "" } }; -static const int sha2_hmac_test_keylen[7] = +static const int sha256_hmac_test_keylen[7] = { 20, 4, 20, 25, 20, 131, 131 }; -static unsigned char sha2_hmac_test_buf[7][153] = +static unsigned char sha256_hmac_test_buf[7][153] = { { "Hi There" }, { "what do ya want for nothing?" }, @@ -542,12 +542,12 @@ static unsigned char sha2_hmac_test_buf[7][153] = "be hashed before being used by the HMAC algorithm." } }; -static const int sha2_hmac_test_buflen[7] = +static const int sha256_hmac_test_buflen[7] = { 8, 28, 50, 50, 20, 54, 152 }; -static const unsigned char sha2_hmac_test_sum[14][32] = +static const unsigned char sha256_hmac_test_sum[14][32] = { /* * HMAC-SHA-224 test vectors @@ -613,12 +613,12 @@ static const unsigned char sha2_hmac_test_sum[14][32] = /* * Checkup routine */ -int sha2_self_test( int verbose ) +int sha256_self_test( int verbose ) { int i, j, k, buflen; unsigned char buf[1024]; - unsigned char sha2sum[32]; - sha2_context ctx; + unsigned char sha256sum[32]; + sha256_context ctx; for( i = 0; i < 6; i++ ) { @@ -628,22 +628,22 @@ int sha2_self_test( int verbose ) if( verbose != 0 ) printf( " SHA-%d test #%d: ", 256 - k * 32, j + 1 ); - sha2_starts( &ctx, k ); + sha256_starts( &ctx, k ); if( j == 2 ) { memset( buf, 'a', buflen = 1000 ); for( j = 0; j < 1000; j++ ) - sha2_update( &ctx, buf, buflen ); + sha256_update( &ctx, buf, buflen ); } else - sha2_update( &ctx, sha2_test_buf[j], - sha2_test_buflen[j] ); + sha256_update( &ctx, sha256_test_buf[j], + sha256_test_buflen[j] ); - sha2_finish( &ctx, sha2sum ); + sha256_finish( &ctx, sha256sum ); - if( memcmp( sha2sum, sha2_test_sum[i], 32 - k * 4 ) != 0 ) + if( memcmp( sha256sum, sha256_test_sum[i], 32 - k * 4 ) != 0 ) { if( verbose != 0 ) printf( "failed\n" ); @@ -669,20 +669,20 @@ int sha2_self_test( int verbose ) if( j == 5 || j == 6 ) { memset( buf, '\xAA', buflen = 131 ); - sha2_hmac_starts( &ctx, buf, buflen, k ); + sha256_hmac_starts( &ctx, buf, buflen, k ); } else - sha2_hmac_starts( &ctx, sha2_hmac_test_key[j], - sha2_hmac_test_keylen[j], k ); + sha256_hmac_starts( &ctx, sha256_hmac_test_key[j], + sha256_hmac_test_keylen[j], k ); - sha2_hmac_update( &ctx, sha2_hmac_test_buf[j], - sha2_hmac_test_buflen[j] ); + sha256_hmac_update( &ctx, sha256_hmac_test_buf[j], + sha256_hmac_test_buflen[j] ); - sha2_hmac_finish( &ctx, sha2sum ); + sha256_hmac_finish( &ctx, sha256sum ); buflen = ( j == 4 ) ? 16 : 32 - k * 4; - if( memcmp( sha2sum, sha2_hmac_test_sum[i], buflen ) != 0 ) + if( memcmp( sha256sum, sha256_hmac_test_sum[i], buflen ) != 0 ) { if( verbose != 0 ) printf( "failed\n" ); diff --git a/library/sha4.c b/library/sha4.c index 63d98099f..0710fab77 100644 --- a/library/sha4.c +++ b/library/sha4.c @@ -30,7 +30,7 @@ #include "polarssl/config.h" -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) #include "polarssl/sha4.h" @@ -38,7 +38,7 @@ #include #endif -#if !defined(POLARSSL_SHA4_ALT) +#if !defined(POLARSSL_SHA512_ALT) /* * 64-bit integer manipulation macros (big endian) @@ -121,7 +121,7 @@ static const uint64_t K[80] = /* * SHA-512 context setup */ -void sha4_starts( sha4_context *ctx, int is384 ) +void sha512_starts( sha512_context *ctx, int is384 ) { ctx->total[0] = 0; ctx->total[1] = 0; @@ -154,7 +154,7 @@ void sha4_starts( sha4_context *ctx, int is384 ) ctx->is384 = is384; } -void sha4_process( sha4_context *ctx, const unsigned char data[128] ) +void sha512_process( sha512_context *ctx, const unsigned char data[128] ) { int i; uint64_t temp1, temp2, W[80]; @@ -226,7 +226,7 @@ void sha4_process( sha4_context *ctx, const unsigned char data[128] ) /* * SHA-512 process buffer */ -void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen ) +void sha512_update( sha512_context *ctx, const unsigned char *input, size_t ilen ) { size_t fill; unsigned int left; @@ -245,7 +245,7 @@ void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen ) if( left && ilen >= fill ) { memcpy( (void *) (ctx->buffer + left), input, fill ); - sha4_process( ctx, ctx->buffer ); + sha512_process( ctx, ctx->buffer ); input += fill; ilen -= fill; left = 0; @@ -253,7 +253,7 @@ void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen ) while( ilen >= 128 ) { - sha4_process( ctx, input ); + sha512_process( ctx, input ); input += 128; ilen -= 128; } @@ -262,7 +262,7 @@ void sha4_update( sha4_context *ctx, const unsigned char *input, size_t ilen ) memcpy( (void *) (ctx->buffer + left), input, ilen ); } -static const unsigned char sha4_padding[128] = +static const unsigned char sha512_padding[128] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, @@ -277,7 +277,7 @@ static const unsigned char sha4_padding[128] = /* * SHA-512 final digest */ -void sha4_finish( sha4_context *ctx, unsigned char output[64] ) +void sha512_finish( sha512_context *ctx, unsigned char output[64] ) { size_t last, padn; uint64_t high, low; @@ -293,8 +293,8 @@ void sha4_finish( sha4_context *ctx, unsigned char output[64] ) last = (size_t)( ctx->total[0] & 0x7F ); padn = ( last < 112 ) ? ( 112 - last ) : ( 240 - last ); - sha4_update( ctx, sha4_padding, padn ); - sha4_update( ctx, msglen, 16 ); + sha512_update( ctx, sha512_padding, padn ); + sha512_update( ctx, msglen, 16 ); PUT_UINT64_BE( ctx->state[0], output, 0 ); PUT_UINT64_BE( ctx->state[1], output, 8 ); @@ -310,50 +310,50 @@ void sha4_finish( sha4_context *ctx, unsigned char output[64] ) } } -#endif /* !POLARSSL_SHA4_ALT */ +#endif /* !POLARSSL_SHA512_ALT */ /* * output = SHA-512( input buffer ) */ -void sha4( const unsigned char *input, size_t ilen, - unsigned char output[64], int is384 ) +void sha512( const unsigned char *input, size_t ilen, + unsigned char output[64], int is384 ) { - sha4_context ctx; + sha512_context ctx; - sha4_starts( &ctx, is384 ); - sha4_update( &ctx, input, ilen ); - sha4_finish( &ctx, output ); + sha512_starts( &ctx, is384 ); + sha512_update( &ctx, input, ilen ); + sha512_finish( &ctx, output ); - memset( &ctx, 0, sizeof( sha4_context ) ); + memset( &ctx, 0, sizeof( sha512_context ) ); } #if defined(POLARSSL_FS_IO) /* * output = SHA-512( file contents ) */ -int sha4_file( const char *path, unsigned char output[64], int is384 ) +int sha512_file( const char *path, unsigned char output[64], int is384 ) { FILE *f; size_t n; - sha4_context ctx; + sha512_context ctx; unsigned char buf[1024]; if( ( f = fopen( path, "rb" ) ) == NULL ) - return( POLARSSL_ERR_SHA4_FILE_IO_ERROR ); + return( POLARSSL_ERR_SHA512_FILE_IO_ERROR ); - sha4_starts( &ctx, is384 ); + sha512_starts( &ctx, is384 ); while( ( n = fread( buf, 1, sizeof( buf ), f ) ) > 0 ) - sha4_update( &ctx, buf, n ); + sha512_update( &ctx, buf, n ); - sha4_finish( &ctx, output ); + sha512_finish( &ctx, output ); - memset( &ctx, 0, sizeof( sha4_context ) ); + memset( &ctx, 0, sizeof( sha512_context ) ); if( ferror( f ) != 0 ) { fclose( f ); - return( POLARSSL_ERR_SHA4_FILE_IO_ERROR ); + return( POLARSSL_ERR_SHA512_FILE_IO_ERROR ); } fclose( f ); @@ -364,15 +364,15 @@ int sha4_file( const char *path, unsigned char output[64], int is384 ) /* * SHA-512 HMAC context setup */ -void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keylen, - int is384 ) +void sha512_hmac_starts( sha512_context *ctx, const unsigned char *key, + size_t keylen, int is384 ) { size_t i; unsigned char sum[64]; if( keylen > 128 ) { - sha4( key, keylen, sum, is384 ); + sha512( key, keylen, sum, is384 ); keylen = ( is384 ) ? 48 : 64; key = sum; } @@ -386,8 +386,8 @@ void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keyle ctx->opad[i] = (unsigned char)( ctx->opad[i] ^ key[i] ); } - sha4_starts( ctx, is384 ); - sha4_update( ctx, ctx->ipad, 128 ); + sha512_starts( ctx, is384 ); + sha512_update( ctx, ctx->ipad, 128 ); memset( sum, 0, sizeof( sum ) ); } @@ -395,16 +395,16 @@ void sha4_hmac_starts( sha4_context *ctx, const unsigned char *key, size_t keyle /* * SHA-512 HMAC process buffer */ -void sha4_hmac_update( sha4_context *ctx, - const unsigned char *input, size_t ilen ) +void sha512_hmac_update( sha512_context *ctx, + const unsigned char *input, size_t ilen ) { - sha4_update( ctx, input, ilen ); + sha512_update( ctx, input, ilen ); } /* * SHA-512 HMAC final digest */ -void sha4_hmac_finish( sha4_context *ctx, unsigned char output[64] ) +void sha512_hmac_finish( sha512_context *ctx, unsigned char output[64] ) { int is384, hlen; unsigned char tmpbuf[64]; @@ -412,11 +412,11 @@ void sha4_hmac_finish( sha4_context *ctx, unsigned char output[64] ) is384 = ctx->is384; hlen = ( is384 == 0 ) ? 64 : 48; - sha4_finish( ctx, tmpbuf ); - sha4_starts( ctx, is384 ); - sha4_update( ctx, ctx->opad, 128 ); - sha4_update( ctx, tmpbuf, hlen ); - sha4_finish( ctx, output ); + sha512_finish( ctx, tmpbuf ); + sha512_starts( ctx, is384 ); + sha512_update( ctx, ctx->opad, 128 ); + sha512_update( ctx, tmpbuf, hlen ); + sha512_finish( ctx, output ); memset( tmpbuf, 0, sizeof( tmpbuf ) ); } @@ -424,26 +424,26 @@ void sha4_hmac_finish( sha4_context *ctx, unsigned char output[64] ) /* * SHA-512 HMAC context reset */ -void sha4_hmac_reset( sha4_context *ctx ) +void sha512_hmac_reset( sha512_context *ctx ) { - sha4_starts( ctx, ctx->is384 ); - sha4_update( ctx, ctx->ipad, 128 ); + sha512_starts( ctx, ctx->is384 ); + sha512_update( ctx, ctx->ipad, 128 ); } /* * output = HMAC-SHA-512( hmac key, input buffer ) */ -void sha4_hmac( const unsigned char *key, size_t keylen, +void sha512_hmac( const unsigned char *key, size_t keylen, const unsigned char *input, size_t ilen, unsigned char output[64], int is384 ) { - sha4_context ctx; + sha512_context ctx; - sha4_hmac_starts( &ctx, key, keylen, is384 ); - sha4_hmac_update( &ctx, input, ilen ); - sha4_hmac_finish( &ctx, output ); + sha512_hmac_starts( &ctx, key, keylen, is384 ); + sha512_hmac_update( &ctx, input, ilen ); + sha512_hmac_finish( &ctx, output ); - memset( &ctx, 0, sizeof( sha4_context ) ); + memset( &ctx, 0, sizeof( sha512_context ) ); } #if defined(POLARSSL_SELF_TEST) @@ -451,7 +451,7 @@ void sha4_hmac( const unsigned char *key, size_t keylen, /* * FIPS-180-2 test vectors */ -static unsigned char sha4_test_buf[3][113] = +static unsigned char sha512_test_buf[3][113] = { { "abc" }, { "abcdefghbcdefghicdefghijdefghijkefghijklfghijklmghijklmn" @@ -459,12 +459,12 @@ static unsigned char sha4_test_buf[3][113] = { "" } }; -static const int sha4_test_buflen[3] = +static const int sha512_test_buflen[3] = { 3, 112, 1000 }; -static const unsigned char sha4_test_sum[6][64] = +static const unsigned char sha512_test_sum[6][64] = { /* * SHA-384 test vectors @@ -520,7 +520,7 @@ static const unsigned char sha4_test_sum[6][64] = /* * RFC 4231 test vectors */ -static unsigned char sha4_hmac_test_key[7][26] = +static unsigned char sha512_hmac_test_key[7][26] = { { "\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B\x0B" "\x0B\x0B\x0B\x0B" }, @@ -535,12 +535,12 @@ static unsigned char sha4_hmac_test_key[7][26] = { "" } }; -static const int sha4_hmac_test_keylen[7] = +static const int sha512_hmac_test_keylen[7] = { 20, 4, 20, 25, 20, 131, 131 }; -static unsigned char sha4_hmac_test_buf[7][153] = +static unsigned char sha512_hmac_test_buf[7][153] = { { "Hi There" }, { "what do ya want for nothing?" }, @@ -561,12 +561,12 @@ static unsigned char sha4_hmac_test_buf[7][153] = "be hashed before being used by the HMAC algorithm." } }; -static const int sha4_hmac_test_buflen[7] = +static const int sha512_hmac_test_buflen[7] = { 8, 28, 50, 50, 20, 54, 152 }; -static const unsigned char sha4_hmac_test_sum[14][64] = +static const unsigned char sha512_hmac_test_sum[14][64] = { /* * HMAC-SHA-384 test vectors @@ -668,12 +668,12 @@ static const unsigned char sha4_hmac_test_sum[14][64] = /* * Checkup routine */ -int sha4_self_test( int verbose ) +int sha512_self_test( int verbose ) { int i, j, k, buflen; unsigned char buf[1024]; - unsigned char sha4sum[64]; - sha4_context ctx; + unsigned char sha512sum[64]; + sha512_context ctx; for( i = 0; i < 6; i++ ) { @@ -683,22 +683,22 @@ int sha4_self_test( int verbose ) if( verbose != 0 ) printf( " SHA-%d test #%d: ", 512 - k * 128, j + 1 ); - sha4_starts( &ctx, k ); + sha512_starts( &ctx, k ); if( j == 2 ) { memset( buf, 'a', buflen = 1000 ); for( j = 0; j < 1000; j++ ) - sha4_update( &ctx, buf, buflen ); + sha512_update( &ctx, buf, buflen ); } else - sha4_update( &ctx, sha4_test_buf[j], - sha4_test_buflen[j] ); + sha512_update( &ctx, sha512_test_buf[j], + sha512_test_buflen[j] ); - sha4_finish( &ctx, sha4sum ); + sha512_finish( &ctx, sha512sum ); - if( memcmp( sha4sum, sha4_test_sum[i], 64 - k * 16 ) != 0 ) + if( memcmp( sha512sum, sha512_test_sum[i], 64 - k * 16 ) != 0 ) { if( verbose != 0 ) printf( "failed\n" ); @@ -724,20 +724,20 @@ int sha4_self_test( int verbose ) if( j == 5 || j == 6 ) { memset( buf, '\xAA', buflen = 131 ); - sha4_hmac_starts( &ctx, buf, buflen, k ); + sha512_hmac_starts( &ctx, buf, buflen, k ); } else - sha4_hmac_starts( &ctx, sha4_hmac_test_key[j], - sha4_hmac_test_keylen[j], k ); + sha512_hmac_starts( &ctx, sha512_hmac_test_key[j], + sha512_hmac_test_keylen[j], k ); - sha4_hmac_update( &ctx, sha4_hmac_test_buf[j], - sha4_hmac_test_buflen[j] ); + sha512_hmac_update( &ctx, sha512_hmac_test_buf[j], + sha512_hmac_test_buflen[j] ); - sha4_hmac_finish( &ctx, sha4sum ); + sha512_hmac_finish( &ctx, sha512sum ); buflen = ( j == 4 ) ? 16 : 64 - k * 16; - if( memcmp( sha4sum, sha4_hmac_test_sum[i], buflen ) != 0 ) + if( memcmp( sha512sum, sha512_hmac_test_sum[i], buflen ) != 0 ) { if( verbose != 0 ) printf( "failed\n" ); diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c index 347fe8085..17fe35f25 100644 --- a/library/ssl_ciphersuites.c +++ b/library/ssl_ciphersuites.c @@ -161,7 +161,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_1, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, POLARSSL_CIPHERSUITE_EC }, -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256, "TLS-ECDHE-RSA-WITH-AES-128-CBC-SHA256", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, @@ -174,8 +174,8 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, POLARSSL_CIPHERSUITE_EC }, #endif /* POLARSSL_GCM_C */ -#endif /* POLARSSL_SHA2_C */ -#if defined(POLARSSL_SHA4_C) +#endif /* POLARSSL_SHA256_C */ +#if defined(POLARSSL_SHA512_C) { TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384, "TLS-ECDHE-RSA-WITH-AES-256-CBC-SHA384", POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, @@ -188,24 +188,24 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, POLARSSL_CIPHERSUITE_EC }, #endif /* POLARSSL_GCM_C */ -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ #endif /* POLARSSL_AES_C */ #if defined(POLARSSL_CAMELLIA_C) -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_ECDHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-ECDHE-RSA-WITH-CAMELLIA-128-CBC-SHA256", POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_ECDHE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, POLARSSL_CIPHERSUITE_EC }, -#endif /* POLARSSL_SHA2_C */ -#if defined(POLARSSL_SHA4_C) +#endif /* POLARSSL_SHA256_C */ +#if defined(POLARSSL_SHA512_C) { TLS_ECDHE_RSA_WITH_CAMELLIA_256_CBC_SHA384, "TLS-ECDHE-RSA-WITH-CAMELLIA-256-CBC-SHA384", POLARSSL_CIPHER_CAMELLIA_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_ECDHE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, POLARSSL_CIPHERSUITE_EC }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ #endif /* POLARSSL_CAMELLIA_C */ #if defined(POLARSSL_DES_C) @@ -235,15 +235,15 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #if defined(POLARSSL_KEY_EXCHANGE_DHE_RSA_ENABLED) #if defined(POLARSSL_AES_C) -#if defined(POLARSSL_SHA4_C) && defined(POLARSSL_GCM_C) +#if defined(POLARSSL_SHA512_C) && defined(POLARSSL_GCM_C) { TLS_DHE_RSA_WITH_AES_256_GCM_SHA384, "TLS-DHE-RSA-WITH-AES-256-GCM-SHA384", POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C && POLARSSL_GCM_C */ +#endif /* POLARSSL_SHA512_C && POLARSSL_GCM_C */ -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) #if defined(POLARSSL_GCM_C) { TLS_DHE_RSA_WITH_AES_128_GCM_SHA256, "TLS-DHE-RSA-WITH-AES-128-GCM-SHA256", POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA, @@ -263,7 +263,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ { TLS_DHE_RSA_WITH_AES_128_CBC_SHA, "TLS-DHE-RSA-WITH-AES-128-CBC-SHA", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA, @@ -279,7 +279,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #endif /* POLARSSL_AES_C */ #if defined(POLARSSL_CAMELLIA_C) -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA256", POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, @@ -291,7 +291,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ { TLS_DHE_RSA_WITH_CAMELLIA_128_CBC_SHA, "TLS-DHE-RSA-WITH-CAMELLIA-128-CBC-SHA", POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_RSA, @@ -317,15 +317,15 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #if defined(POLARSSL_KEY_EXCHANGE_RSA_ENABLED) #if defined(POLARSSL_AES_C) -#if defined(POLARSSL_SHA4_C) && defined(POLARSSL_GCM_C) +#if defined(POLARSSL_SHA512_C) && defined(POLARSSL_GCM_C) { TLS_RSA_WITH_AES_256_GCM_SHA384, "TLS-RSA-WITH-AES-256-GCM-SHA384", POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C && POLARSSL_GCM_C */ +#endif /* POLARSSL_SHA512_C && POLARSSL_GCM_C */ -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) #if defined(POLARSSL_GCM_C) { TLS_RSA_WITH_AES_128_GCM_SHA256, "TLS-RSA-WITH-AES-128-GCM-SHA256", POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA, @@ -345,7 +345,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ { TLS_RSA_WITH_AES_128_CBC_SHA, "TLS-RSA-WITH-AES-128-CBC-SHA", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA, @@ -361,7 +361,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #endif /* POLARSSL_AES_C */ #if defined(POLARSSL_CAMELLIA_C) -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_RSA_WITH_CAMELLIA_128_CBC_SHA256, "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA256", POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, @@ -373,7 +373,7 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ { TLS_RSA_WITH_CAMELLIA_128_CBC_SHA, "TLS-RSA-WITH-CAMELLIA-128-CBC-SHA", POLARSSL_CIPHER_CAMELLIA_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA, @@ -414,38 +414,38 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #if defined(POLARSSL_KEY_EXCHANGE_PSK_ENABLED) #if defined(POLARSSL_AES_C) #if defined(POLARSSL_GCM_C) -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_PSK_WITH_AES_128_GCM_SHA256, "TLS-PSK-WITH-AES-128-GCM-SHA256", POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) { TLS_PSK_WITH_AES_256_GCM_SHA384, "TLS-PSK-WITH-AES-256-GCM-SHA384", POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ #endif /* POLARSSL_GCM_C */ -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_PSK_WITH_AES_128_CBC_SHA256, "TLS-PSK-WITH-AES-128-CBC-SHA256", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) { TLS_PSK_WITH_AES_256_CBC_SHA384, "TLS-PSK-WITH-AES-256-CBC-SHA384", POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ { TLS_PSK_WITH_AES_128_CBC_SHA, "TLS-PSK-WITH-AES-128-CBC-SHA", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_PSK, @@ -480,38 +480,38 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #if defined(POLARSSL_KEY_EXCHANGE_DHE_PSK_ENABLED) #if defined(POLARSSL_AES_C) #if defined(POLARSSL_GCM_C) -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_DHE_PSK_WITH_AES_128_GCM_SHA256, "TLS-DHE-PSK-WITH-AES-128-GCM-SHA256", POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) { TLS_DHE_PSK_WITH_AES_256_GCM_SHA384, "TLS-DHE-PSK-WITH-AES-256-GCM-SHA384", POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ #endif /* POLARSSL_GCM_C */ -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_DHE_PSK_WITH_AES_128_CBC_SHA256, "TLS-DHE-PSK-WITH-AES-128-CBC-SHA256", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_DHE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) { TLS_DHE_PSK_WITH_AES_256_CBC_SHA384, "TLS-DHE-PSK-WITH-AES-256-CBC-SHA384", POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_DHE_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ { TLS_DHE_PSK_WITH_AES_128_CBC_SHA, "TLS-DHE-PSK-WITH-AES-128-CBC-SHA", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_DHE_PSK, @@ -546,38 +546,38 @@ static const ssl_ciphersuite_t ciphersuite_definitions[] = #if defined(POLARSSL_KEY_EXCHANGE_RSA_PSK_ENABLED) #if defined(POLARSSL_AES_C) #if defined(POLARSSL_GCM_C) -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_RSA_PSK_WITH_AES_128_GCM_SHA256, "TLS-RSA-PSK-WITH-AES-128-GCM-SHA256", POLARSSL_CIPHER_AES_128_GCM, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) { TLS_RSA_PSK_WITH_AES_256_GCM_SHA384, "TLS-RSA-PSK-WITH-AES-256-GCM-SHA384", POLARSSL_CIPHER_AES_256_GCM, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ #endif /* POLARSSL_GCM_C */ -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) { TLS_RSA_PSK_WITH_AES_128_CBC_SHA256, "TLS-RSA-PSK-WITH-AES-128-CBC-SHA256", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA256, POLARSSL_KEY_EXCHANGE_RSA_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA2_C */ +#endif /* POLARSSL_SHA256_C */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) { TLS_RSA_PSK_WITH_AES_256_CBC_SHA384, "TLS-RSA-PSK-WITH-AES-256-CBC-SHA384", POLARSSL_CIPHER_AES_256_CBC, POLARSSL_MD_SHA384, POLARSSL_KEY_EXCHANGE_RSA_PSK, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, SSL_MAJOR_VERSION_3, SSL_MINOR_VERSION_3, 0 }, -#endif /* POLARSSL_SHA4_C */ +#endif /* POLARSSL_SHA512_C */ { TLS_RSA_PSK_WITH_AES_128_CBC_SHA, "TLS-RSA-PSK-WITH-AES-128-CBC-SHA", POLARSSL_CIPHER_AES_128_CBC, POLARSSL_MD_SHA1, POLARSSL_KEY_EXCHANGE_RSA_PSK, diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 96fba23e4..93d81a6c3 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -130,13 +130,13 @@ static void ssl_write_signature_algorithms_ext( ssl_context *ssl, /* * Prepare signature_algorithms extension (TLS 1.2) */ -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) sig_alg_list[sig_alg_len++] = SSL_HASH_SHA512; sig_alg_list[sig_alg_len++] = SSL_SIG_RSA; sig_alg_list[sig_alg_len++] = SSL_HASH_SHA384; sig_alg_list[sig_alg_len++] = SSL_SIG_RSA; #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) sig_alg_list[sig_alg_len++] = SSL_HASH_SHA256; sig_alg_list[sig_alg_len++] = SSL_SIG_RSA; sig_alg_list[sig_alg_len++] = SSL_HASH_SHA224; @@ -892,7 +892,7 @@ static int ssl_parse_signature_algorithm( ssl_context *ssl, *md_alg = POLARSSL_MD_SHA1; break; #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) case SSL_HASH_SHA224: *md_alg = POLARSSL_MD_SHA224; break; @@ -900,7 +900,7 @@ static int ssl_parse_signature_algorithm( ssl_context *ssl, *md_alg = POLARSSL_MD_SHA256; break; #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) case SSL_HASH_SHA384: *md_alg = POLARSSL_MD_SHA384; break; diff --git a/library/ssl_srv.c b/library/ssl_srv.c index 0c18f0d57..2bf372526 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c @@ -149,7 +149,7 @@ static int ssl_parse_signature_algorithms_ext( ssl_context *ssl, p += 2; continue; } -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) if( p[0] == SSL_HASH_SHA512 ) { ssl->handshake->sig_alg = SSL_HASH_SHA512; @@ -161,7 +161,7 @@ static int ssl_parse_signature_algorithms_ext( ssl_context *ssl, break; } #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) if( p[0] == SSL_HASH_SHA256 ) { ssl->handshake->sig_alg = SSL_HASH_SHA256; @@ -1380,7 +1380,7 @@ static int ssl_write_server_key_exchange( ssl_context *ssl ) md_alg = POLARSSL_MD_SHA1; break; #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) case SSL_HASH_SHA224: md_alg = POLARSSL_MD_SHA224; break; @@ -1388,7 +1388,7 @@ static int ssl_write_server_key_exchange( ssl_context *ssl ) md_alg = POLARSSL_MD_SHA256; break; #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) case SSL_HASH_SHA384: md_alg = POLARSSL_MD_SHA384; break; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index c6a45d954..6eeafc736 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -223,12 +223,12 @@ static int tls_prf_sha256( const unsigned char *secret, size_t slen, /* * Compute P_(secret, label + random)[0..dlen] */ - sha2_hmac( secret, slen, tmp + 32, nb, tmp, 0 ); + sha256_hmac( secret, slen, tmp + 32, nb, tmp, 0 ); for( i = 0; i < dlen; i += 32 ) { - sha2_hmac( secret, slen, tmp, 32 + nb, h_i, 0 ); - sha2_hmac( secret, slen, tmp, 32, tmp, 0 ); + sha256_hmac( secret, slen, tmp, 32 + nb, h_i, 0 ); + sha256_hmac( secret, slen, tmp, 32, tmp, 0 ); k = ( i + 32 > dlen ) ? dlen % 32 : 32; @@ -242,7 +242,7 @@ static int tls_prf_sha256( const unsigned char *secret, size_t slen, return( 0 ); } -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) static int tls_prf_sha384( const unsigned char *secret, size_t slen, const char *label, const unsigned char *random, size_t rlen, @@ -264,12 +264,12 @@ static int tls_prf_sha384( const unsigned char *secret, size_t slen, /* * Compute P_(secret, label + random)[0..dlen] */ - sha4_hmac( secret, slen, tmp + 48, nb, tmp, 1 ); + sha512_hmac( secret, slen, tmp + 48, nb, tmp, 1 ); for( i = 0; i < dlen; i += 48 ) { - sha4_hmac( secret, slen, tmp, 48 + nb, h_i, 1 ); - sha4_hmac( secret, slen, tmp, 48, tmp, 1 ); + sha512_hmac( secret, slen, tmp, 48 + nb, h_i, 1 ); + sha512_hmac( secret, slen, tmp, 48, tmp, 1 ); k = ( i + 48 > dlen ) ? dlen % 48 : 48; @@ -296,7 +296,7 @@ static void ssl_calc_finished_ssl(ssl_context *,unsigned char *,int); static void ssl_calc_finished_tls(ssl_context *,unsigned char *,int); static void ssl_calc_finished_tls_sha256(ssl_context *,unsigned char *,int); -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) static void ssl_update_checksum_sha384(ssl_context *, const unsigned char *, size_t); static void ssl_calc_verify_tls_sha384(ssl_context *,unsigned char *); static void ssl_calc_finished_tls_sha384(ssl_context *,unsigned char *,int); @@ -351,7 +351,7 @@ int ssl_derive_keys( ssl_context *ssl ) handshake->calc_verify = ssl_calc_verify_tls; handshake->calc_finished = ssl_calc_finished_tls; } -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) else if( transform->ciphersuite_info->mac == POLARSSL_MD_SHA384 ) { @@ -681,12 +681,12 @@ void ssl_calc_verify_tls( ssl_context *ssl, unsigned char hash[36] ) void ssl_calc_verify_tls_sha256( ssl_context *ssl, unsigned char hash[32] ) { - sha2_context sha2; + sha256_context sha256; SSL_DEBUG_MSG( 2, ( "=> calc verify sha256" ) ); - memcpy( &sha2, &ssl->handshake->fin_sha2, sizeof(sha2_context) ); - sha2_finish( &sha2, hash ); + memcpy( &sha256, &ssl->handshake->fin_sha256, sizeof(sha256_context) ); + sha256_finish( &sha256, hash ); SSL_DEBUG_BUF( 3, "calculated verify result", hash, 32 ); SSL_DEBUG_MSG( 2, ( "<= calc verify" ) ); @@ -694,15 +694,15 @@ void ssl_calc_verify_tls_sha256( ssl_context *ssl, unsigned char hash[32] ) return; } -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) void ssl_calc_verify_tls_sha384( ssl_context *ssl, unsigned char hash[48] ) { - sha4_context sha4; + sha512_context sha512; SSL_DEBUG_MSG( 2, ( "=> calc verify sha384" ) ); - memcpy( &sha4, &ssl->handshake->fin_sha4, sizeof(sha4_context) ); - sha4_finish( &sha4, hash ); + memcpy( &sha512, &ssl->handshake->fin_sha512, sizeof(sha512_context) ); + sha512_finish( &sha512, hash ); SSL_DEBUG_BUF( 3, "calculated verify result", hash, 48 ); SSL_DEBUG_MSG( 2, ( "<= calc verify" ) ); @@ -2217,13 +2217,13 @@ int ssl_parse_change_cipher_spec( ssl_context *ssl ) void ssl_optimize_checksum( ssl_context *ssl, const ssl_ciphersuite_t *ciphersuite_info ) { -#if !defined(POLARSSL_SHA4_C) +#if !defined(POLARSSL_SHA512_C) ((void) ciphersuite); #endif if( ssl->minor_ver < SSL_MINOR_VERSION_3 ) ssl->handshake->update_checksum = ssl_update_checksum_md5sha1; -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) else if( ciphersuite_info->mac == POLARSSL_MD_SHA384 ) { ssl->handshake->update_checksum = ssl_update_checksum_sha384; @@ -2238,9 +2238,9 @@ static void ssl_update_checksum_start( ssl_context *ssl, { md5_update( &ssl->handshake->fin_md5 , buf, len ); sha1_update( &ssl->handshake->fin_sha1, buf, len ); - sha2_update( &ssl->handshake->fin_sha2, buf, len ); -#if defined(POLARSSL_SHA4_C) - sha4_update( &ssl->handshake->fin_sha4, buf, len ); + sha256_update( &ssl->handshake->fin_sha256, buf, len ); +#if defined(POLARSSL_SHA512_C) + sha512_update( &ssl->handshake->fin_sha512, buf, len ); #endif } @@ -2254,14 +2254,14 @@ static void ssl_update_checksum_md5sha1( ssl_context *ssl, static void ssl_update_checksum_sha256( ssl_context *ssl, const unsigned char *buf, size_t len ) { - sha2_update( &ssl->handshake->fin_sha2, buf, len ); + sha256_update( &ssl->handshake->fin_sha256, buf, len ); } -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) static void ssl_update_checksum_sha384( ssl_context *ssl, const unsigned char *buf, size_t len ) { - sha4_update( &ssl->handshake->fin_sha4, buf, len ); + sha512_update( &ssl->handshake->fin_sha512, buf, len ); } #endif @@ -2404,7 +2404,7 @@ static void ssl_calc_finished_tls_sha256( { int len = 12; const char *sender; - sha2_context sha2; + sha256_context sha256; unsigned char padbuf[32]; ssl_session *session = ssl->session_negotiate; @@ -2413,7 +2413,7 @@ static void ssl_calc_finished_tls_sha256( SSL_DEBUG_MSG( 2, ( "=> calc finished tls sha256" ) ); - memcpy( &sha2, &ssl->handshake->fin_sha2, sizeof(sha2_context) ); + memcpy( &sha256, &ssl->handshake->fin_sha256, sizeof(sha256_context) ); /* * TLSv1.2: @@ -2421,36 +2421,36 @@ static void ssl_calc_finished_tls_sha256( * Hash( handshake ) )[0.11] */ -#if !defined(POLARSSL_SHA2_ALT) +#if !defined(POLARSSL_SHA256_ALT) SSL_DEBUG_BUF( 4, "finished sha2 state", (unsigned char *) - sha2.state, sizeof( sha2.state ) ); + sha256.state, sizeof( sha256.state ) ); #endif sender = ( from == SSL_IS_CLIENT ) ? "client finished" : "server finished"; - sha2_finish( &sha2, padbuf ); + sha256_finish( &sha256, padbuf ); ssl->handshake->tls_prf( session->master, 48, sender, padbuf, 32, buf, len ); SSL_DEBUG_BUF( 3, "calc finished result", buf, len ); - memset( &sha2, 0, sizeof( sha2_context ) ); + memset( &sha256, 0, sizeof( sha256_context ) ); memset( padbuf, 0, sizeof( padbuf ) ); SSL_DEBUG_MSG( 2, ( "<= calc finished" ) ); } -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) static void ssl_calc_finished_tls_sha384( ssl_context *ssl, unsigned char *buf, int from ) { int len = 12; const char *sender; - sha4_context sha4; + sha512_context sha512; unsigned char padbuf[48]; ssl_session *session = ssl->session_negotiate; @@ -2459,7 +2459,7 @@ static void ssl_calc_finished_tls_sha384( SSL_DEBUG_MSG( 2, ( "=> calc finished tls sha384" ) ); - memcpy( &sha4, &ssl->handshake->fin_sha4, sizeof(sha4_context) ); + memcpy( &sha512, &ssl->handshake->fin_sha512, sizeof(sha512_context) ); /* * TLSv1.2: @@ -2467,23 +2467,23 @@ static void ssl_calc_finished_tls_sha384( * Hash( handshake ) )[0.11] */ -#if !defined(POLARSSL_SHA4_ALT) - SSL_DEBUG_BUF( 4, "finished sha4 state", (unsigned char *) - sha4.state, sizeof( sha4.state ) ); +#if !defined(POLARSSL_SHA512_ALT) + SSL_DEBUG_BUF( 4, "finished sha512 state", (unsigned char *) + sha512.state, sizeof( sha512.state ) ); #endif sender = ( from == SSL_IS_CLIENT ) ? "client finished" : "server finished"; - sha4_finish( &sha4, padbuf ); + sha512_finish( &sha512, padbuf ); ssl->handshake->tls_prf( session->master, 48, sender, padbuf, 48, buf, len ); SSL_DEBUG_BUF( 3, "calc finished result", buf, len ); - memset( &sha4, 0, sizeof( sha4_context ) ); + memset( &sha512, 0, sizeof( sha512_context ) ); memset( padbuf, 0, sizeof( padbuf ) ); @@ -2724,9 +2724,9 @@ static int ssl_handshake_init( ssl_context *ssl ) md5_starts( &ssl->handshake->fin_md5 ); sha1_starts( &ssl->handshake->fin_sha1 ); - sha2_starts( &ssl->handshake->fin_sha2, 0 ); -#if defined(POLARSSL_SHA4_C) - sha4_starts( &ssl->handshake->fin_sha4, 1 ); + sha256_starts( &ssl->handshake->fin_sha256, 0 ); +#if defined(POLARSSL_SHA512_C) + sha512_starts( &ssl->handshake->fin_sha512, 1 ); #endif ssl->handshake->update_checksum = ssl_update_checksum_start; diff --git a/library/x509parse.c b/library/x509parse.c index c49c48adb..6e37a8549 100644 --- a/library/x509parse.c +++ b/library/x509parse.c @@ -55,10 +55,10 @@ #if defined(POLARSSL_SHA1_C) #include "polarssl/sha1.h" #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) #include "polarssl/sha2.h" #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) #include "polarssl/sha4.h" #endif #include "polarssl/dhm.h" diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c index 1bc657414..e9207ef77 100644 --- a/programs/aes/aescrypt2.c +++ b/programs/aes/aescrypt2.c @@ -1,7 +1,7 @@ /* * AES-256 file encryption program * - * Copyright (C) 2006-2011, Brainspark B.V. + * Copyright (C) 2006-2013, Brainspark B.V. * * This file is part of PolarSSL (http://www.polarssl.org) * Lead Maintainer: Paul Bakker @@ -56,12 +56,12 @@ "\n example: aescrypt2 0 file file.aes hex:E76B2413958B00E193\n" \ "\n" -#if !defined(POLARSSL_AES_C) || !defined(POLARSSL_SHA2_C) +#if !defined(POLARSSL_AES_C) || !defined(POLARSSL_SHA256_C) int main( int argc, char *argv[] ) { ((void) argc); ((void) argv); - printf("POLARSSL_AES_C and/or POLARSSL_SHA2_C not defined.\n"); + printf("POLARSSL_AES_C and/or POLARSSL_SHA256_C not defined.\n"); return( 0 ); } #else @@ -81,7 +81,7 @@ int main( int argc, char *argv[] ) unsigned char buffer[1024]; aes_context aes_ctx; - sha2_context sha_ctx; + sha256_context sha_ctx; #if defined(_WIN32_WCE) long filesize, offset; @@ -213,10 +213,10 @@ int main( int argc, char *argv[] ) p = argv[2]; - sha2_starts( &sha_ctx, 0 ); - sha2_update( &sha_ctx, buffer, 8 ); - sha2_update( &sha_ctx, (unsigned char *) p, strlen( p ) ); - sha2_finish( &sha_ctx, digest ); + sha256_starts( &sha_ctx, 0 ); + sha256_update( &sha_ctx, buffer, 8 ); + sha256_update( &sha_ctx, (unsigned char *) p, strlen( p ) ); + sha256_finish( &sha_ctx, digest ); memcpy( IV, digest, 16 ); @@ -247,15 +247,15 @@ int main( int argc, char *argv[] ) for( i = 0; i < 8192; i++ ) { - sha2_starts( &sha_ctx, 0 ); - sha2_update( &sha_ctx, digest, 32 ); - sha2_update( &sha_ctx, key, keylen ); - sha2_finish( &sha_ctx, digest ); + sha256_starts( &sha_ctx, 0 ); + sha256_update( &sha_ctx, digest, 32 ); + sha256_update( &sha_ctx, key, keylen ); + sha256_finish( &sha_ctx, digest ); } memset( key, 0, sizeof( key ) ); - aes_setkey_enc( &aes_ctx, digest, 256 ); - sha2_hmac_starts( &sha_ctx, digest, 32, 0 ); + aes_setkey_enc( &aes_ctx, digest, 256 ); + sha256_hmac_starts( &sha_ctx, digest, 32, 0 ); /* * Encrypt and write the ciphertext. @@ -275,7 +275,7 @@ int main( int argc, char *argv[] ) buffer[i] = (unsigned char)( buffer[i] ^ IV[i] ); aes_crypt_ecb( &aes_ctx, AES_ENCRYPT, buffer, buffer ); - sha2_hmac_update( &sha_ctx, buffer, 16 ); + sha256_hmac_update( &sha_ctx, buffer, 16 ); if( fwrite( buffer, 1, 16, fout ) != 16 ) { @@ -289,7 +289,7 @@ int main( int argc, char *argv[] ) /* * Finally write the HMAC. */ - sha2_hmac_finish( &sha_ctx, digest ); + sha256_hmac_finish( &sha_ctx, digest ); if( fwrite( digest, 1, 32, fout ) != 32 ) { @@ -349,15 +349,15 @@ int main( int argc, char *argv[] ) for( i = 0; i < 8192; i++ ) { - sha2_starts( &sha_ctx, 0 ); - sha2_update( &sha_ctx, digest, 32 ); - sha2_update( &sha_ctx, key, keylen ); - sha2_finish( &sha_ctx, digest ); + sha256_starts( &sha_ctx, 0 ); + sha256_update( &sha_ctx, digest, 32 ); + sha256_update( &sha_ctx, key, keylen ); + sha256_finish( &sha_ctx, digest ); } memset( key, 0, sizeof( key ) ); aes_setkey_dec( &aes_ctx, digest, 256 ); - sha2_hmac_starts( &sha_ctx, digest, 32, 0 ); + sha256_hmac_starts( &sha_ctx, digest, 32, 0 ); /* * Decrypt and write the plaintext. @@ -371,10 +371,10 @@ int main( int argc, char *argv[] ) } memcpy( tmp, buffer, 16 ); - - sha2_hmac_update( &sha_ctx, buffer, 16 ); + + sha256_hmac_update( &sha_ctx, buffer, 16 ); aes_crypt_ecb( &aes_ctx, AES_DECRYPT, buffer, buffer ); - + for( i = 0; i < 16; i++ ) buffer[i] = (unsigned char)( buffer[i] ^ IV[i] ); @@ -393,7 +393,7 @@ int main( int argc, char *argv[] ) /* * Verify the message authentication code. */ - sha2_hmac_finish( &sha_ctx, digest ); + sha256_hmac_finish( &sha_ctx, digest ); if( fread( buffer, 1, 32, fin ) != 32 ) { @@ -421,8 +421,8 @@ exit: memset( digest, 0, sizeof( digest ) ); memset( &aes_ctx, 0, sizeof( aes_context ) ); - memset( &sha_ctx, 0, sizeof( sha2_context ) ); + memset( &sha_ctx, 0, sizeof( sha256_context ) ); return( ret ); } -#endif /* POLARSSL_AES_C && POLARSSL_SHA2_C */ +#endif /* POLARSSL_AES_C && POLARSSL_SHA256_C */ diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c index 83124cf3c..81a80588f 100644 --- a/programs/hash/sha2sum.c +++ b/programs/hash/sha2sum.c @@ -1,5 +1,5 @@ /* - * sha2sum demonstration program + * sha256sum demonstration program * * Copyright (C) 2006-2011, Brainspark B.V. * @@ -34,19 +34,19 @@ #include "polarssl/sha2.h" -#if !defined(POLARSSL_SHA2_C) || !defined(POLARSSL_FS_IO) +#if !defined(POLARSSL_SHA256_C) || !defined(POLARSSL_FS_IO) int main( int argc, char *argv[] ) { ((void) argc); ((void) argv); - printf("POLARSSL_SHA2_C and/or POLARSSL_FS_IO not defined.\n"); + printf("POLARSSL_SHA256_C and/or POLARSSL_FS_IO not defined.\n"); return( 0 ); } #else -static int sha2_wrapper( char *filename, unsigned char *sum ) +static int sha256_wrapper( char *filename, unsigned char *sum ) { - int ret = sha2_file( filename, sum, 0 ); + int ret = sha256_file( filename, sum, 0 ); if( ret == 1 ) fprintf( stderr, "failed to open: %s\n", filename ); @@ -57,12 +57,12 @@ static int sha2_wrapper( char *filename, unsigned char *sum ) return( ret ); } -static int sha2_print( char *filename ) +static int sha256_print( char *filename ) { int i; unsigned char sum[32]; - if( sha2_wrapper( filename, sum ) != 0 ) + if( sha256_wrapper( filename, sum ) != 0 ) return( 1 ); for( i = 0; i < 32; i++ ) @@ -72,7 +72,7 @@ static int sha2_print( char *filename ) return( 0 ); } -static int sha2_check( char *filename ) +static int sha256_check( char *filename ) { int i; size_t n; @@ -110,7 +110,7 @@ static int sha2_check( char *filename ) nb_tot1++; - if( sha2_wrapper( line + 66, sum ) != 0 ) + if( sha256_wrapper( line + 66, sum ) != 0 ) { nb_err1++; continue; @@ -151,8 +151,8 @@ int main( int argc, char *argv[] ) if( argc == 1 ) { - printf( "print mode: sha2sum ...\n" ); - printf( "check mode: sha2sum -c \n" ); + printf( "print mode: sha256sum ...\n" ); + printf( "check mode: sha256sum -c \n" ); #if defined(_WIN32) printf( "\n Press Enter to exit this program.\n" ); @@ -163,12 +163,12 @@ int main( int argc, char *argv[] ) } if( argc == 3 && strcmp( "-c", argv[1] ) == 0 ) - return( sha2_check( argv[2] ) ); + return( sha256_check( argv[2] ) ); ret = 0; for( i = 1; i < argc; i++ ) - ret |= sha2_print( argv[i] ); + ret |= sha256_print( argv[i] ); return( ret ); } -#endif /* POLARSSL_SHA2_C && POLARSSL_FS_IO */ +#endif /* POLARSSL_SHA256_C && POLARSSL_FS_IO */ diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 7ee465f4d..acccd014c 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -181,33 +181,33 @@ int main( int argc, char *argv[] ) ( hardclock() - tsc ) / ( j * BUFSIZE ) ); #endif -#if defined(POLARSSL_SHA2_C) +#if defined(POLARSSL_SHA256_C) printf( HEADER_FORMAT, "SHA-256" ); fflush( stdout ); set_alarm( 1 ); for( i = 1; ! alarmed; i++ ) - sha2( buf, BUFSIZE, tmp, 0 ); + sha256( buf, BUFSIZE, tmp, 0 ); tsc = hardclock(); for( j = 0; j < 1024; j++ ) - sha2( buf, BUFSIZE, tmp, 0 ); + sha256( buf, BUFSIZE, tmp, 0 ); printf( "%9lu Kb/s, %9lu cycles/byte\n", i * BUFSIZE / 1024, ( hardclock() - tsc ) / ( j * BUFSIZE ) ); #endif -#if defined(POLARSSL_SHA4_C) +#if defined(POLARSSL_SHA512_C) printf( HEADER_FORMAT, "SHA-512" ); fflush( stdout ); set_alarm( 1 ); for( i = 1; ! alarmed; i++ ) - sha4( buf, BUFSIZE, tmp, 0 ); + sha512( buf, BUFSIZE, tmp, 0 ); tsc = hardclock(); for( j = 0; j < 1024; j++ ) - sha4( buf, BUFSIZE, tmp, 0 ); + sha512( buf, BUFSIZE, tmp, 0 ); printf( "%9lu Kb/s, %9lu cycles/byte\n", i * BUFSIZE / 1024, ( hardclock() - tsc ) / ( j * BUFSIZE ) ); diff --git a/programs/test/selftest.c b/programs/test/selftest.c index 333e3a16d..006879341 100644 --- a/programs/test/selftest.c +++ b/programs/test/selftest.c @@ -86,13 +86,13 @@ int main( int argc, char *argv[] ) return( ret ); #endif -#if defined(POLARSSL_SHA2_C) - if( ( ret = sha2_self_test( v ) ) != 0 ) +#if defined(POLARSSL_SHA256_C) + if( ( ret = sha256_self_test( v ) ) != 0 ) return( ret ); #endif -#if defined(POLARSSL_SHA4_C) - if( ( ret = sha4_self_test( v ) ) != 0 ) +#if defined(POLARSSL_SHA512_C) + if( ( ret = sha512_self_test( v ) ) != 0 ) return( ret ); #endif diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl index 945ab6ad4..009107b6e 100755 --- a/scripts/generate_errors.pl +++ b/scripts/generate_errors.pl @@ -11,7 +11,7 @@ my $error_format_file = $data_dir.'/error.fmt'; my @low_level_modules = ( "AES", "ASN1", "BLOWFISH", "CAMELLIA", "BIGNUM", "BASE64", "XTEA", "PBKDF2", "OID", "PADLOCK", "DES", "NET", "CTR_DRBG", "ENTROPY", - "MD2", "MD4", "MD5", "SHA1", "SHA2", "SHA4", "GCM" ); + "MD2", "MD4", "MD5", "SHA1", "SHA256", "SHA512", "GCM" ); my @high_level_modules = ( "PEM", "X509", "DHM", "RSA", "ECP", "MD", "CIPHER", "SSL", "PKCS12", "PKCS5" ); diff --git a/tests/suites/test_suite_hmac_shax.data b/tests/suites/test_suite_hmac_shax.data index 40db95c47..277eb8e63 100644 --- a/tests/suites/test_suite_hmac_shax.data +++ b/tests/suites/test_suite_hmac_shax.data @@ -43,101 +43,101 @@ depends_on:POLARSSL_SHA1_C sha1_hmac:10:"1287e1565a57b547":"390ffdccc6171c11568d85b8f913e019bf4cd982ca9cd21ea730d41bdf3fcc0bc88ff48ba13a8f23deb2d96ec1033e7b2a58ca72b0c1e17bf03330db25d1e360fa6918009c4294bd1215b5ccd159a8f58bc3dc3d490eb7c3b9f887e8c98dbbb274a75373dcb695a59abd0219529d88518a96f92abc0bbcbda985c388f1fbbcc9":"d78ddf08077c7d9e2ba6" HMAC-SHA-224 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:14:"e055eb756697ee573fd3214811a9f7fa":"3875847012ee42fe54a0027bdf38cca7021b83a2ed0503af69ef6c37c637bc1114fba40096c5947d736e19b7af3c68d95a4e3b8b073adbbb80f47e9db8f2d4f0018ddd847fabfdf9dd9b52c93e40458977725f6b7ba15f0816bb895cdf50401268f5d702b7e6a5f9faef57b8768c8a3fc14f9a4b3182b41d940e337d219b29ff":"40a453133361cc48da11baf616ee" HMAC-SHA-224 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:14:"88e5258b55b1623385eb9632fa7c57d6":"ada76bb604be14326551701cf30e48a65eee80b44f0b9d4a07b1844543b7844a621097fdc99de57387458ae9354899b620d0617eabcaefa9eef3d413a33628054335ce656c26fa2986e0f111a6351096b283101ec7868871d770b370973c7405983f9756b3005a3eab492cfd0e7eb42e5c2e15fa6be8718c0a50acc4e5717230":"81c783af538015cef3c60095df53" HMAC-SHA-224 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:14:"85d402d822114d31abf75526e2538705":"8020d8d98cc2e2298b32879c51c751e1dd5558fe2eabb8f158604297d6d072ce2261a1d6830b7cfe2617b57c7126f99c9476211d6161acd75d266da217ec8174b80484c9dc6f0448a0a036a3fc82e8bf54bdb71549368258d5d41f57978a4c266b92e8783ef66350215573d99be4089144b383ad8f3222bae8f3bf80ffb1bb2b":"2aa0340ac9deafe3be38129daca0" HMAC-SHA-224 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:14:"545c6eecc5ee46fa17c59f91a94f81ae":"8fb7f3565593170152ddb2021874784e951977cfdd22f8b72a72a61320a8f2a35697b5e913f717805559b1af1861ee3ed42fb788481e4fd276b17bdbefcae7b4501dc5d20de5b7626dd5efdcd65294db4bdf682c33d9a9255c6435383fa5f1c886326a3acbc6bd50a33ab5b2dbb034ce0112d4e226bbcd57e3731a519aa1d784":"3eb566eac54c4a3a9ef092469f24" HMAC-SHA-224 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:14:"4466ab4dc438841a9750c7f173dff02e":"2534c11c78c99cffaec8f722f04adc7045c7324d58ce98e37cfa94b6ed21ed7f58ce55379ef24b72d6d640ee9154f96c614734be9c408e225d7ba4cecc1179cc9f6e1808e1067aa8f244a99bd0c3267594c1887a40d167f8b7cf78db0d19f97b01fc50b8c86def490dfa7a5135002c33e71d77a8cce8ea0f93e0580439a33733":"59f44a9bbed4875b892d22d6b5ab" HMAC-SHA-224 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:28:"0e3dd9bb5e4cf0f09a4c11600af56d8d":"f4589fa76c328ea25cf8bae582026ba40a59d45a546ff31cf80eb826088f69bb954c452c74586836416dee90a5255bc5d56d3b405b3705a5197045688b32fa984c3a3dfbdc9c2460a0b5e6312a624048bb6f170306535e9b371a3ab134a2642a230ad03d2c688cca80baeaee9a20e1d4c548b1cede29c6a45bf4df2c8c476f1a":"12175b93e3da4c58217145e4dc0a1cf142fab9319bb501e037b350ba" HMAC-SHA-224 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224_hmac:28:"cda5187b0c5dcb0f8e5a8beed2306584":"9011ae29b44c49b347487ce972965f16ade3c15be0856ce9c853a9739dba07e4f20d594ddc1dfe21560a65a4e458cfa17745575b915a30c7a9412ff8d1d689db9680dd2428c27588bb0dc92d2cd9445fe8f44b840a197c52c3c4333fff45533945134398df6436513cfab06c924046b8c795a5bd92e8d5f2de85bf306f2eed67":"4aaba92b40e2a600feab176eb9b292d814864195c03342aad6f67f08" HMAC-SHA-256 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256_hmac:16:"cdffd34e6b16fdc0":"d83e78b99ab61709608972b36e76a575603db742269cc5dd4e7d5ca7816e26b65151c92632550cb4c5253c885d5fce53bc47459a1dbd5652786c4aac0145a532f12c05138af04cbb558101a7af5df478834c2146594dd73690d01a4fe72545894335f427ac70204798068cb86c5a600b40b414ede23590b41e1192373df84fe3":"c6f0dde266cb4a26d41e8259d33499cc" HMAC-SHA-256 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256_hmac:16:"6d97bb5892245be2":"13c2b391d59c0252ca5d2302beaaf88c4bcd779bb505ad9a122003dfae4cc123ad2bd036f225c4f040021a6b9fb8bd6f0281cf2e2631a732bdc71693cc42ef6d52b6c6912a9ef77b3274eb85ad7f965ae6ed44ac1721962a884ec7acfb4534b1488b1c0c45afa4dae8da1eb7b0a88a3240365d7e4e7d826abbde9f9203fd99d7":"31588e241b015319a5ab8c4527296498" HMAC-SHA-256 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256_hmac:16:"3c7fc8a70b49007a":"60024e428a39c8b8bb2e9591bad9dc2115dfbfd716b6eb7af30a6eb34560caccbbfa47b710fa8d523aca71e9e5ba10fc1feb1a43556d71f07ea4f33496f093044e8caf1d02b79e46eb1288d5964a7a7494f6b92574c35784eece054c6151281d80822f7d47b8231c35d07f5cb5cf4310ddc844845a01c6bfab514c048eccaf9f":"1c98c94a32bec9f253c21070f82f8438" HMAC-SHA-256 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256_hmac:24:"369f33f85b927a07":"ae8e2a94ca386d448cbacdb0e9040ae3cb297c296363052cc157455da29a0c95897315fc11e3f12b81e2418da1ec280bccbc00e847584ce9d14deeba7b3c9b8dba958b04bba37551f6c9ba9c060be1a4b8cf43aa62e5078b76c6512c5619b71a6a7cf5727180e1ff14f5a1a3c1691bf8b6ebad365c151e58d749d57adb3a4986":"60b90383286533d309de46593e6ce39fc51fb00a8d88278c" HMAC-SHA-256 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256_hmac:24:"e5179687582b4dc4":"ce103bdacdf32f614f6727bcb31ca1c2824a850d00f5585b016fb234fe1ef2cd687f302d3c6b738ed89a24060d65c36675d0d96307c72ef3e8a83bfa8402e226de9d5d1724ba75c4879bf41a4a465ce61887d9f49a34757849b48bae81c27ebed76faae2ad669bca04747d409148d40812776e0ae2c395b3cb9c89981ce72d5c":"509581f6816df4b8cc9f2cf42b7cc6e6a5a1e375a16f2412" HMAC-SHA-256 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256_hmac:24:"63cec6246aeb1b61":"c178db908a405fa88aa255b8cad22b4057016585f139ee930388b083d86062fa0b3ea1f23f8a43bd11bee8464bcbd19b5ab9f6a8038d5245516f8274d20c8ee3033a07b908da528fa00343bb595deed500cab9745c4cb6391c23300f0d3584b090b3326c4cfa342620b78f9f5b4f27f7307ed770643ec1764aeae3dcf1a3ec69":"64f3dd861b7c7d29fce9ae0ce9ed954b5d7141806ee9eec7" HMAC-SHA-384 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384_hmac:32:"91a7401817386948ca952f9a20ee55dc":"2fea5b91035d6d501f3a834fa178bff4e64b99a8450432dafd32e4466b0e1e7781166f8a73f7e036b3b0870920f559f47bd1400a1a906e85e0dcf00a6c26862e9148b23806680f285f1fe4f93cdaf924c181a965465739c14f2268c8be8b471847c74b222577a1310bcdc1a85ef1468aa1a3fd4031213c97324b7509c9050a3d":"6d7be9490058cf413cc09fd043c224c2ec4fa7859b13783000a9a593c9f75838" HMAC-SHA-384 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384_hmac:32:"d6cac19657061aa90a6da11cd2e9ea47":"9f482e4655173135dfaa22a11bbbe6af263db48716406c5aec162ba3c4b41cad4f5a91558377521191c7343118beee65982929802913d67b6de5c4bdc3d27299bd722219d5ad2efa5bdb9ff7b229fc4bbc3f60719320cf2e7a51cad1133d21bad2d80919b1836ef825308b7c51c6b7677ac782e2bc30007afba065681cbdd215":"f3d5f3c008175321aa7b2ea379eaa4f8b9dcc60f895ec8940b8162f80a7dfe9f" HMAC-SHA-384 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384_hmac:32:"e06366ad149b8442cd4c1abdddd0afde":"2d140a194c02a5598f69174834679b8371234a0d505491f1bd03e128dd91a8bca2fb812e9d5da71613b5b00952ea78bf450d5b7547dea79135925085c7d3e6f52009c51ca3d88c6c09e9d074b0ee110736e0ec9b478b93efb34d7bf1c41b54decec43eab077a3aa4998ede53f67b4ea36c266745f9643d5360bdc8337c70dabf":"c19c67eda6fe29f3667bee1c897c333ce7683094ae77e84b4c16378d290895a1" HMAC-SHA-384 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384_hmac:48:"01ac59f42f8bb91d1bd10fe6990d7a87":"3caf18c476edd5615f343ac7b7d3a9da9efade755672d5ba4b8ae8a7505539ea2c124ff755ec0457fbe49e43480b3c71e7f4742ec3693aad115d039f90222b030fdc9440313691716d5302005808c07627483b916fdf61983063c2eb1268f2deeef42fc790334456bc6bad256e31fc9066de7cc7e43d1321b1866db45e905622":"1985fa2163a5943fc5d92f1fe8831215e7e91f0bff5332bc713a072bdb3a8f9e5c5157463a3bfeb36231416e65973e64" HMAC-SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384_hmac:48:"fd74b9d9e102a3a80df1baf0cb35bace":"1a068917584813d1689ccbd0370c2114d537cdc8cc52bf6db16d5535f8f7d1ad0c850a9fa0cf62373ffbf7642b1f1e8164010d350721d798d9f99e9724830399c2fce26377e83d38845675457865c03d4a07d741a505ef028343eb29fd46d0f761f3792886998c1e5c32ac3bc7e6f08faed194b34f06eff4d5d4a5b42c481e0e":"a981eaf5de3d78b20ebd4414a4edd0657e3667cd808a0dbc430cf7252f73a5b24efa136039207bd59806897457d74e0c" HMAC-SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384_hmac:48:"9fe794f0e26b669fa5f6883149377c6c":"6010c9745e8f1d44cfdc99e7e0fd79bc4271944c2d1d84dba589073dfc4ca5eb98c59356f60cd87bef28aeb83a832bde339b2087daf942aa1f67876c5d5ed33924bed4143bc12a2be532ccaf64daa7e2bc3c8872b9823b0533b6f5159135effe8c61545536975d7c3a61ba7365ec35f165bc92b4d19eb9156ade17dfa1bb4161":"915ae61f8754698c2b6ef9629e93441f8541bd4258a5e05372d19136cfaefc0473b48d96119291b38eb1a3cb1982a986" HMAC-SHA-512 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512_hmac:32:"c95a17c09940a691ed2d621571b0eb844ede55a9":"99cd28262e81f34878cdcebf4128e05e2098a7009278a66f4c785784d0e5678f3f2b22f86e982d273b6273a222ec61750b4556d766f1550a7aedfe83faedbc4bdae83fa560d62df17eb914d05fdaa48940551bac81d700f5fca7147295e386e8120d66742ec65c6ee8d89a92217a0f6266d0ddc60bb20ef679ae8299c8502c2f":"6bc1379d156559ddee2ed420ea5d5c5ff3e454a1059b7ba72c350e77b6e9333c" HMAC-SHA-512 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512_hmac:32:"3b10b8fa718840d1dea8e9fc317476bcf55875fd":"f04f5b7073d7d0274e8354433b390306c5607632f5f589c12edb62d55673aff2366d2e6b24de731adf92e654baa30b1cfd4a069788f65ec1b99b015d904d8832110dbd74eae35a81562d14ce4136d820ad0a55ff5489ba678fbbc1c27663ec1349d70e740f0e0ec27cfbe8971819f4789e486b50a2d7271d77e2aaea50de62fd":"fc3c38c7a17e3ce06db033f1c172866f01a00045db55f2e234f71c82264f2ba2" HMAC-SHA-512 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512_hmac:32:"4803d311394600dc1e0d8fc8cedeb8bde3fe7c42":"a10c125dd702a97153ad923ba5e9889cfac1ba169de370debe51f233735aa6effcc9785c4b5c7e48c477dc5c411ae6a959118584e26adc94b42c2b29b046f3cf01c65b24a24bd2e620bdf650a23bb4a72655b1100d7ce9a4dab697c6379754b4396c825de4b9eb73f2e6a6c0d0353bbdeaf706612800e137b858fdb30f3311c6":"7cd8236c55102e6385f52279506df6fcc388ab75092da21395ce14a82b202ffa" HMAC-SHA-512 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512_hmac:48:"aeb2f3b977fa6c8e71e07c5a5c74ff58166de092":"22457355dc76095abd46846b41cfe49a06ce42ac8857b4702fc771508dfb3626e0bfe851df897a07b36811ec433766e4b4166c26301b3493e7440d4554b0ef6ac20f1a530e58fac8aeba4e9ff2d4898d8a28783b49cd269c2965fd7f8e4f2d60cf1e5284f2495145b72382aad90e153a90ecae125ad75336fb128825c23fb8b0":"fa39bd8fcc3bfa218f9dea5d3b2ce10a7619e31678a56d8a9d927b1fe703b125af445debe9a89a07db6194d27b44d85a" HMAC-SHA-512 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512_hmac:48:"4285d3d7744da52775bb44ca436a3154f7980309":"208f0b6f2de2e5aa5df11927ddc6df485edc1193181c484d0f0a434a95418803101d4de9fdb798f93516a6916fa38a8207de1666fe50fe3441c03b112eaaae6954ed063f7ac4e3c1e3f73b20d153fe9e4857f5e91430f0a70ee820529adac2467469fd18adf10e2af0fea27c0abc83c5a9af77c364a466cffce8bab4e2b70bc1":"fe7603f205b2774fe0f14ecfa3e338e90608a806d11ca459dff5ce36b1b264ecd3af5f0492a7521d8da3102ba20927a5" HMAC-SHA-512 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512_hmac:48:"8ab783d5acf32efa0d9c0a21abce955e96630d89":"17371e013dce839963d54418e97be4bd9fa3cb2a368a5220f5aa1b8aaddfa3bdefc91afe7c717244fd2fb640f5cb9d9bf3e25f7f0c8bc758883b89dcdce6d749d9672fed222277ece3e84b3ec01b96f70c125fcb3cbee6d19b8ef0873f915f173bdb05d81629ba187cc8ac1934b2f75952fb7616ae6bd812946df694bd2763af":"9ac7ca8d1aefc166b046e4cf7602ebe181a0e5055474bff5b342106731da0d7e48e4d87bc0a6f05871574289a1b099f8" diff --git a/tests/suites/test_suite_hmac_shax.function b/tests/suites/test_suite_hmac_shax.function index d3e6f6ad0..66c67dbea 100644 --- a/tests/suites/test_suite_hmac_shax.function +++ b/tests/suites/test_suite_hmac_shax.function @@ -45,7 +45,7 @@ sha224_hmac:trunc_size:hex_key_string:hex_src_string:hex_hash_string key_len = unhexify( key_str, {hex_key_string} ); src_len = unhexify( src_str, {hex_src_string} ); - sha2_hmac( key_str, key_len, src_str, src_len, output, 1 ); + sha256_hmac( key_str, key_len, src_str, src_len, output, 1 ); hexify( hash_str, output, 28 ); TEST_ASSERT( strncmp( (char *) hash_str, {hex_hash_string}, {trunc_size} * 2 ) == 0 ); @@ -69,7 +69,7 @@ sha256_hmac:trunc_size:hex_key_string:hex_src_string:hex_hash_string key_len = unhexify( key_str, {hex_key_string} ); src_len = unhexify( src_str, {hex_src_string} ); - sha2_hmac( key_str, key_len, src_str, src_len, output, 0 ); + sha256_hmac( key_str, key_len, src_str, src_len, output, 0 ); hexify( hash_str, output, 32 ); TEST_ASSERT( strncmp( (char *) hash_str, {hex_hash_string}, {trunc_size} * 2 ) == 0 ); @@ -93,7 +93,7 @@ sha384_hmac:trunc_size:hex_key_string:hex_src_string:hex_hash_string key_len = unhexify( key_str, {hex_key_string} ); src_len = unhexify( src_str, {hex_src_string} ); - sha4_hmac( key_str, key_len, src_str, src_len, output, 1 ); + sha512_hmac( key_str, key_len, src_str, src_len, output, 1 ); hexify( hash_str, output, 48 ); TEST_ASSERT( strncmp( (char *) hash_str, {hex_hash_string}, {trunc_size} * 2 ) == 0 ); @@ -117,7 +117,7 @@ sha512_hmac:trunc_size:hex_key_string:hex_src_string:hex_hash_string key_len = unhexify( key_str, {hex_key_string} ); src_len = unhexify( src_str, {hex_src_string} ); - sha4_hmac( key_str, key_len, src_str, src_len, output, 0 ); + sha512_hmac( key_str, key_len, src_str, src_len, output, 0 ); hexify( hash_str, output, 64 ); TEST_ASSERT( strncmp( (char *) hash_str, {hex_hash_string}, {trunc_size} * 2 ) == 0 ); diff --git a/tests/suites/test_suite_md.data b/tests/suites/test_suite_md.data index 468cf9f53..d97a3cd50 100644 --- a/tests/suites/test_suite_md.data +++ b/tests/suites/test_suite_md.data @@ -387,103 +387,103 @@ depends_on:POLARSSL_SHA1_C md_hmac:"sha1":10:"1287e1565a57b547":"390ffdccc6171c11568d85b8f913e019bf4cd982ca9cd21ea730d41bdf3fcc0bc88ff48ba13a8f23deb2d96ec1033e7b2a58ca72b0c1e17bf03330db25d1e360fa6918009c4294bd1215b5ccd159a8f58bc3dc3d490eb7c3b9f887e8c98dbbb274a75373dcb695a59abd0219529d88518a96f92abc0bbcbda985c388f1fbbcc9":"d78ddf08077c7d9e2ba6" generic HMAC-SHA-224 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":14:"e055eb756697ee573fd3214811a9f7fa":"3875847012ee42fe54a0027bdf38cca7021b83a2ed0503af69ef6c37c637bc1114fba40096c5947d736e19b7af3c68d95a4e3b8b073adbbb80f47e9db8f2d4f0018ddd847fabfdf9dd9b52c93e40458977725f6b7ba15f0816bb895cdf50401268f5d702b7e6a5f9faef57b8768c8a3fc14f9a4b3182b41d940e337d219b29ff":"40a453133361cc48da11baf616ee" generic HMAC-SHA-224 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":14:"88e5258b55b1623385eb9632fa7c57d6":"ada76bb604be14326551701cf30e48a65eee80b44f0b9d4a07b1844543b7844a621097fdc99de57387458ae9354899b620d0617eabcaefa9eef3d413a33628054335ce656c26fa2986e0f111a6351096b283101ec7868871d770b370973c7405983f9756b3005a3eab492cfd0e7eb42e5c2e15fa6be8718c0a50acc4e5717230":"81c783af538015cef3c60095df53" generic HMAC-SHA-224 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":14:"85d402d822114d31abf75526e2538705":"8020d8d98cc2e2298b32879c51c751e1dd5558fe2eabb8f158604297d6d072ce2261a1d6830b7cfe2617b57c7126f99c9476211d6161acd75d266da217ec8174b80484c9dc6f0448a0a036a3fc82e8bf54bdb71549368258d5d41f57978a4c266b92e8783ef66350215573d99be4089144b383ad8f3222bae8f3bf80ffb1bb2b":"2aa0340ac9deafe3be38129daca0" generic HMAC-SHA-224 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":14:"545c6eecc5ee46fa17c59f91a94f81ae":"8fb7f3565593170152ddb2021874784e951977cfdd22f8b72a72a61320a8f2a35697b5e913f717805559b1af1861ee3ed42fb788481e4fd276b17bdbefcae7b4501dc5d20de5b7626dd5efdcd65294db4bdf682c33d9a9255c6435383fa5f1c886326a3acbc6bd50a33ab5b2dbb034ce0112d4e226bbcd57e3731a519aa1d784":"3eb566eac54c4a3a9ef092469f24" generic HMAC-SHA-224 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":14:"4466ab4dc438841a9750c7f173dff02e":"2534c11c78c99cffaec8f722f04adc7045c7324d58ce98e37cfa94b6ed21ed7f58ce55379ef24b72d6d640ee9154f96c614734be9c408e225d7ba4cecc1179cc9f6e1808e1067aa8f244a99bd0c3267594c1887a40d167f8b7cf78db0d19f97b01fc50b8c86def490dfa7a5135002c33e71d77a8cce8ea0f93e0580439a33733":"59f44a9bbed4875b892d22d6b5ab" generic HMAC-SHA-224 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":28:"0e3dd9bb5e4cf0f09a4c11600af56d8d":"f4589fa76c328ea25cf8bae582026ba40a59d45a546ff31cf80eb826088f69bb954c452c74586836416dee90a5255bc5d56d3b405b3705a5197045688b32fa984c3a3dfbdc9c2460a0b5e6312a624048bb6f170306535e9b371a3ab134a2642a230ad03d2c688cca80baeaee9a20e1d4c548b1cede29c6a45bf4df2c8c476f1a":"12175b93e3da4c58217145e4dc0a1cf142fab9319bb501e037b350ba" generic HMAC-SHA-224 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha224":28:"cda5187b0c5dcb0f8e5a8beed2306584":"9011ae29b44c49b347487ce972965f16ade3c15be0856ce9c853a9739dba07e4f20d594ddc1dfe21560a65a4e458cfa17745575b915a30c7a9412ff8d1d689db9680dd2428c27588bb0dc92d2cd9445fe8f44b840a197c52c3c4333fff45533945134398df6436513cfab06c924046b8c795a5bd92e8d5f2de85bf306f2eed67":"4aaba92b40e2a600feab176eb9b292d814864195c03342aad6f67f08" generic HMAC-SHA-256 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha256":16:"cdffd34e6b16fdc0":"d83e78b99ab61709608972b36e76a575603db742269cc5dd4e7d5ca7816e26b65151c92632550cb4c5253c885d5fce53bc47459a1dbd5652786c4aac0145a532f12c05138af04cbb558101a7af5df478834c2146594dd73690d01a4fe72545894335f427ac70204798068cb86c5a600b40b414ede23590b41e1192373df84fe3":"c6f0dde266cb4a26d41e8259d33499cc" generic HMAC-SHA-256 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha256":16:"6d97bb5892245be2":"13c2b391d59c0252ca5d2302beaaf88c4bcd779bb505ad9a122003dfae4cc123ad2bd036f225c4f040021a6b9fb8bd6f0281cf2e2631a732bdc71693cc42ef6d52b6c6912a9ef77b3274eb85ad7f965ae6ed44ac1721962a884ec7acfb4534b1488b1c0c45afa4dae8da1eb7b0a88a3240365d7e4e7d826abbde9f9203fd99d7":"31588e241b015319a5ab8c4527296498" generic HMAC-SHA-256 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha256":16:"3c7fc8a70b49007a":"60024e428a39c8b8bb2e9591bad9dc2115dfbfd716b6eb7af30a6eb34560caccbbfa47b710fa8d523aca71e9e5ba10fc1feb1a43556d71f07ea4f33496f093044e8caf1d02b79e46eb1288d5964a7a7494f6b92574c35784eece054c6151281d80822f7d47b8231c35d07f5cb5cf4310ddc844845a01c6bfab514c048eccaf9f":"1c98c94a32bec9f253c21070f82f8438" generic HMAC-SHA-256 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha256":24:"369f33f85b927a07":"ae8e2a94ca386d448cbacdb0e9040ae3cb297c296363052cc157455da29a0c95897315fc11e3f12b81e2418da1ec280bccbc00e847584ce9d14deeba7b3c9b8dba958b04bba37551f6c9ba9c060be1a4b8cf43aa62e5078b76c6512c5619b71a6a7cf5727180e1ff14f5a1a3c1691bf8b6ebad365c151e58d749d57adb3a4986":"60b90383286533d309de46593e6ce39fc51fb00a8d88278c" generic HMAC-SHA-256 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha256":24:"e5179687582b4dc4":"ce103bdacdf32f614f6727bcb31ca1c2824a850d00f5585b016fb234fe1ef2cd687f302d3c6b738ed89a24060d65c36675d0d96307c72ef3e8a83bfa8402e226de9d5d1724ba75c4879bf41a4a465ce61887d9f49a34757849b48bae81c27ebed76faae2ad669bca04747d409148d40812776e0ae2c395b3cb9c89981ce72d5c":"509581f6816df4b8cc9f2cf42b7cc6e6a5a1e375a16f2412" generic HMAC-SHA-256 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac:"sha256":24:"63cec6246aeb1b61":"c178db908a405fa88aa255b8cad22b4057016585f139ee930388b083d86062fa0b3ea1f23f8a43bd11bee8464bcbd19b5ab9f6a8038d5245516f8274d20c8ee3033a07b908da528fa00343bb595deed500cab9745c4cb6391c23300f0d3584b090b3326c4cfa342620b78f9f5b4f27f7307ed770643ec1764aeae3dcf1a3ec69":"64f3dd861b7c7d29fce9ae0ce9ed954b5d7141806ee9eec7" generic HMAC-SHA-384 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha384":32:"91a7401817386948ca952f9a20ee55dc":"2fea5b91035d6d501f3a834fa178bff4e64b99a8450432dafd32e4466b0e1e7781166f8a73f7e036b3b0870920f559f47bd1400a1a906e85e0dcf00a6c26862e9148b23806680f285f1fe4f93cdaf924c181a965465739c14f2268c8be8b471847c74b222577a1310bcdc1a85ef1468aa1a3fd4031213c97324b7509c9050a3d":"6d7be9490058cf413cc09fd043c224c2ec4fa7859b13783000a9a593c9f75838" generic HMAC-SHA-384 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha384":32:"d6cac19657061aa90a6da11cd2e9ea47":"9f482e4655173135dfaa22a11bbbe6af263db48716406c5aec162ba3c4b41cad4f5a91558377521191c7343118beee65982929802913d67b6de5c4bdc3d27299bd722219d5ad2efa5bdb9ff7b229fc4bbc3f60719320cf2e7a51cad1133d21bad2d80919b1836ef825308b7c51c6b7677ac782e2bc30007afba065681cbdd215":"f3d5f3c008175321aa7b2ea379eaa4f8b9dcc60f895ec8940b8162f80a7dfe9f" generic HMAC-SHA-384 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha384":32:"e06366ad149b8442cd4c1abdddd0afde":"2d140a194c02a5598f69174834679b8371234a0d505491f1bd03e128dd91a8bca2fb812e9d5da71613b5b00952ea78bf450d5b7547dea79135925085c7d3e6f52009c51ca3d88c6c09e9d074b0ee110736e0ec9b478b93efb34d7bf1c41b54decec43eab077a3aa4998ede53f67b4ea36c266745f9643d5360bdc8337c70dabf":"c19c67eda6fe29f3667bee1c897c333ce7683094ae77e84b4c16378d290895a1" generic HMAC-SHA-384 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha384":48:"01ac59f42f8bb91d1bd10fe6990d7a87":"3caf18c476edd5615f343ac7b7d3a9da9efade755672d5ba4b8ae8a7505539ea2c124ff755ec0457fbe49e43480b3c71e7f4742ec3693aad115d039f90222b030fdc9440313691716d5302005808c07627483b916fdf61983063c2eb1268f2deeef42fc790334456bc6bad256e31fc9066de7cc7e43d1321b1866db45e905622":"1985fa2163a5943fc5d92f1fe8831215e7e91f0bff5332bc713a072bdb3a8f9e5c5157463a3bfeb36231416e65973e64" generic HMAC-SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha384":48:"fd74b9d9e102a3a80df1baf0cb35bace":"1a068917584813d1689ccbd0370c2114d537cdc8cc52bf6db16d5535f8f7d1ad0c850a9fa0cf62373ffbf7642b1f1e8164010d350721d798d9f99e9724830399c2fce26377e83d38845675457865c03d4a07d741a505ef028343eb29fd46d0f761f3792886998c1e5c32ac3bc7e6f08faed194b34f06eff4d5d4a5b42c481e0e":"a981eaf5de3d78b20ebd4414a4edd0657e3667cd808a0dbc430cf7252f73a5b24efa136039207bd59806897457d74e0c" generic HMAC-SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha384":48:"9fe794f0e26b669fa5f6883149377c6c":"6010c9745e8f1d44cfdc99e7e0fd79bc4271944c2d1d84dba589073dfc4ca5eb98c59356f60cd87bef28aeb83a832bde339b2087daf942aa1f67876c5d5ed33924bed4143bc12a2be532ccaf64daa7e2bc3c8872b9823b0533b6f5159135effe8c61545536975d7c3a61ba7365ec35f165bc92b4d19eb9156ade17dfa1bb4161":"915ae61f8754698c2b6ef9629e93441f8541bd4258a5e05372d19136cfaefc0473b48d96119291b38eb1a3cb1982a986" generic HMAC-SHA-512 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha512":32:"c95a17c09940a691ed2d621571b0eb844ede55a9":"99cd28262e81f34878cdcebf4128e05e2098a7009278a66f4c785784d0e5678f3f2b22f86e982d273b6273a222ec61750b4556d766f1550a7aedfe83faedbc4bdae83fa560d62df17eb914d05fdaa48940551bac81d700f5fca7147295e386e8120d66742ec65c6ee8d89a92217a0f6266d0ddc60bb20ef679ae8299c8502c2f":"6bc1379d156559ddee2ed420ea5d5c5ff3e454a1059b7ba72c350e77b6e9333c" generic HMAC-SHA-512 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha512":32:"3b10b8fa718840d1dea8e9fc317476bcf55875fd":"f04f5b7073d7d0274e8354433b390306c5607632f5f589c12edb62d55673aff2366d2e6b24de731adf92e654baa30b1cfd4a069788f65ec1b99b015d904d8832110dbd74eae35a81562d14ce4136d820ad0a55ff5489ba678fbbc1c27663ec1349d70e740f0e0ec27cfbe8971819f4789e486b50a2d7271d77e2aaea50de62fd":"fc3c38c7a17e3ce06db033f1c172866f01a00045db55f2e234f71c82264f2ba2" generic HMAC-SHA-512 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha512":32:"4803d311394600dc1e0d8fc8cedeb8bde3fe7c42":"a10c125dd702a97153ad923ba5e9889cfac1ba169de370debe51f233735aa6effcc9785c4b5c7e48c477dc5c411ae6a959118584e26adc94b42c2b29b046f3cf01c65b24a24bd2e620bdf650a23bb4a72655b1100d7ce9a4dab697c6379754b4396c825de4b9eb73f2e6a6c0d0353bbdeaf706612800e137b858fdb30f3311c6":"7cd8236c55102e6385f52279506df6fcc388ab75092da21395ce14a82b202ffa" generic HMAC-SHA-512 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha512":48:"aeb2f3b977fa6c8e71e07c5a5c74ff58166de092":"22457355dc76095abd46846b41cfe49a06ce42ac8857b4702fc771508dfb3626e0bfe851df897a07b36811ec433766e4b4166c26301b3493e7440d4554b0ef6ac20f1a530e58fac8aeba4e9ff2d4898d8a28783b49cd269c2965fd7f8e4f2d60cf1e5284f2495145b72382aad90e153a90ecae125ad75336fb128825c23fb8b0":"fa39bd8fcc3bfa218f9dea5d3b2ce10a7619e31678a56d8a9d927b1fe703b125af445debe9a89a07db6194d27b44d85a" generic HMAC-SHA-512 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha512":48:"4285d3d7744da52775bb44ca436a3154f7980309":"208f0b6f2de2e5aa5df11927ddc6df485edc1193181c484d0f0a434a95418803101d4de9fdb798f93516a6916fa38a8207de1666fe50fe3441c03b112eaaae6954ed063f7ac4e3c1e3f73b20d153fe9e4857f5e91430f0a70ee820529adac2467469fd18adf10e2af0fea27c0abc83c5a9af77c364a466cffce8bab4e2b70bc1":"fe7603f205b2774fe0f14ecfa3e338e90608a806d11ca459dff5ce36b1b264ecd3af5f0492a7521d8da3102ba20927a5" generic HMAC-SHA-512 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac:"sha512":48:"8ab783d5acf32efa0d9c0a21abce955e96630d89":"17371e013dce839963d54418e97be4bd9fa3cb2a368a5220f5aa1b8aaddfa3bdefc91afe7c717244fd2fb640f5cb9d9bf3e25f7f0c8bc758883b89dcdce6d749d9672fed222277ece3e84b3ec01b96f70c125fcb3cbee6d19b8ef0873f915f173bdb05d81629ba187cc8ac1934b2f75952fb7616ae6bd812946df694bd2763af":"9ac7ca8d1aefc166b046e4cf7602ebe181a0e5055474bff5b342106731da0d7e48e4d87bc0a6f05871574289a1b099f8" generic multi step HMAC-SHA-1 Test Vector FIPS-198a #1 @@ -531,103 +531,103 @@ depends_on:POLARSSL_SHA1_C md_hmac_multi:"sha1":10:"1287e1565a57b547":"390ffdccc6171c11568d85b8f913e019bf4cd982ca9cd21ea730d41bdf3fcc0bc88ff48ba13a8f23deb2d96ec1033e7b2a58ca72b0c1e17bf03330db25d1e360fa6918009c4294bd1215b5ccd159a8f58bc3dc3d490eb7c3b9f887e8c98dbbb274a75373dcb695a59abd0219529d88518a96f92abc0bbcbda985c388f1fbbcc9":"d78ddf08077c7d9e2ba6" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":14:"e055eb756697ee573fd3214811a9f7fa":"3875847012ee42fe54a0027bdf38cca7021b83a2ed0503af69ef6c37c637bc1114fba40096c5947d736e19b7af3c68d95a4e3b8b073adbbb80f47e9db8f2d4f0018ddd847fabfdf9dd9b52c93e40458977725f6b7ba15f0816bb895cdf50401268f5d702b7e6a5f9faef57b8768c8a3fc14f9a4b3182b41d940e337d219b29ff":"40a453133361cc48da11baf616ee" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":14:"88e5258b55b1623385eb9632fa7c57d6":"ada76bb604be14326551701cf30e48a65eee80b44f0b9d4a07b1844543b7844a621097fdc99de57387458ae9354899b620d0617eabcaefa9eef3d413a33628054335ce656c26fa2986e0f111a6351096b283101ec7868871d770b370973c7405983f9756b3005a3eab492cfd0e7eb42e5c2e15fa6be8718c0a50acc4e5717230":"81c783af538015cef3c60095df53" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":14:"85d402d822114d31abf75526e2538705":"8020d8d98cc2e2298b32879c51c751e1dd5558fe2eabb8f158604297d6d072ce2261a1d6830b7cfe2617b57c7126f99c9476211d6161acd75d266da217ec8174b80484c9dc6f0448a0a036a3fc82e8bf54bdb71549368258d5d41f57978a4c266b92e8783ef66350215573d99be4089144b383ad8f3222bae8f3bf80ffb1bb2b":"2aa0340ac9deafe3be38129daca0" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":14:"545c6eecc5ee46fa17c59f91a94f81ae":"8fb7f3565593170152ddb2021874784e951977cfdd22f8b72a72a61320a8f2a35697b5e913f717805559b1af1861ee3ed42fb788481e4fd276b17bdbefcae7b4501dc5d20de5b7626dd5efdcd65294db4bdf682c33d9a9255c6435383fa5f1c886326a3acbc6bd50a33ab5b2dbb034ce0112d4e226bbcd57e3731a519aa1d784":"3eb566eac54c4a3a9ef092469f24" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":14:"4466ab4dc438841a9750c7f173dff02e":"2534c11c78c99cffaec8f722f04adc7045c7324d58ce98e37cfa94b6ed21ed7f58ce55379ef24b72d6d640ee9154f96c614734be9c408e225d7ba4cecc1179cc9f6e1808e1067aa8f244a99bd0c3267594c1887a40d167f8b7cf78db0d19f97b01fc50b8c86def490dfa7a5135002c33e71d77a8cce8ea0f93e0580439a33733":"59f44a9bbed4875b892d22d6b5ab" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":28:"0e3dd9bb5e4cf0f09a4c11600af56d8d":"f4589fa76c328ea25cf8bae582026ba40a59d45a546ff31cf80eb826088f69bb954c452c74586836416dee90a5255bc5d56d3b405b3705a5197045688b32fa984c3a3dfbdc9c2460a0b5e6312a624048bb6f170306535e9b371a3ab134a2642a230ad03d2c688cca80baeaee9a20e1d4c548b1cede29c6a45bf4df2c8c476f1a":"12175b93e3da4c58217145e4dc0a1cf142fab9319bb501e037b350ba" generic multi step HMAC-SHA-224 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha224":28:"cda5187b0c5dcb0f8e5a8beed2306584":"9011ae29b44c49b347487ce972965f16ade3c15be0856ce9c853a9739dba07e4f20d594ddc1dfe21560a65a4e458cfa17745575b915a30c7a9412ff8d1d689db9680dd2428c27588bb0dc92d2cd9445fe8f44b840a197c52c3c4333fff45533945134398df6436513cfab06c924046b8c795a5bd92e8d5f2de85bf306f2eed67":"4aaba92b40e2a600feab176eb9b292d814864195c03342aad6f67f08" generic multi step HMAC-SHA-256 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha256":16:"cdffd34e6b16fdc0":"d83e78b99ab61709608972b36e76a575603db742269cc5dd4e7d5ca7816e26b65151c92632550cb4c5253c885d5fce53bc47459a1dbd5652786c4aac0145a532f12c05138af04cbb558101a7af5df478834c2146594dd73690d01a4fe72545894335f427ac70204798068cb86c5a600b40b414ede23590b41e1192373df84fe3":"c6f0dde266cb4a26d41e8259d33499cc" generic multi step HMAC-SHA-256 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha256":16:"6d97bb5892245be2":"13c2b391d59c0252ca5d2302beaaf88c4bcd779bb505ad9a122003dfae4cc123ad2bd036f225c4f040021a6b9fb8bd6f0281cf2e2631a732bdc71693cc42ef6d52b6c6912a9ef77b3274eb85ad7f965ae6ed44ac1721962a884ec7acfb4534b1488b1c0c45afa4dae8da1eb7b0a88a3240365d7e4e7d826abbde9f9203fd99d7":"31588e241b015319a5ab8c4527296498" generic multi step HMAC-SHA-256 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha256":16:"3c7fc8a70b49007a":"60024e428a39c8b8bb2e9591bad9dc2115dfbfd716b6eb7af30a6eb34560caccbbfa47b710fa8d523aca71e9e5ba10fc1feb1a43556d71f07ea4f33496f093044e8caf1d02b79e46eb1288d5964a7a7494f6b92574c35784eece054c6151281d80822f7d47b8231c35d07f5cb5cf4310ddc844845a01c6bfab514c048eccaf9f":"1c98c94a32bec9f253c21070f82f8438" generic multi step HMAC-SHA-256 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha256":24:"369f33f85b927a07":"ae8e2a94ca386d448cbacdb0e9040ae3cb297c296363052cc157455da29a0c95897315fc11e3f12b81e2418da1ec280bccbc00e847584ce9d14deeba7b3c9b8dba958b04bba37551f6c9ba9c060be1a4b8cf43aa62e5078b76c6512c5619b71a6a7cf5727180e1ff14f5a1a3c1691bf8b6ebad365c151e58d749d57adb3a4986":"60b90383286533d309de46593e6ce39fc51fb00a8d88278c" generic multi step HMAC-SHA-256 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha256":24:"e5179687582b4dc4":"ce103bdacdf32f614f6727bcb31ca1c2824a850d00f5585b016fb234fe1ef2cd687f302d3c6b738ed89a24060d65c36675d0d96307c72ef3e8a83bfa8402e226de9d5d1724ba75c4879bf41a4a465ce61887d9f49a34757849b48bae81c27ebed76faae2ad669bca04747d409148d40812776e0ae2c395b3cb9c89981ce72d5c":"509581f6816df4b8cc9f2cf42b7cc6e6a5a1e375a16f2412" generic multi step HMAC-SHA-256 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hmac_multi:"sha256":24:"63cec6246aeb1b61":"c178db908a405fa88aa255b8cad22b4057016585f139ee930388b083d86062fa0b3ea1f23f8a43bd11bee8464bcbd19b5ab9f6a8038d5245516f8274d20c8ee3033a07b908da528fa00343bb595deed500cab9745c4cb6391c23300f0d3584b090b3326c4cfa342620b78f9f5b4f27f7307ed770643ec1764aeae3dcf1a3ec69":"64f3dd861b7c7d29fce9ae0ce9ed954b5d7141806ee9eec7" generic multi step HMAC-SHA-384 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha384":32:"91a7401817386948ca952f9a20ee55dc":"2fea5b91035d6d501f3a834fa178bff4e64b99a8450432dafd32e4466b0e1e7781166f8a73f7e036b3b0870920f559f47bd1400a1a906e85e0dcf00a6c26862e9148b23806680f285f1fe4f93cdaf924c181a965465739c14f2268c8be8b471847c74b222577a1310bcdc1a85ef1468aa1a3fd4031213c97324b7509c9050a3d":"6d7be9490058cf413cc09fd043c224c2ec4fa7859b13783000a9a593c9f75838" generic multi step HMAC-SHA-384 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha384":32:"d6cac19657061aa90a6da11cd2e9ea47":"9f482e4655173135dfaa22a11bbbe6af263db48716406c5aec162ba3c4b41cad4f5a91558377521191c7343118beee65982929802913d67b6de5c4bdc3d27299bd722219d5ad2efa5bdb9ff7b229fc4bbc3f60719320cf2e7a51cad1133d21bad2d80919b1836ef825308b7c51c6b7677ac782e2bc30007afba065681cbdd215":"f3d5f3c008175321aa7b2ea379eaa4f8b9dcc60f895ec8940b8162f80a7dfe9f" generic multi step HMAC-SHA-384 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha384":32:"e06366ad149b8442cd4c1abdddd0afde":"2d140a194c02a5598f69174834679b8371234a0d505491f1bd03e128dd91a8bca2fb812e9d5da71613b5b00952ea78bf450d5b7547dea79135925085c7d3e6f52009c51ca3d88c6c09e9d074b0ee110736e0ec9b478b93efb34d7bf1c41b54decec43eab077a3aa4998ede53f67b4ea36c266745f9643d5360bdc8337c70dabf":"c19c67eda6fe29f3667bee1c897c333ce7683094ae77e84b4c16378d290895a1" generic multi step HMAC-SHA-384 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha384":48:"01ac59f42f8bb91d1bd10fe6990d7a87":"3caf18c476edd5615f343ac7b7d3a9da9efade755672d5ba4b8ae8a7505539ea2c124ff755ec0457fbe49e43480b3c71e7f4742ec3693aad115d039f90222b030fdc9440313691716d5302005808c07627483b916fdf61983063c2eb1268f2deeef42fc790334456bc6bad256e31fc9066de7cc7e43d1321b1866db45e905622":"1985fa2163a5943fc5d92f1fe8831215e7e91f0bff5332bc713a072bdb3a8f9e5c5157463a3bfeb36231416e65973e64" generic multi step HMAC-SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha384":48:"fd74b9d9e102a3a80df1baf0cb35bace":"1a068917584813d1689ccbd0370c2114d537cdc8cc52bf6db16d5535f8f7d1ad0c850a9fa0cf62373ffbf7642b1f1e8164010d350721d798d9f99e9724830399c2fce26377e83d38845675457865c03d4a07d741a505ef028343eb29fd46d0f761f3792886998c1e5c32ac3bc7e6f08faed194b34f06eff4d5d4a5b42c481e0e":"a981eaf5de3d78b20ebd4414a4edd0657e3667cd808a0dbc430cf7252f73a5b24efa136039207bd59806897457d74e0c" generic multi step HMAC-SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha384":48:"9fe794f0e26b669fa5f6883149377c6c":"6010c9745e8f1d44cfdc99e7e0fd79bc4271944c2d1d84dba589073dfc4ca5eb98c59356f60cd87bef28aeb83a832bde339b2087daf942aa1f67876c5d5ed33924bed4143bc12a2be532ccaf64daa7e2bc3c8872b9823b0533b6f5159135effe8c61545536975d7c3a61ba7365ec35f165bc92b4d19eb9156ade17dfa1bb4161":"915ae61f8754698c2b6ef9629e93441f8541bd4258a5e05372d19136cfaefc0473b48d96119291b38eb1a3cb1982a986" generic multi step HMAC-SHA-512 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha512":32:"c95a17c09940a691ed2d621571b0eb844ede55a9":"99cd28262e81f34878cdcebf4128e05e2098a7009278a66f4c785784d0e5678f3f2b22f86e982d273b6273a222ec61750b4556d766f1550a7aedfe83faedbc4bdae83fa560d62df17eb914d05fdaa48940551bac81d700f5fca7147295e386e8120d66742ec65c6ee8d89a92217a0f6266d0ddc60bb20ef679ae8299c8502c2f":"6bc1379d156559ddee2ed420ea5d5c5ff3e454a1059b7ba72c350e77b6e9333c" generic multi step HMAC-SHA-512 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha512":32:"3b10b8fa718840d1dea8e9fc317476bcf55875fd":"f04f5b7073d7d0274e8354433b390306c5607632f5f589c12edb62d55673aff2366d2e6b24de731adf92e654baa30b1cfd4a069788f65ec1b99b015d904d8832110dbd74eae35a81562d14ce4136d820ad0a55ff5489ba678fbbc1c27663ec1349d70e740f0e0ec27cfbe8971819f4789e486b50a2d7271d77e2aaea50de62fd":"fc3c38c7a17e3ce06db033f1c172866f01a00045db55f2e234f71c82264f2ba2" generic multi step HMAC-SHA-512 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha512":32:"4803d311394600dc1e0d8fc8cedeb8bde3fe7c42":"a10c125dd702a97153ad923ba5e9889cfac1ba169de370debe51f233735aa6effcc9785c4b5c7e48c477dc5c411ae6a959118584e26adc94b42c2b29b046f3cf01c65b24a24bd2e620bdf650a23bb4a72655b1100d7ce9a4dab697c6379754b4396c825de4b9eb73f2e6a6c0d0353bbdeaf706612800e137b858fdb30f3311c6":"7cd8236c55102e6385f52279506df6fcc388ab75092da21395ce14a82b202ffa" generic multi step HMAC-SHA-512 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha512":48:"aeb2f3b977fa6c8e71e07c5a5c74ff58166de092":"22457355dc76095abd46846b41cfe49a06ce42ac8857b4702fc771508dfb3626e0bfe851df897a07b36811ec433766e4b4166c26301b3493e7440d4554b0ef6ac20f1a530e58fac8aeba4e9ff2d4898d8a28783b49cd269c2965fd7f8e4f2d60cf1e5284f2495145b72382aad90e153a90ecae125ad75336fb128825c23fb8b0":"fa39bd8fcc3bfa218f9dea5d3b2ce10a7619e31678a56d8a9d927b1fe703b125af445debe9a89a07db6194d27b44d85a" generic multi step HMAC-SHA-512 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha512":48:"4285d3d7744da52775bb44ca436a3154f7980309":"208f0b6f2de2e5aa5df11927ddc6df485edc1193181c484d0f0a434a95418803101d4de9fdb798f93516a6916fa38a8207de1666fe50fe3441c03b112eaaae6954ed063f7ac4e3c1e3f73b20d153fe9e4857f5e91430f0a70ee820529adac2467469fd18adf10e2af0fea27c0abc83c5a9af77c364a466cffce8bab4e2b70bc1":"fe7603f205b2774fe0f14ecfa3e338e90608a806d11ca459dff5ce36b1b264ecd3af5f0492a7521d8da3102ba20927a5" generic multi step HMAC-SHA-512 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hmac_multi:"sha512":48:"8ab783d5acf32efa0d9c0a21abce955e96630d89":"17371e013dce839963d54418e97be4bd9fa3cb2a368a5220f5aa1b8aaddfa3bdefc91afe7c717244fd2fb640f5cb9d9bf3e25f7f0c8bc758883b89dcdce6d749d9672fed222277ece3e84b3ec01b96f70c125fcb3cbee6d19b8ef0873f915f173bdb05d81629ba187cc8ac1934b2f75952fb7616ae6bd812946df694bd2763af":"9ac7ca8d1aefc166b046e4cf7602ebe181a0e5055474bff5b342106731da0d7e48e4d87bc0a6f05871574289a1b099f8" generic SHA-1 Test Vector NIST CAVS #1 @@ -671,123 +671,123 @@ depends_on:POLARSSL_SHA1_C md_hex:"sha1":"8236153781bd2f1b81ffe0def1beb46f5a70191142926651503f1b3bb1016acdb9e7f7acced8dd168226f118ff664a01a8800116fd023587bfba52a2558393476f5fc69ce9c65001f23e70476d2cc81c97ea19caeb194e224339bcb23f77a83feac5096f9b3090c51a6ee6d204b735aa71d7e996d380b80822e4dfd43683af9c7442498cacbea64842dfda238cb099927c6efae07fdf7b23a4e4456e0152b24853fe0d5de4179974b2b9d4a1cdbefcbc01d8d311b5dda059136176ea698ab82acf20dd490be47130b1235cb48f8a6710473cfc923e222d94b582f9ae36d4ca2a32d141b8e8cc36638845fbc499bce17698c3fecae2572dbbd470552430d7ef30c238c2124478f1f780483839b4fb73d63a9460206824a5b6b65315b21e3c2f24c97ee7c0e78faad3df549c7ca8ef241876d9aafe9a309f6da352bec2caaa92ee8dca392899ba67dfed90aef33d41fc2494b765cb3e2422c8e595dabbfaca217757453fb322a13203f425f6073a9903e2dc5818ee1da737afc345f0057744e3a56e1681c949eb12273a3bfc20699e423b96e44bd1ff62e50a848a890809bfe1611c6787d3d741103308f849a790f9c015098286dbacfc34c1718b2c2b77e32194a75dda37954a320fa68764027852855a7e5b5274eb1e2cbcd27161d98b59ad245822015f48af82a45c0ed59be94f9af03d9736048570d6e3ef63b1770bc98dfb77de84b1bb1708d872b625d9ab9b06c18e5dbbf34399391f0f8aa26ec0dac7ff4cb8ec97b52bcb942fa6db2385dcd1b3b9d567aaeb425d567b0ebe267235651a1ed9bf78fd93d3c1dd077fe340bb04b00529c58f45124b717c168d07e9826e33376988bc5cf62845c2009980a4dfa69fbc7e5a0b1bb20a5958ca967aec68eb31dd8fccca9afcd30a26bab26279f1bf6724ff":"11863b483809ef88413ca9b0084ac4a5390640af" generic SHA-224 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"":"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f" generic SHA-224 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"ff":"e33f9d75e6ae1369dbabf81b96b4591ae46bba30b591a6b6c62542b5" generic SHA-224 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"984c":"2fa9df9157d9e027cfbc4c6a9df32e1adc0cbe2328ec2a63c5ae934e" generic SHA-224 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"50efd0":"b5a9820413c2bf8211fbbf5df1337043b32fa4eafaf61a0c8e9ccede" generic SHA-224 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"e5e09924":"fd19e74690d291467ce59f077df311638f1c3a46e510d0e49a67062d" generic SHA-224 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"21ebecb914":"78f4a71c21c694499ce1c7866611b14ace70d905012c356323c7c713" generic SHA-224 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha224":"fc488947c1a7a589726b15436b4f3d9556262f98fc6422fc5cdf20f0fad7fe427a3491c86d101ffe6b7514f06268f65b2d269b0f69ad9a97847eff1c16a2438775eb7be6847ccf11cb8b2e8dcd6640b095b49c0693fe3cf4a66e2d9b7ad68bff14f3ad69abf49d0aba36cbe0535202deb6599a47225ef05beb351335cd7bc0f480d691198c7e71305ffd53b39d33242bb79cfd98bfd69e137b5d18b2b89ac9ace01c8dbdcf2533cce3682ecc52118de0c1062ec2126c2e657d6ea3d9e2398e705d4b0b1f1ceecb266dffc4f31bf42744fb1e938dc22a889919ee1e73f463f7871fed720519e32186264b7ef2a0e5d9a18e6c95c0781894f77967f048951dec3b4d892a38710b1e3436d3c29088eb8b3da1789c25db3d3bc6c26081206e7155d210a89b80ca6ea877c41ff9947c0f25625dcb118294a163501f6239c326661a958fd12da4cd15a899f8b88cc723589056eaec5aa04a4cf5dbb6f480f9660423ccf38c486e210707e0fb25e1f126ceb2616f63e147a647dab0af9ebe89d65458bf636154a46e4cab95f5ee62da2c7974cd14b90d3e4f99f81733e85b3c1d5da2b508d9b90f5eed7eff0d9c7649de62bee00375454fee4a39576a5bbfdae428e7f8097bdf7797f167686cb68407e49079e4611ff3402b6384ba7b7e522bd2bb11ce8fd02ea4c1604d163ac4f6dde50b8b1f593f7edaadeac0868ed97df690200680c25f0f5d85431a529e4f339089dcdeda105e4ee51dead704cdf5a605c55fb055c9b0e86b8ba1b564c0dea3eb790a595cb103cb292268b07c5e59371e1a7ef597cd4b22977a820694c9f9aeb55d9de3ef62b75d6e656e3336698d960a3787bf8cf5b926a7faeef52ae128bcb5dc9e66d94b016c7b8e034879171a2d91c381f57e6a815b63b5ee6a6d2ff435b49f14c963966960194430d78f8f87627a67757fb3532b289550894da6dce4817a4e07f4d56877a1102ffcc8befa5c9f8fca6a4574d93ff70376c8861e0f8108cf907fce77ecb49728f86f034f80224b9695682e0824462f76cdb1fd1af151337b0d85419047a7aa284791718a4860cd586f7824b95bc837b6fd4f9be5aade68456e20356aa4d943dac36bf8b67b9e8f9d01a00fcda74b798bafa746c661b010f75b59904b29d0c8041504811c4065f82cf2ead58d2f595cbd8bc3e7043f4d94577b373b7cfe16a36fe564f505c03b70cfeb5e5f411c79481338aa67e86b3f5a2e77c21e454c333ae3da943ab723ab5f4c940395319534a5575f64acba0d0ecc43f60221ed3badf7289c9b3a7b903a2d6c94e15fa4c310dc4fa7faa0c24f405160a1002dbef20e4105d481db982f7243f79400a6e4cd9753c4b9732a47575f504b20c328fe9add7f432a4f075829da07b53b695037dc51737d3cd731934df333cd1a53fcf65aa31baa450ca501a6fae26e322347e618c5a444d92e9fec5a8261ae38b98fee5be77c02cec09ddccd5b3de92036":"1302149d1e197c41813b054c942329d420e366530f5517b470e964fe" generic SHA-256 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" generic SHA-256 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"bd":"68325720aabd7c82f30f554b313d0570c95accbb7dc4b5aae11204c08ffe732b" generic SHA-256 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"5fd4":"7c4fbf484498d21b487b9d61de8914b2eadaf2698712936d47c3ada2558f6788" generic SHA-256 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"b0bd69":"4096804221093ddccfbf46831490ea63e9e99414858f8d75ff7f642c7ca61803" generic SHA-256 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"c98c8e55":"7abc22c0ae5af26ce93dbb94433a0e0b2e119d014f8e7f65bd56c61ccccd9504" generic SHA-256 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"81a723d966":"7516fb8bb11350df2bf386bc3c33bd0f52cb4c67c6e4745e0488e62c2aea2605" generic SHA-256 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex:"sha256":"8390cf0be07661cc7669aac54ce09a37733a629d45f5d983ef201f9b2d13800e555d9b1097fec3b783d7a50dcb5e2b644b96a1e9463f177cf34906bf388f366db5c2deee04a30e283f764a97c3b377a034fefc22c259214faa99babaff160ab0aaa7e2ccb0ce09c6b32fe08cbc474694375aba703fadbfa31cf685b30a11c57f3cf4edd321e57d3ae6ebb1133c8260e75b9224fa47a2bb205249add2e2e62f817491482ae152322be0900355cdcc8d42a98f82e961a0dc6f537b7b410eff105f59673bfb787bf042aa071f7af68d944d27371c64160fe9382772372516c230c1f45c0d6b6cca7f274b394da9402d3eafdf733994ec58ab22d71829a98399574d4b5908a447a5a681cb0dd50a31145311d92c22a16de1ead66a5499f2dceb4cae694772ce90762ef8336afec653aa9b1a1c4820b221136dfce80dce2ba920d88a530c9410d0a4e0358a3a11052e58dd73b0b179ef8f56fe3b5a2d117a73a0c38a1392b6938e9782e0d86456ee4884e3c39d4d75813f13633bc79baa07c0d2d555afbf207f52b7dca126d015aa2b9873b3eb065e90b9b065a5373fe1fb1b20d594327d19fba56cb81e7b6696605ffa56eba3c27a438697cc21b201fd7e09f18deea1b3ea2f0d1edc02df0e20396a145412cd6b13c32d2e605641c948b714aec30c0649dc44143511f35ab0fd5dd64c34d06fe86f3836dfe9edeb7f08cfc3bd40956826356242191f99f53473f32b0cc0cf9321d6c92a112e8db90b86ee9e87cc32d0343db01e32ce9eb782cb24efbbbeb440fe929e8f2bf8dfb1550a3a2e742e8b455a3e5730e9e6a7a9824d17acc0f72a7f67eae0f0970f8bde46dcdefaed3047cf807e7f00a42e5fd11d40f5e98533d7574425b7d2bc3b3845c443008b58980e768e464e17cc6f6b3939eee52f713963d07d8c4abf02448ef0b889c9671e2f8a436ddeeffcca7176e9bf9d1005ecd377f2fa67c23ed1f137e60bf46018a8bd613d038e883704fc26e798969df35ec7bbc6a4fe46d8910bd82fa3cded265d0a3b6d399e4251e4d8233daa21b5812fded6536198ff13aa5a1cd46a5b9a17a4ddc1d9f85544d1d1cc16f3df858038c8e071a11a7e157a85a6a8dc47e88d75e7009a8b26fdb73f33a2a70f1e0c259f8f9533b9b8f9af9288b7274f21baeec78d396f8bacdcc22471207d9b4efccd3fedc5c5a2214ff5e51c553f35e21ae696fe51e8df733a8e06f50f419e599e9f9e4b37ce643fc810faaa47989771509d69a110ac916261427026369a21263ac4460fb4f708f8ae28599856db7cb6a43ac8e03d64a9609807e76c5f312b9d1863bfa304e8953647648b4f4ab0ed995e":"4109cdbec3240ad74cc6c37f39300f70fede16e21efc77f7865998714aad0b5e" generic SHA-384 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"":"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" generic SHA-384 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"ab":"fb94d5be118865f6fcbc978b825da82cff188faec2f66cb84b2537d74b4938469854b0ca89e66fa2e182834736629f3d" generic SHA-384 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"7c27":"3d80be467df86d63abb9ea1d3f9cb39cd19890e7f2c53a6200bedc5006842b35e820dc4e0ca90ca9b97ab23ef07080fc" generic SHA-384 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"31f5ca":"78d54b943421fdf7ba90a7fb9637c2073aa480454bd841d39ff72f4511fc21fb67797b652c0c823229342873d3bef955" generic SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"7bdee3f8":"8bdafba0777ee446c3431c2d7b1fbb631089f71d2ca417abc1d230e1aba64ec2f1c187474a6f4077d372c14ad407f99a" generic SHA-384 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"8f05604915":"504e414bf1db1060f14c8c799e25b1e0c4dcf1504ebbd129998f0ae283e6de86e0d3c7e879c73ec3b1836c3ee89c2649" generic SHA-384 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"665da6eda214":"4c022f112010908848312f8b8f1072625fd5c105399d562ea1d56130619a7eac8dfc3748fd05ee37e4b690be9daa9980" generic SHA-384 Test Vector NIST CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha384":"7f46ce506d593c4ed53c82edeb602037e0485befbee03f7f930fe532d18ff2a3f5fd6076672c8145a1bf40dd94f7abab47c9ae71c234213d2ad1069c2dac0b0ba15257ae672b8245960ae55bd50315c0097daa3a318745788d70d14706910809ca6e396237fe4934fa46f9ce782d66606d8bd6b2d283b1160513ce9c24e9f084b97891f99d4cdefc169a029e431ca772ba1bba426fce6f01d8e286014e5acc66b799e4db62bd4783322f8a32ff78e0de3957df50ce10871f4e0680df4e8ca3960af9bc6f4efa8eb3962d18f474eb178c3265cc46b8f2ff5ab1a7449fea297dfcfabfa01f28abbb7289bb354b691b5664ec6d098af51be19947ec5ba7ebd66380d1141953ba78d4aa5401679fa7b0a44db1981f864d3535c45afe4c61183d5b0ad51fae71ca07e34240283959f7530a32c70d95a088e501c230059f333b0670825009e7e22103ef22935830df1fac8ef877f5f3426dd54f7d1128dd871ad9a7d088f94c0e8712013295b8d69ae7623b880978c2d3c6ad26dc478f8dc47f5c0adcc618665dc3dc205a9071b2f2191e16cac5bd89bb59148fc719633752303aa08e518dbc389f0a5482caaa4c507b8729a6f3edd061efb39026cecc6399f51971cf7381d605e144a5928c8c2d1ad7467b05da2f202f4f3234e1aff19a0198a28685721c3d2d52311c721e3fdcbaf30214cdc3acff8c433880e104fb63f2df7ce69a97857819ba7ac00ac8eae1969764fde8f68cf8e0916d7e0c151147d4944f99f42ae50f30e1c79a42d2b6c5188d133d3cbbf69094027b354b295ccd0f7dc5a87d73638bd98ebfb00383ca0fa69cb8dcb35a12510e5e07ad8789047d0b63841a1bb928737e8b0a0c33254f47aa8bfbe3341a09c2b76dbcefa67e30df300d34f7b8465c4f869e51b6bcfe6cf68b238359a645036bf7f63f02924e087ce7457e483b6025a859903cb484574aa3b12cf946f32127d537c33bee3141b5db96d10a148c50ae045f287210757710d6846e04b202f79e87dd9a56bc6da15f84a77a7f63935e1dee00309cd276a8e7176cb04da6bb0e9009534438732cb42d008008853d38d19beba46e61006e30f7efd1bc7c2906b024e4ff898a1b58c448d68b43c6ab63f34f85b3ac6aa4475867e51b583844cb23829f4b30f4bdd817d88e2ef3e7b4fc0a624395b05ec5e8686082b24d29fef2b0d3c29e031d5f94f504b1d3df9361eb5ffbadb242e66c39a8094cfe62f85f639f3fd65fc8ae0c74a8f4c6e1d070b9183a434c722caaa0225f8bcd68614d6f0738ed62f8484ec96077d155c08e26c46be262a73e3551698bd70d8d5610cf37c4c306eed04ba6a040a9c3e6d7e15e8acda17f477c2484cf5c56b813313927be8387b1024f995e98fc87f1029091c01424bdc2b296c2eadb7d25b3e762a2fd0c2dcd1727ddf91db97c5984305265f3695a7f5472f2d72c94d68c27914f14f82aa8dd5fe4e2348b0ca967a3f98626a091552f5d0ffa2bf10350d23c996256c01fdeffb2c2c612519869f877e4929c6e95ff15040f1485e22ed14119880232fef3b57b3848f15b1766a5552879df8f06":"cba9e3eb12a6f83db11e8a6ff40d1049854ee094416bc527fea931d8585428a8ed6242ce81f6769b36e2123a5c23483e" generic SHA-512 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"":"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" generic SHA-512 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"8f":"e4cd2d19931b5aad9c920f45f56f6ce34e3d38c6d319a6e11d0588ab8b838576d6ce6d68eea7c830de66e2bd96458bfa7aafbcbec981d4ed040498c3dd95f22a" generic SHA-512 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"e724":"7dbb520221a70287b23dbcf62bfc1b73136d858e86266732a7fffa875ecaa2c1b8f673b5c065d360c563a7b9539349f5f59bef8c0c593f9587e3cd50bb26a231" generic SHA-512 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"de4c90":"33ce98281045a5c4c9df0363d8196f1d7dfcd5ee46ac89776fd8a4344c12f123a66788af5bd41ceff1941aa5637654b4064c88c14e00465ab79a2fc6c97e1014" generic SHA-512 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"a801e94b":"dadb1b5a27f9fece8d86adb2a51879beb1787ff28f4e8ce162cad7fee0f942efcabbf738bc6f797fc7cc79a3a75048cd4c82ca0757a324695bfb19a557e56e2f" generic SHA-512 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"94390d3502":"b6175c4c4cccf69e0ce5f0312010886ea6b34d43673f942ae42483f9cbb7da817de4e11b5d58e25a3d9bd721a22cdffe1c40411cc45df1911fa5506129b69297" generic SHA-512 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"49297dd63e5f":"1fcc1e6f6870859d11649f5e5336a9cd16329c029baf04d5a6edf257889a2e9522b497dd656bb402da461307c4ee382e2e89380c8e6e6e7697f1e439f650fa94" generic SHA-512 Test Vector NIST CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex:"sha512":"990d1ae71a62d7bda9bfdaa1762a68d296eee72a4cd946f287a898fbabc002ea941fd8d4d991030b4d27a637cce501a834bb95eab1b7889a3e784c7968e67cbf552006b206b68f76d9191327524fcc251aeb56af483d10b4e0c6c5e599ee8c0fe4faeca8293844a8547c6a9a90d093f2526873a19ad4a5e776794c68c742fb834793d2dfcb7fea46c63af4b70fd11cb6e41834e72ee40edb067b292a794990c288d5007e73f349fb383af6a756b8301ad6e5e0aa8cd614399bb3a452376b1575afa6bdaeaafc286cb064bb91edef97c632b6c1113d107fa93a0905098a105043c2f05397f702514439a08a9e5ddc196100721d45c8fc17d2ed659376f8a00bd5cb9a0860e26d8a29d8d6aaf52de97e9346033d6db501a35dbbaf97c20b830cd2d18c2532f3a59cc497ee64c0e57d8d060e5069b28d86edf1adcf59144b221ce3ddaef134b3124fbc7dd000240eff0f5f5f41e83cd7f5bb37c9ae21953fe302b0f6e8b68fa91c6ab99265c64b2fd9cd4942be04321bb5d6d71932376c6f2f88e02422ba6a5e2cb765df93fd5dd0728c6abdaf03bce22e0678a544e2c3636f741b6f4447ee58a8fc656b43ef817932176adbfc2e04b2c812c273cd6cbfa4098f0be036a34221fa02643f5ee2e0b38135f2a18ecd2f16ebc45f8eb31b8ab967a1567ee016904188910861ca1fa205c7adaa194b286893ffe2f4fbe0384c2aef72a4522aeafd3ebc71f9db71eeeef86c48394a1c86d5b36c352cc33a0a2c800bc99e62fd65b3a2fd69e0b53996ec13d8ce483ce9319efd9a85acefabdb5342226febb83fd1daf4b24265f50c61c6de74077ef89b6fecf9f29a1f871af1e9f89b2d345cda7499bd45c42fa5d195a1e1a6ba84851889e730da3b2b916e96152ae0c92154b49719841db7e7cc707ba8a5d7b101eb4ac7b629bb327817910fff61580b59aab78182d1a2e33473d05b00b170b29e331870826cfe45af206aa7d0246bbd8566ca7cfb2d3c10bfa1db7dd48dd786036469ce7282093d78b5e1a5b0fc81a54c8ed4ceac1e5305305e78284ac276f5d7862727aff246e17addde50c670028d572cbfc0be2e4f8b2eb28fa68ad7b4c6c2a239c460441bfb5ea049f23b08563b4e47729a59e5986a61a6093dbd54f8c36ebe87edae01f251cb060ad1364ce677d7e8d5a4a4ca966a7241cc360bc2acb280e5f9e9c1b032ad6a180a35e0c5180b9d16d026c865b252098cc1d99ba7375ca31c7702c0d943d5e3dd2f6861fa55bd46d94b67ed3e52eccd8dd06d968e01897d6de97ed3058d91dd":"8e4bc6f8b8c60fe4d68c61d9b159c8693c3151c46749af58da228442d927f23359bd6ccd6c2ec8fa3f00a86cecbfa728e1ad60b821ed22fcd309ba91a4138bc9" generic multi step SHA-1 Test Vector NIST CAVS #1 @@ -831,123 +831,123 @@ depends_on:POLARSSL_SHA1_C md_hex_multi:"sha1":"8236153781bd2f1b81ffe0def1beb46f5a70191142926651503f1b3bb1016acdb9e7f7acced8dd168226f118ff664a01a8800116fd023587bfba52a2558393476f5fc69ce9c65001f23e70476d2cc81c97ea19caeb194e224339bcb23f77a83feac5096f9b3090c51a6ee6d204b735aa71d7e996d380b80822e4dfd43683af9c7442498cacbea64842dfda238cb099927c6efae07fdf7b23a4e4456e0152b24853fe0d5de4179974b2b9d4a1cdbefcbc01d8d311b5dda059136176ea698ab82acf20dd490be47130b1235cb48f8a6710473cfc923e222d94b582f9ae36d4ca2a32d141b8e8cc36638845fbc499bce17698c3fecae2572dbbd470552430d7ef30c238c2124478f1f780483839b4fb73d63a9460206824a5b6b65315b21e3c2f24c97ee7c0e78faad3df549c7ca8ef241876d9aafe9a309f6da352bec2caaa92ee8dca392899ba67dfed90aef33d41fc2494b765cb3e2422c8e595dabbfaca217757453fb322a13203f425f6073a9903e2dc5818ee1da737afc345f0057744e3a56e1681c949eb12273a3bfc20699e423b96e44bd1ff62e50a848a890809bfe1611c6787d3d741103308f849a790f9c015098286dbacfc34c1718b2c2b77e32194a75dda37954a320fa68764027852855a7e5b5274eb1e2cbcd27161d98b59ad245822015f48af82a45c0ed59be94f9af03d9736048570d6e3ef63b1770bc98dfb77de84b1bb1708d872b625d9ab9b06c18e5dbbf34399391f0f8aa26ec0dac7ff4cb8ec97b52bcb942fa6db2385dcd1b3b9d567aaeb425d567b0ebe267235651a1ed9bf78fd93d3c1dd077fe340bb04b00529c58f45124b717c168d07e9826e33376988bc5cf62845c2009980a4dfa69fbc7e5a0b1bb20a5958ca967aec68eb31dd8fccca9afcd30a26bab26279f1bf6724ff":"11863b483809ef88413ca9b0084ac4a5390640af" generic multi step SHA-224 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"":"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f" generic multi step SHA-224 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"ff":"e33f9d75e6ae1369dbabf81b96b4591ae46bba30b591a6b6c62542b5" generic multi step SHA-224 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"984c":"2fa9df9157d9e027cfbc4c6a9df32e1adc0cbe2328ec2a63c5ae934e" generic multi step SHA-224 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"50efd0":"b5a9820413c2bf8211fbbf5df1337043b32fa4eafaf61a0c8e9ccede" generic multi step SHA-224 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"e5e09924":"fd19e74690d291467ce59f077df311638f1c3a46e510d0e49a67062d" generic multi step SHA-224 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"21ebecb914":"78f4a71c21c694499ce1c7866611b14ace70d905012c356323c7c713" generic multi step SHA-224 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha224":"fc488947c1a7a589726b15436b4f3d9556262f98fc6422fc5cdf20f0fad7fe427a3491c86d101ffe6b7514f06268f65b2d269b0f69ad9a97847eff1c16a2438775eb7be6847ccf11cb8b2e8dcd6640b095b49c0693fe3cf4a66e2d9b7ad68bff14f3ad69abf49d0aba36cbe0535202deb6599a47225ef05beb351335cd7bc0f480d691198c7e71305ffd53b39d33242bb79cfd98bfd69e137b5d18b2b89ac9ace01c8dbdcf2533cce3682ecc52118de0c1062ec2126c2e657d6ea3d9e2398e705d4b0b1f1ceecb266dffc4f31bf42744fb1e938dc22a889919ee1e73f463f7871fed720519e32186264b7ef2a0e5d9a18e6c95c0781894f77967f048951dec3b4d892a38710b1e3436d3c29088eb8b3da1789c25db3d3bc6c26081206e7155d210a89b80ca6ea877c41ff9947c0f25625dcb118294a163501f6239c326661a958fd12da4cd15a899f8b88cc723589056eaec5aa04a4cf5dbb6f480f9660423ccf38c486e210707e0fb25e1f126ceb2616f63e147a647dab0af9ebe89d65458bf636154a46e4cab95f5ee62da2c7974cd14b90d3e4f99f81733e85b3c1d5da2b508d9b90f5eed7eff0d9c7649de62bee00375454fee4a39576a5bbfdae428e7f8097bdf7797f167686cb68407e49079e4611ff3402b6384ba7b7e522bd2bb11ce8fd02ea4c1604d163ac4f6dde50b8b1f593f7edaadeac0868ed97df690200680c25f0f5d85431a529e4f339089dcdeda105e4ee51dead704cdf5a605c55fb055c9b0e86b8ba1b564c0dea3eb790a595cb103cb292268b07c5e59371e1a7ef597cd4b22977a820694c9f9aeb55d9de3ef62b75d6e656e3336698d960a3787bf8cf5b926a7faeef52ae128bcb5dc9e66d94b016c7b8e034879171a2d91c381f57e6a815b63b5ee6a6d2ff435b49f14c963966960194430d78f8f87627a67757fb3532b289550894da6dce4817a4e07f4d56877a1102ffcc8befa5c9f8fca6a4574d93ff70376c8861e0f8108cf907fce77ecb49728f86f034f80224b9695682e0824462f76cdb1fd1af151337b0d85419047a7aa284791718a4860cd586f7824b95bc837b6fd4f9be5aade68456e20356aa4d943dac36bf8b67b9e8f9d01a00fcda74b798bafa746c661b010f75b59904b29d0c8041504811c4065f82cf2ead58d2f595cbd8bc3e7043f4d94577b373b7cfe16a36fe564f505c03b70cfeb5e5f411c79481338aa67e86b3f5a2e77c21e454c333ae3da943ab723ab5f4c940395319534a5575f64acba0d0ecc43f60221ed3badf7289c9b3a7b903a2d6c94e15fa4c310dc4fa7faa0c24f405160a1002dbef20e4105d481db982f7243f79400a6e4cd9753c4b9732a47575f504b20c328fe9add7f432a4f075829da07b53b695037dc51737d3cd731934df333cd1a53fcf65aa31baa450ca501a6fae26e322347e618c5a444d92e9fec5a8261ae38b98fee5be77c02cec09ddccd5b3de92036":"1302149d1e197c41813b054c942329d420e366530f5517b470e964fe" generic multi step SHA-256 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" generic multi step SHA-256 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"bd":"68325720aabd7c82f30f554b313d0570c95accbb7dc4b5aae11204c08ffe732b" generic multi step SHA-256 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"5fd4":"7c4fbf484498d21b487b9d61de8914b2eadaf2698712936d47c3ada2558f6788" generic multi step SHA-256 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"b0bd69":"4096804221093ddccfbf46831490ea63e9e99414858f8d75ff7f642c7ca61803" generic multi step SHA-256 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"c98c8e55":"7abc22c0ae5af26ce93dbb94433a0e0b2e119d014f8e7f65bd56c61ccccd9504" generic multi step SHA-256 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"81a723d966":"7516fb8bb11350df2bf386bc3c33bd0f52cb4c67c6e4745e0488e62c2aea2605" generic multi step SHA-256 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C md_hex_multi:"sha256":"8390cf0be07661cc7669aac54ce09a37733a629d45f5d983ef201f9b2d13800e555d9b1097fec3b783d7a50dcb5e2b644b96a1e9463f177cf34906bf388f366db5c2deee04a30e283f764a97c3b377a034fefc22c259214faa99babaff160ab0aaa7e2ccb0ce09c6b32fe08cbc474694375aba703fadbfa31cf685b30a11c57f3cf4edd321e57d3ae6ebb1133c8260e75b9224fa47a2bb205249add2e2e62f817491482ae152322be0900355cdcc8d42a98f82e961a0dc6f537b7b410eff105f59673bfb787bf042aa071f7af68d944d27371c64160fe9382772372516c230c1f45c0d6b6cca7f274b394da9402d3eafdf733994ec58ab22d71829a98399574d4b5908a447a5a681cb0dd50a31145311d92c22a16de1ead66a5499f2dceb4cae694772ce90762ef8336afec653aa9b1a1c4820b221136dfce80dce2ba920d88a530c9410d0a4e0358a3a11052e58dd73b0b179ef8f56fe3b5a2d117a73a0c38a1392b6938e9782e0d86456ee4884e3c39d4d75813f13633bc79baa07c0d2d555afbf207f52b7dca126d015aa2b9873b3eb065e90b9b065a5373fe1fb1b20d594327d19fba56cb81e7b6696605ffa56eba3c27a438697cc21b201fd7e09f18deea1b3ea2f0d1edc02df0e20396a145412cd6b13c32d2e605641c948b714aec30c0649dc44143511f35ab0fd5dd64c34d06fe86f3836dfe9edeb7f08cfc3bd40956826356242191f99f53473f32b0cc0cf9321d6c92a112e8db90b86ee9e87cc32d0343db01e32ce9eb782cb24efbbbeb440fe929e8f2bf8dfb1550a3a2e742e8b455a3e5730e9e6a7a9824d17acc0f72a7f67eae0f0970f8bde46dcdefaed3047cf807e7f00a42e5fd11d40f5e98533d7574425b7d2bc3b3845c443008b58980e768e464e17cc6f6b3939eee52f713963d07d8c4abf02448ef0b889c9671e2f8a436ddeeffcca7176e9bf9d1005ecd377f2fa67c23ed1f137e60bf46018a8bd613d038e883704fc26e798969df35ec7bbc6a4fe46d8910bd82fa3cded265d0a3b6d399e4251e4d8233daa21b5812fded6536198ff13aa5a1cd46a5b9a17a4ddc1d9f85544d1d1cc16f3df858038c8e071a11a7e157a85a6a8dc47e88d75e7009a8b26fdb73f33a2a70f1e0c259f8f9533b9b8f9af9288b7274f21baeec78d396f8bacdcc22471207d9b4efccd3fedc5c5a2214ff5e51c553f35e21ae696fe51e8df733a8e06f50f419e599e9f9e4b37ce643fc810faaa47989771509d69a110ac916261427026369a21263ac4460fb4f708f8ae28599856db7cb6a43ac8e03d64a9609807e76c5f312b9d1863bfa304e8953647648b4f4ab0ed995e":"4109cdbec3240ad74cc6c37f39300f70fede16e21efc77f7865998714aad0b5e" generic multi step SHA-384 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"":"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" generic multi step SHA-384 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"ab":"fb94d5be118865f6fcbc978b825da82cff188faec2f66cb84b2537d74b4938469854b0ca89e66fa2e182834736629f3d" generic multi step SHA-384 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"7c27":"3d80be467df86d63abb9ea1d3f9cb39cd19890e7f2c53a6200bedc5006842b35e820dc4e0ca90ca9b97ab23ef07080fc" generic multi step SHA-384 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"31f5ca":"78d54b943421fdf7ba90a7fb9637c2073aa480454bd841d39ff72f4511fc21fb67797b652c0c823229342873d3bef955" generic multi step SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"7bdee3f8":"8bdafba0777ee446c3431c2d7b1fbb631089f71d2ca417abc1d230e1aba64ec2f1c187474a6f4077d372c14ad407f99a" generic multi step SHA-384 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"8f05604915":"504e414bf1db1060f14c8c799e25b1e0c4dcf1504ebbd129998f0ae283e6de86e0d3c7e879c73ec3b1836c3ee89c2649" generic multi step SHA-384 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"665da6eda214":"4c022f112010908848312f8b8f1072625fd5c105399d562ea1d56130619a7eac8dfc3748fd05ee37e4b690be9daa9980" generic multi step SHA-384 Test Vector NIST CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha384":"7f46ce506d593c4ed53c82edeb602037e0485befbee03f7f930fe532d18ff2a3f5fd6076672c8145a1bf40dd94f7abab47c9ae71c234213d2ad1069c2dac0b0ba15257ae672b8245960ae55bd50315c0097daa3a318745788d70d14706910809ca6e396237fe4934fa46f9ce782d66606d8bd6b2d283b1160513ce9c24e9f084b97891f99d4cdefc169a029e431ca772ba1bba426fce6f01d8e286014e5acc66b799e4db62bd4783322f8a32ff78e0de3957df50ce10871f4e0680df4e8ca3960af9bc6f4efa8eb3962d18f474eb178c3265cc46b8f2ff5ab1a7449fea297dfcfabfa01f28abbb7289bb354b691b5664ec6d098af51be19947ec5ba7ebd66380d1141953ba78d4aa5401679fa7b0a44db1981f864d3535c45afe4c61183d5b0ad51fae71ca07e34240283959f7530a32c70d95a088e501c230059f333b0670825009e7e22103ef22935830df1fac8ef877f5f3426dd54f7d1128dd871ad9a7d088f94c0e8712013295b8d69ae7623b880978c2d3c6ad26dc478f8dc47f5c0adcc618665dc3dc205a9071b2f2191e16cac5bd89bb59148fc719633752303aa08e518dbc389f0a5482caaa4c507b8729a6f3edd061efb39026cecc6399f51971cf7381d605e144a5928c8c2d1ad7467b05da2f202f4f3234e1aff19a0198a28685721c3d2d52311c721e3fdcbaf30214cdc3acff8c433880e104fb63f2df7ce69a97857819ba7ac00ac8eae1969764fde8f68cf8e0916d7e0c151147d4944f99f42ae50f30e1c79a42d2b6c5188d133d3cbbf69094027b354b295ccd0f7dc5a87d73638bd98ebfb00383ca0fa69cb8dcb35a12510e5e07ad8789047d0b63841a1bb928737e8b0a0c33254f47aa8bfbe3341a09c2b76dbcefa67e30df300d34f7b8465c4f869e51b6bcfe6cf68b238359a645036bf7f63f02924e087ce7457e483b6025a859903cb484574aa3b12cf946f32127d537c33bee3141b5db96d10a148c50ae045f287210757710d6846e04b202f79e87dd9a56bc6da15f84a77a7f63935e1dee00309cd276a8e7176cb04da6bb0e9009534438732cb42d008008853d38d19beba46e61006e30f7efd1bc7c2906b024e4ff898a1b58c448d68b43c6ab63f34f85b3ac6aa4475867e51b583844cb23829f4b30f4bdd817d88e2ef3e7b4fc0a624395b05ec5e8686082b24d29fef2b0d3c29e031d5f94f504b1d3df9361eb5ffbadb242e66c39a8094cfe62f85f639f3fd65fc8ae0c74a8f4c6e1d070b9183a434c722caaa0225f8bcd68614d6f0738ed62f8484ec96077d155c08e26c46be262a73e3551698bd70d8d5610cf37c4c306eed04ba6a040a9c3e6d7e15e8acda17f477c2484cf5c56b813313927be8387b1024f995e98fc87f1029091c01424bdc2b296c2eadb7d25b3e762a2fd0c2dcd1727ddf91db97c5984305265f3695a7f5472f2d72c94d68c27914f14f82aa8dd5fe4e2348b0ca967a3f98626a091552f5d0ffa2bf10350d23c996256c01fdeffb2c2c612519869f877e4929c6e95ff15040f1485e22ed14119880232fef3b57b3848f15b1766a5552879df8f06":"cba9e3eb12a6f83db11e8a6ff40d1049854ee094416bc527fea931d8585428a8ed6242ce81f6769b36e2123a5c23483e" generic multi step SHA-512 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"":"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" generic multi step SHA-512 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"8f":"e4cd2d19931b5aad9c920f45f56f6ce34e3d38c6d319a6e11d0588ab8b838576d6ce6d68eea7c830de66e2bd96458bfa7aafbcbec981d4ed040498c3dd95f22a" generic multi step SHA-512 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"e724":"7dbb520221a70287b23dbcf62bfc1b73136d858e86266732a7fffa875ecaa2c1b8f673b5c065d360c563a7b9539349f5f59bef8c0c593f9587e3cd50bb26a231" generic multi step SHA-512 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"de4c90":"33ce98281045a5c4c9df0363d8196f1d7dfcd5ee46ac89776fd8a4344c12f123a66788af5bd41ceff1941aa5637654b4064c88c14e00465ab79a2fc6c97e1014" generic multi step SHA-512 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"a801e94b":"dadb1b5a27f9fece8d86adb2a51879beb1787ff28f4e8ce162cad7fee0f942efcabbf738bc6f797fc7cc79a3a75048cd4c82ca0757a324695bfb19a557e56e2f" generic multi step SHA-512 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"94390d3502":"b6175c4c4cccf69e0ce5f0312010886ea6b34d43673f942ae42483f9cbb7da817de4e11b5d58e25a3d9bd721a22cdffe1c40411cc45df1911fa5506129b69297" generic multi step SHA-512 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"49297dd63e5f":"1fcc1e6f6870859d11649f5e5336a9cd16329c029baf04d5a6edf257889a2e9522b497dd656bb402da461307c4ee382e2e89380c8e6e6e7697f1e439f650fa94" generic multi step SHA-512 Test Vector NIST CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C md_hex_multi:"sha512":"990d1ae71a62d7bda9bfdaa1762a68d296eee72a4cd946f287a898fbabc002ea941fd8d4d991030b4d27a637cce501a834bb95eab1b7889a3e784c7968e67cbf552006b206b68f76d9191327524fcc251aeb56af483d10b4e0c6c5e599ee8c0fe4faeca8293844a8547c6a9a90d093f2526873a19ad4a5e776794c68c742fb834793d2dfcb7fea46c63af4b70fd11cb6e41834e72ee40edb067b292a794990c288d5007e73f349fb383af6a756b8301ad6e5e0aa8cd614399bb3a452376b1575afa6bdaeaafc286cb064bb91edef97c632b6c1113d107fa93a0905098a105043c2f05397f702514439a08a9e5ddc196100721d45c8fc17d2ed659376f8a00bd5cb9a0860e26d8a29d8d6aaf52de97e9346033d6db501a35dbbaf97c20b830cd2d18c2532f3a59cc497ee64c0e57d8d060e5069b28d86edf1adcf59144b221ce3ddaef134b3124fbc7dd000240eff0f5f5f41e83cd7f5bb37c9ae21953fe302b0f6e8b68fa91c6ab99265c64b2fd9cd4942be04321bb5d6d71932376c6f2f88e02422ba6a5e2cb765df93fd5dd0728c6abdaf03bce22e0678a544e2c3636f741b6f4447ee58a8fc656b43ef817932176adbfc2e04b2c812c273cd6cbfa4098f0be036a34221fa02643f5ee2e0b38135f2a18ecd2f16ebc45f8eb31b8ab967a1567ee016904188910861ca1fa205c7adaa194b286893ffe2f4fbe0384c2aef72a4522aeafd3ebc71f9db71eeeef86c48394a1c86d5b36c352cc33a0a2c800bc99e62fd65b3a2fd69e0b53996ec13d8ce483ce9319efd9a85acefabdb5342226febb83fd1daf4b24265f50c61c6de74077ef89b6fecf9f29a1f871af1e9f89b2d345cda7499bd45c42fa5d195a1e1a6ba84851889e730da3b2b916e96152ae0c92154b49719841db7e7cc707ba8a5d7b101eb4ac7b629bb327817910fff61580b59aab78182d1a2e33473d05b00b170b29e331870826cfe45af206aa7d0246bbd8566ca7cfb2d3c10bfa1db7dd48dd786036469ce7282093d78b5e1a5b0fc81a54c8ed4ceac1e5305305e78284ac276f5d7862727aff246e17addde50c670028d572cbfc0be2e4f8b2eb28fa68ad7b4c6c2a239c460441bfb5ea049f23b08563b4e47729a59e5986a61a6093dbd54f8c36ebe87edae01f251cb060ad1364ce677d7e8d5a4a4ca966a7241cc360bc2acb280e5f9e9c1b032ad6a180a35e0c5180b9d16d026c865b252098cc1d99ba7375ca31c7702c0d943d5e3dd2f6861fa55bd46d94b67ed3e52eccd8dd06d968e01897d6de97ed3058d91dd":"8e4bc6f8b8c60fe4d68c61d9b159c8693c3151c46749af58da228442d927f23359bd6ccd6c2ec8fa3f00a86cecbfa728e1ad60b821ed22fcd309ba91a4138bc9" generic SHA1 Hash file #1 @@ -967,65 +967,65 @@ depends_on:POLARSSL_SHA1_C:POLARSSL_FS_IO md_file:"sha1":"data_files/hash_file_4":"da39a3ee5e6b4b0d3255bfef95601890afd80709" generic SHA-224 Hash file #1 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha224":"data_files/hash_file_1":"8606da018870f0c16834a21bc3385704cb1683b9dbab04c5ddb90a48" generic SHA-224 Hash file #2 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha224":"data_files/hash_file_2":"733b2ab97b6f63f2e29b9a2089756d81e14c93fe4cc9615c0d5e8a03" generic SHA-224 Hash file #3 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha224":"data_files/hash_file_3":"e1df95867580e2cc2100e9565bf9c2e42c24fe5250c19efe33d1c4fe" generic SHA-224 Hash file #4 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha224":"data_files/hash_file_4":"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f" generic SHA-256 Hash file #1 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha256":"data_files/hash_file_1":"975d0c620d3936886f8a3665e585a3e84aa0501f4225bf53029710242823e391" generic SHA-256 Hash file #2 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha256":"data_files/hash_file_2":"11fcbf1baa36ca45745f10cc5467aee86f066f80ba2c46806d876bf783022ad2" generic SHA-256 Hash file #3 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha256":"data_files/hash_file_3":"9ae4b369f9f4f03b86505b46a5469542e00aaff7cf7417a71af6d6d0aba3b70c" generic SHA-256 Hash file #4 -depends_on:POLARSSL_SHA2_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_FS_IO md_file:"sha256":"data_files/hash_file_4":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" generic SHA-384 Hash file #1 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha384":"data_files/hash_file_1":"e0a3e6259d6378001b54ef82f5dd087009c5fad86d8db226a9fe1d14ecbe33a6fc916e3a4b16f5f286424de15d5a8e0e" generic SHA-384 Hash file #2 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha384":"data_files/hash_file_2":"eff727afc8495c92e2f370f97a317f93c3350324b0646b0f0e264708b3c97d3d332d3c5390e1e47130f5c92f1ef4b9cf" generic SHA-384 Hash file #3 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha384":"data_files/hash_file_3":"6fc10ebda96a1ccf61777cac72f6034f92533d42052a4bf9f9d929c672973c71e5aeb1213268043c21527ac0f7f349c4" generic SHA-384 Hash file #4 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha384":"data_files/hash_file_4":"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" generic SHA-512 Hash file #1 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha512":"data_files/hash_file_1":"d8207a2e1ff2b424f2c4163fe1b723c9bd42e464061eb411e8df730bcd24a7ab3956a6f3ff044a52eb2d262f9e4ca6b524092b544ab78f14d6f9c4cc8ddf335a" generic SHA-512 Hash file #2 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha512":"data_files/hash_file_2":"ecbb7f0ed8a702b49f16ad3088bcc06ea93451912a7187db15f64d93517b09630b039293aed418d4a00695777b758b1f381548c2fd7b92ce5ed996b32c8734e7" generic SHA-512 Hash file #3 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha512":"data_files/hash_file_3":"7ccc9b2da71ffde9966c3ce44d7f20945fccf33b1fade4da152b021f1afcc7293382944aa6c09eac67af25f22026758e2bf6bed86ae2a43592677ee50f8eea41" generic SHA-512 Hash file #4 -depends_on:POLARSSL_SHA4_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_FS_IO md_file:"sha512":"data_files/hash_file_4":"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" diff --git a/tests/suites/test_suite_rsa.data b/tests/suites/test_suite_rsa.data index 7ec6751d4..2d87d6db9 100644 --- a/tests/suites/test_suite_rsa.data +++ b/tests/suites/test_suite_rsa.data @@ -11,23 +11,23 @@ depends_on:POLARSSL_SHA1_C rsa_pkcs1_verify:"206ef4bf396c6087f8229ef196fd35f37ccb8de5efcdb238f20d556668f114257a11fbe038464a67830378e62ae9791453953dac1dbd7921837ba98e84e856eb80ed9487e656d0b20c28c8ba5e35db1abbed83ed1c7720a97701f709e3547a4bfcabca9c89c57ad15c3996577a0ae36d7c7b699035242f37954646c1cd5c08ac":RSA_PKCS_V15:POLARSSL_MD_SHA1:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"3":"5abc01f5de25b70867ff0c24e222c61f53c88daf42586fddcd56f3c4588f074be3c328056c063388688b6385a8167957c6e5355a510e005b8a851d69c96b36ec6036644078210e5d7d326f96365ee0648882921492bc7b753eb9c26cdbab37555f210df2ca6fec1b25b463d38b81c0dcea202022b04af5da58aa03d77be949b7":0 RSA PKCS1 Verify v1.5 CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"867ac26e11a13b7ac34a42a1e177648692861226effb55bb597fbde10f299bf7fffd6fc8ddb2a46a73b97b67387a461b23e1d65dc119366286979add615b926b9272832fc0c058b946fc752dcffceca12233f4c63f7897cbaa08aa7e07cf02b5e7e3e5ece252bf2fe61d163bce84c0e0368454a98e9fdebf6edbd70b290d549b":RSA_PKCS_V15:POLARSSL_MD_SHA224:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"3":"3bb7b1c5f3391de4549e2e96fd33afa4d647dd90e321d9d576f3808e32213e948b697ef4fd2dd12923de6ec3ffd625078a57f86af38dc07052bb50547c616ed51fa1352b3ab66788408168d21263ef2d3388d567d2ce8cf674f45491ab2b0319d47be1266bda39e343b2a38ea2d6aaaee6c4465aee1d7bb33e93a1c40a8e3ae4":0 RSA PKCS1 Verify v1.5 CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"cd810e97dc21095ea7a0238027a7bafd343e01444785ea9184a44a79f80438c41fc0b57aa95693407da38fe5ff0ec1398e03361e51a3dbe134b99cca2df0cef1c444ca54d2b7db2789455b6bb41918c24001fd82fc20ee089de3f34f053699c1c5f7954ce0aaabb9d26fce39d032894152229d98cf64ecafc7089530073c61d9":RSA_PKCS_V15:POLARSSL_MD_SHA256:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"3":"7b5fba70ec5b521638f182bcab39cec30b76e7bc017bdbd1059658a9a1db0969ab482dce32f3e9865952f0a0de0978272c951e3c015328ea3758f47029a379ab4200550fba58f11d51264878406fc717d5f7b72b3582946f16a7e5314a220881fc820f7d29949710273421533d8ac0a449dc6d0fd1a21c22444edd1c0d5b44d3":0 RSA PKCS1 Verify v1.5 CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"44637d3b8de525fd589237bc81229c8966d3af24540850c24036330db8007e6d19a19486018b2b02074da590aaba9d2c8848c0a2d1b6de4dfaf24025b6393df9228008f83f13cc76a67cfbed77a6e3429342824a0b6a9b8dd884094acc6a54bbc8c8829930c52fe39ce5e0dcd02d9553ef899d26eb6cae0940b63584e2daeb3b":RSA_PKCS_V15:POLARSSL_MD_SHA384:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"3":"38fc4f6f0430bb3ea9f470a4c0f5cebdabac4dbeb3b9c99d4168e7b00f5eb294ec0ece1908eded1f3e14f1e69d10f9feb425bda0c998af945ef864298a60a675f0bb5c540a7be3f534d5faddff974eea8bffe182a44e2ee1f4f653e71967a11869ee1a850edb03cb44a340378cb7a1bc9616d3649b78002b390a05a7e54edec6":0 RSA PKCS1 Verify v1.5 CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"d03f12276f6ba7545b8fce719471bd253791878809694e8754f3b389f26c9253a758ed28b4c62535a8d5702d7a778731d5759ff2b3b39b192db680e791632918b6093c0e8ca25c2bf756a07fde4144a37f769fe4054455a45cb8cefe4462e7a9a45ce71f2189b4fef01b47aee8585d44dc9d6fa627a3e5f08801871731f234cd":RSA_PKCS_V15:POLARSSL_MD_SHA384:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"3":"d93a878c1ce86571590b0e43794b3edb23552797c4b8c9e3da4fe1cc4ac0566acd3b10541fe9a7a79f5ea4892d3069ca6903efb5c40c47eb8a9c781eb4249281d40c3d96aae16da1bb4daaece6a26eca5f41c062b4124a64fc9d340cba5ab0d1f5affff6515a87f0933774fd4322d2fa497cd6f708a429ca56dcb1fd3db623d0":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"b2f2e6e09fd19b0a8c06447554d6a236c69e2b334017488881d8c02ab81d74cae0c64efd50a374998eeec162651975e637cb2ba594250c750a4943253f1db0613e4ce1d50f8e3e968a2a83bd6cb97455ab2ccc77071076b3e211ffb251bd4c1a738b88b2021c61c727c074ce933c054acbcbf4f0c362ec09af38de191686aebe":RSA_PKCS_V15:POLARSSL_MD_SHA512:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"3":"a853e67f928281d11506c9d39e5ea9b2d742782c663c37d0a7c9e9fe15379cde1e75d94adbfb1ca08691f320af4ff2b0a29a4d2ea10a20cb95d85f3dabac3d56cca9039c851d0181408c00b385fc82cafa4cfa7380d0c2c024fb83fec59d5ee591d63806dcb18b21ea440c3d3f12c1e7795eb15b7ce4c4b288d646cf1d34bdf1":0 RSA PKCS1 Verify v1.5 CAVS #9 @@ -39,19 +39,19 @@ depends_on:POLARSSL_SHA1_C rsa_pkcs1_verify:"55013a489e09b6553262aab59fb041b49437b86d52876f8e5d5e405b77ca0ff6ce8ea2dd75c7b3b411cf4445d56233c5b0ff0e58c49128d81b4fedd295e172d225c451e13defb34b87b7aea6d6f0d20f5c55feb71d2a789fa31f3d9ff47896adc16bec5ce0c9dda3fde190e08ca2451c01ff3091449887695f96dac97ad6a30e":RSA_PKCS_V15:POLARSSL_MD_SHA1:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"10001":"dd82b7be791c454fbbf6f1de47cbe585a687e4e8bbae0b6e2a77f8ca4efd06d71498f9a74b931bd59c377e71daf708a624c51303f377006c676487bad57f7067b09b7bb94a6189119ab8cf7321c321b2dc7df565bfbec833a28b86625fb5fd6a035d4ed79ff0f9aee9fa78935eec65069439ee449d7f5249cdae6fdd6d8c2a63":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #11 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"f4a990b8d434a5914340c0ca3ca4e4a70856c55e13e938c1f854e91cdef54c6107d6d682a62e6c1ff12b1c6178ee0b26b5d8ae5ee4043db4151465727f313e9e174d7c6961abe9cb86a21367a89e41b47267ac5ef3a6eceaaca5b19ae756b3904b97ec35aeb404dc2a2d0da373ba709a678d2728e7d72daae68d335cbf6c957d":RSA_PKCS_V15:POLARSSL_MD_SHA224:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"10001":"d8ef7bdc0f111b1249d5ad6515b6fe37f2ff327f493832f1385c10e975c07b0266497716fcb84f5039cd60f5a050614fde27f354a6c45e8a7d74f9821e2f301500ac1953feafeb9d98cf88d2c928413f337813135c66abfc3dc7a4d80655d925bf96f21872ca2b3a2684b976ca768fe37feae20a69eeec3cc8f1de0db34b3462":0 RSA PKCS1 Verify v1.5 CAVS #12 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"c81f04c79982971fa176d64e8f7f8812f86a94c49e84672ff10996a2d6dfc444a884c7a87c4606a1aab22558894ee59b798b457827f5ee0b0cadcd94371902cc4ddaf97acefed641997717bcb3cc74cd440f0a31e20fb95812cecb740c36d6d1bf07e3641514cfa678aff2a39562ff4d60e02b17583a92bf0c56d66bde9e09f8":RSA_PKCS_V15:POLARSSL_MD_SHA256:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"10001":"52111f4798da3c11b3c74394358348ab0fc797bde99080f238d33a69b04b08ac2bd767b33872473943e23af27ca32fd568a43a8c7d6cc55b4fbb380212fdfcb60487e20694d4287e233efdf7b04737c0037a592d03077801828b051998c42b9f9e2420063331d5b2349918a64d8b65b21a2011ee7318fcef48aced95b8ddf501":0 RSA PKCS1 Verify v1.5 CAVS #13 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"a97824871770b79da979a111f6decfb1dd11bd946cfa800b008f0ad5aea5aa92e205d27a46c31d4fe6cb909091bd21f082fb75074000ee46c2f3e530d77b34c7c5d6f8453025950d3e0afae1f9752655f5bbea8432e9f1014357ff11b08076179a101e4f9d3f25bffb5e656bf6afe6c97d7aa4740b5d9224cde4dede035a7768":RSA_PKCS_V15:POLARSSL_MD_SHA384:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"10001":"d5dcd27c74e040ea86f106b63d3275fa7b7e98d2dd701f38ec15fc7301b72df127f6d3bd5571253a0b9e0e719d7d522893896941a1aeccc697912282b5308d829b91905b5dd7b7e1b8fe27e2bd4003b09dfe7fe295f8a43c076c0cb52f2aac067e87de7ffe3a275d21a870c3dfc9b1d06d7f018667de9eb187bdf53d282e5d8b":0 RSA PKCS1 Verify v1.5 CAVS #14 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"4ce61930c79dc017c2dea0c5085d73a3b0e4a6f341e9a5061a6658af11e5edf95bdad915ac3619969e39bee15788a8de667f92f4efc84f35082d52d562aa74e12cc7f22d3425b58f5056d74afcf162cd44e65b9ee510ff91af094c3d2d42c3b088536d62a98f1c689edcf3ea3fc228d711c109d76ae83d82d6a34dcfbad563cf":RSA_PKCS_V15:POLARSSL_MD_SHA512:1024:16:"e28a13548525e5f36dccb24ecb7cc332cc689dfd64012604c9c7816d72a16c3f5fcdc0e86e7c03280b1c69b586ce0cd8aec722cc73a5d3b730310bf7dfebdc77ce5d94bbc369dc18a2f7b07bd505ab0f82224aef09fdc1e5063234255e0b3c40a52e9e8ae60898eb88a766bdd788fe9493d8fd86bcdd2884d5c06216c65469e5":16:"10001":"27280b92eab5cbf0d787ff6fa6b0151d6610adfd25116113f2f186f3f8d39736d91ae510ec2bd96f2de135aefda79178138696dcc6d302e4a79ddabbe16e39ab96075776afce863e84a2e6013cb457e4047e22d43f67bf64ae5e1d844a7c12ac696efbb3cda7c0e0aca71f8a7ada9a0547bfaefe1ba2e04058c672c803720dd9":0 RSA PKCS1 Verify v1.5 CAVS #15 @@ -59,19 +59,19 @@ depends_on:POLARSSL_SHA1_C rsa_pkcs1_verify:"224ecd3b630581da948216366c741015a9723c5ea43de67e28454d0a846f54a6df167a25cc500cf21f729aaefed6a71a3bdba438e12e20ad0c48396afe38568b70a3187f26098d6ac649a7c7ea68ed52748e7125225102216236a28f67753b077cfd8d9198b86b0b331027cb59b24b85fd92896e8f2ff5a1d11872c2e6af6ae2":RSA_PKCS_V15:POLARSSL_MD_SHA1:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"3":"1f7938b20a9cd8bb8ca26bad9e79ea92373174203f3ab212a06de34a9a3e14e102d19a8878c28a2fc8083a97c06b19c1ae62678289d5d071a904aed1d364655d9e2d16480a6fd18f4c8edf204844a34d573b1b988b82d495caefd9298c1635083e196a11f4a7df6a7e3cc4db7b9642e7682d22ec7038c3bad791e1365fe8836976092460e6df749dc032baf1e026684f55936beb9369845c53c3d217941c1f8d8f54a32333a4c049c3f2d527125778032f5d390040d1d4cce83dc353ce250152":0 RSA PKCS1 Verify v1.5 CAVS #16 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"6ecc722d233dad1aca45e6bc3e1a0b99fb1f89c0ec63bc657e6aaacbf931f267106cff42b712819f341b1ede798964a0b1a5032c198b391111e88d0d7303c02e23fa0137e74e604579a285b2dbc0a23aebdda65c371eb403125bd366e822e72dceffe0d55dfa3155c16283020dc9abb0d150da1aef251484aa49e49e00974dac":RSA_PKCS_V15:POLARSSL_MD_SHA224:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"3":"339dce3a1937669d9fb14c4f652378861fd5adc4da88eaf833b16020b55a24ddc83b7ae3395a9a49b426bb9a4170cb765b02652faa9594b457aeefdae4f802e93d8e65c687ddc723701465a5ef19249ed5d2617b5121c58557b34eb99a663bbcf4453a6e1db5d88723de449fcf58ca8ef514daf08cfdc71be155bb3d0724df0c0a6fd5aa7737433cc376640b9b8b4c7ddd09776bae0245729cddb56e36f28edad6aecaed0821ec8d843a96348e722bf0a84cf060a793a2179f054138f907d0c3":0 RSA PKCS1 Verify v1.5 CAVS #17 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"72f0b1ae27e1f5e5bfa15ded204c2c54b47b2420750a3eb5471f9ff98b67c8b5f1a30d3f8d6448562e12ce4deb33a26cfeeae993d6be9e20679d8713c5216870f11276e5f22b0ead2821a7b4dee106fc1e19b13fc9fba5d6e73e4bd93b65a9881a43d5e97ebfb0b357d5d06b21ddbecdbb10626d7748bb9e6e07d49316bbf3c4":RSA_PKCS_V15:POLARSSL_MD_SHA256:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"3":"8117a6897e14c183737661cf5741350a84ae00495cd9ee8fb033582e559f79701ab424706660515ee5821a69a6850647ec641676a625d1a3899932aaa52161fbc0c0a825db82fde0585b3c9b9c16de43e26da6a30fe5a601dae68bded1e29ec34557b5f6962efb10b9450d6f096655f68e8499cfa16a0adeb9075e7b91851fef84243132d08273d35d01ad89c17e1e6e4deaf1cb233050b275fa9d2cae57e9e1a0e23139267040aa39b6abd8f10fa1cec38ce2183573ddc11626fc262e1a0ced":0 RSA PKCS1 Verify v1.5 CAVS #18 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"f80c94a2b53736978adf041886ad97ab2aeb9e91c08bd4eeef6b2f2b8dd75a99b4506657188bbd7597bd5759121630627c8bf9cc30d90dd488c7a81cabab5350a62fa30abf5523f305b98f2c2c1743ec980cf26ab8219bfd9505b981ab1abbfef733b384519d5259fc5c14577cb6b88fa7f6f332ff6a65b23faecc24342c78e9":RSA_PKCS_V15:POLARSSL_MD_SHA384:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"3":"6b49553ed964ae196a41ea281f4d2a250ce7d1e7434e45cf6a82f7bed17554f39c3f0241e0364702fcb87475eb0c0839ffd2180890fa05b4bbf31bbfa4bf5119dea0c9f88e1e9617fcdadabc6fa1945136cc66e039b905d78ed365c5806d38aec88b3edfb86c05ff446dbfd51d7cd75cbf8d3b85154c783765386f51637532221f52429db5612dcc034968bb8feab7dc6f5ed1f2feb557f6dd49c980296117be2c4195ec7b6101ea767df9d16a56fc9709b49308a54dab63dbc4d609f959ce17":0 RSA PKCS1 Verify v1.5 CAVS #19 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"4eb97094bb42aaa58b040bd06a8f324396b9eca9e39359b7039c4a010434ee131a53aebd9f7a55ae58ea7444fa1505a3ec524e054fd408513cddc1ee4c2f7fd95ec4a6f594be1ba39fa1aa933dc0a5dafff5ce44509577ebb3a3e8084c44010aa27321e5a3f646ade99175633b795c0f570b360eeebeefaef15788f80b5cbecd":RSA_PKCS_V15:POLARSSL_MD_SHA512:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"3":"2b8b794a8621d492eec18a4efd239e0e077c89340a34b0fdbf467f2bf3112c7f33d00ee736f2988af8569c1a74891efbefa839e295fffdf4d908c1ede61a861a4d24b154a09d1b3f923fd2bb7906994cf82a97da285bf48e61f90cc3596f9350ab9b66a216ffca323195bb213f5a77fe8c697475595a1857dbee58128cbf1be7cb220229ce52766fefd88cc129ad5cbbdcd31fb4eede6c4fdd3193a9aaaa54362bcea4082981d9b7c40483814828f3297d95ad933c76f31c47e37a93ffaf0d4a":0 RSA PKCS1 Verify v1.5 CAVS #20 @@ -83,23 +83,23 @@ depends_on:POLARSSL_SHA1_C rsa_pkcs1_verify:"ac58fd024208d7f045d81a56cd55aad40ab86b0d216ab55136c7027aca23ea13480a52c0dacce0d98139b25965aa4ff76a41dd92037195d24bc0750d52cb3467b48b7b3e71d852c5f82bd9ee85a8388ead5cd8bc38c3d4792e8daa9734a137d31963e245ad3217fad235f7dfd5584de0fe91c4526568588e08b60bdf1badd99f":RSA_PKCS_V15:POLARSSL_MD_SHA1:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"a142b0d9456f8f4772675265a08613a66c416bd1ae712975c69d9ca5fb8c1be9c24359a04fd15460bf6136a8a11f13e3ce2de2171524f10cb715f0d71e3db15281ab99eadbe86cf8c5c518162c638ef27a4f7bfb4a1a3873f3c384a5b1c3b4966c837b9d8d192ac34e03943b7ae191355aa1ff3b9cd041bb2668f1f81cf0d015b3d3608cd9ac79398212c0f132f1bd45d47768b999fcf3c05fe2069593ceecedc851a7fc465abcfef0fabba9b9460153f6ba8723a5c6e766c83a446aef3ee327":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #22 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"027f767928a5821e2723d6f36c43e6b498b6f0b381852571794a096bd49f1c36a4d7bacec7ec402c24b970163169173bb930ec7fdc39bc9457dfc4ca051f5f28a64de1bbe007c22e8368ff9b117dbda17efd2fb73434bbbf5a4158df56813b8c904bb2e779de504dcd974a291568210d6f85810291606a1c0cd88d51ceadf98a":RSA_PKCS_V15:POLARSSL_MD_SHA224:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"0676e64daaa18f4af46e9dfbe234db389b8a527b0fe1db97eb7f404e3155226cba70d318800f83160fa1aa19916e5c09f079331079f18cb8ab1a4b884cb28501824974f683ed2b9babae9f8c15bea30802805c6b2152119764811bbf5f3994d2e97fa2fe8c5ab15a23c14d7ae56be00eaa8bc26678481ff5ba59b0acfb0e43341bff9fc638e5625480a73dbc5d8d13bd2b9e64037c6b79df0c60869980c6a22ec46f80fb859cb4ee5d2032ac1fe538cfd85c70a7f33b4af50a93395917c2cfb6":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #23 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"06dcd9d4c056b6a45b9ed2ae5f6c1cfa43aae06fe01ee098264aa7a80e901abbcf9a505e55f9a352ef0c078d48249b8298e57ea21bf0e423c3bf69002acfa541ca05007c704bc79cee7a80e1107c7b28d2b2aa6dd093b28efe9642519952a4a95ee49235f9924a0ac0aee5b2a1bce47459d70cd6e75074614199dca44561407c":RSA_PKCS_V15:POLARSSL_MD_SHA224:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"5e08f399258e6de075b67a0a6a822ceb21b1eb7a0342eca6a4295739f644547dee3456243cf32bd6ea6f357c88632508457130f3dae04f7806efaed43d1d501e16c961dfbd6c71a42b480e95c7027f8275063d05a9aac3eef0520867b9896ebe8ec358f7d121beb4e61ddfdc3dcd835dfe265f2ba68d300ef566ed1284f9f3d7b1af363ed47bfa2e5f0492925444df7e5fcb1e79e690c746117650b543a5e82c39553552f0f44e617b5cf773c533050f4129e893ac22af69b1eb9afb4b5ba5f5":0 RSA PKCS1 Verify v1.5 CAVS #24 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"1240028c6d7ab3992ada0e5ca55ee4f3d62f8de575302d5861d73685423c2e6a6d6fb3be090fbc2a701821b6d8fd5e8233f794b6549cd0bb52b390ac31478307bffa91a9bd9c1bf93ffc846356fef008ebee4bb3ee148e0fb1893d188e4934d0d088a433d14a596c5f2e3e49648a22edc6bdbcc58dc1edbd440046b3a169ca2b":RSA_PKCS_V15:POLARSSL_MD_SHA256:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"a003ae9cf0704d58763b214f20446ecc4099c566f25384e28d0dd6540c58705fc8d0bfe1ceaa06096ed1e230146edb82056e39e6727abec09f25e44079b6ce1ca2c6a540dec7aa34444d7d435f41e5fca9b0bba62759ae2780638e5160e031bb60409c2e85674ac7a776b444b37b9d7f4dbaa557e88b8562a584f2dbe90729b241aede95dfcc7e05b10deef06255cb89f0e7ccff23354818756a1f8bb9f00fd18f6cd22ca1b4bfc38027562bb37562c77c7883b5d735170d75521195fd3f2bd3":0 RSA PKCS1 Verify v1.5 CAVS #25 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"67922a8b9cbc95cf7c555ff2d73cfc62ee04c3f0df9bfc8f64293a58bd3bebd2eb212d711f94e35c729d0873d6b244914d21bd0e59b23089b38740e43f480e8f407d090ac93b08a57403968b55e78cfe31eee6e4ecbacf834168fe89b6b8454fce6e675e80f82b33e850ae3f3d24fd320335e37981fd000576941b4f08d4ba99":RSA_PKCS_V15:POLARSSL_MD_SHA384:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"2c6b301852cc55a993a933e2c080eb9dabfe19e9dc3571066caeabed1492d3501cd838de1c01784932df7a5ad5bbfb48c78f53a45f76e9812d046f23bd968495ef7e981e5add4acfc538fe33a5205de74bb37d3d9b6b87b2d174e85a73f216fd67d5738fc469dff7ea6b852e8dd08bc8df036597372d4d51185e6f47a45fbe1b9bdb06a4018783425ec95294de41f27235ad3b3263a890b8b62b17410a9bb08673393ff205a866ee2057e99c6517c6bbc84f8d87717b83d6f64de7ee215e1e8d":0 RSA PKCS1 Verify v1.5 CAVS #26 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"1428b4a449698a994ef84c46a517c3aa6359c48e4264ef65f1f69d77ae26133e17edfc103de416fffb4f2bfe865b434544a418f6e2faca00a165d443f0663ff64080154614f7194057d8b5f1f33934cc9fc2314cf86d4fdad4892bf0d3058f7f37ebe98ef52bfb240b9ad369153afe081bbcf9d7ae43e8ba336b8ac57e8a6da0":RSA_PKCS_V15:POLARSSL_MD_SHA512:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"8e10a1ae470e6e57a8d234185f78fdb600cc636c41565a9f3694a84ae102f6251984f54d11a7785fdcfdfaf80a821e05d57ef6b8edc03d9076755779322fd53eb98c805da77dc9316744e393c2fecd291a7e6043b1ca89fd8248f661e1d53110211b91edb41b31e848cde1115d8afd9963ebcc36aff5a27085949f0781bc69167c140ecfe71c44aacaf4123e557eaf2b528c6d0ea875b4ceefa942fe338af8df10562c438af04cd7521da912b3e3899cef0d75722161be6abed5e4e9009dbf40":0 RSA PKCS1 Verify v1.5 CAVS #27 @@ -107,67 +107,67 @@ depends_on:POLARSSL_SHA1_C rsa_pkcs1_verify:"4871adc05f6b3ecf296680b0dd8d86715b0d5264c064008037dc410512520b5f193c8f4d21eb6c42e10d220c0275c9b3751f03a4096e2f0e3db9df8d52068c06a51589d23ca1361e9fe27691e95663301ec1407fbf73aee99cc92362eaf6994b95038396d815052a0aef6489bbb7bcb0fffdf13f0af9e7d9fd14f6ce00ab98f7":RSA_PKCS_V15:POLARSSL_MD_SHA1:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"11":"180caf03781b391aacebe5b3f5e1d3b01c68a00df4ecfb6c4bf14217aed7cfca0adac099ec1d6e1f0b43b09b86788533fee6691d773807af0df6cc3bbdde3cf34bf5b848fa59c8bc10227cc3eba3452a85e0520fccdb2d8d32dd99672d302756a2d7f7f2693db3a48be17bd34d9d891f4ba44449c5bad1de91b788f524500a7703cccbaa77b9fe8791f5c8aa7b8f055336f28fcfc01733712e33cfb3d33fe71ddb9ced2a31931ec38007f5ad4a0d19acc428124b0e5ee6e0746fb33c1a4d90c8":0 RSA PKCS1 Verify v1.5 CAVS #28 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"3bba64de38438a71b95ab9c94539d5870c1fb08d7a9937600c00e9d063438edc97e625d0cd4b1eb00c31c9d94c7a0fe6d03160d1b6cbec5acdad16ada6ef253fee603df9faca8f98a477cc5456f3dfbf6414dbf19f3832e227ce291780188881e82e96a2e84744f12a34a9808a2daedc6fd00b345c6772bec26a095719451e6a":RSA_PKCS_V15:POLARSSL_MD_SHA224:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"11":"8c846e75e32ce5f9964bdd8f6dcf1d2996a646b233bcf1bd6394e13e856691b89bedd18290a0f9f7c90dca307271b3108e795340490513b25e6789e93722c65ec064b4c43457295a31d1f07dd605e133fd6eaafc58cda132df2939f5f693e0205af34550afaa137f3e482885e50dfb48333a15c0821e7a19642acdddc6fea3c7487c691246a2b083dac439889d5ae741b7e08c47937530b4b069f1a260cd07fe4a0ddd530ab11534fb805e9b562118ee0e97932966008aadfc83f3b8a10de8ee":0 RSA PKCS1 Verify v1.5 CAVS #29 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"f7857ce04bf4292ea1755f9e587822372f4dcdf10bddfc0ff498a8af60ae94a0b482e873085c1cd52a5d181ce6b99a1f8520d74b947d65f3e7e358e8ddc4ac4ae465e39d408eee1f09865159733f83f553cd93cfde1c114fb3e32cf51cd418359016b3867df467b645d752808671a4609f3c49a67023c9ca617e6cffa544a10a":RSA_PKCS_V15:POLARSSL_MD_SHA256:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"11":"9677300bbee003be3c445634f8ed5beb152b63f46f84cf5a8e721e0fafe8f3f7e99a6d50741f23f449d3026da3e8a7ac36be99ab44831803486ae552f7aa01f075287829b231d2d0840908e09081ae177ed888fe46a9d937a0871eb5d52ec541c8411c4cbf7efea6ca213b12cea513b0739eedca7c9473e10a7796936f4eaa0c5d3a9013ca5536781ac68eb2ca5779144de23da2e9875114aca885b3219dfc292d73940c5992ea3c4882889e7543430652860e441a01a45d9f4005a012421493":0 RSA PKCS1 Verify v1.5 CAVS #30 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"ca312774f2756ac2019f213a01a63c9a0b4a49ccafecf25e97a4c632668e3c77e664f4d7635241f25205e50c37061b02c546db8346fa597c3da8cfd44a827c5a4ff4ecfcd1797b39a1b215d9bbb93fdb6eb35bafbda427a5068888a6e19f86224b0897490491207e35ce39085668b10b4fb851b7dd9465c03869790ef38a61b5":RSA_PKCS_V15:POLARSSL_MD_SHA256:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"3":"a202c33eb831b9d8e818b6c3bcdb42818e1d9c22a06ddd73a17a21e49d18cda44df349a066477cae068e1a5d2b518b0885e889ef796ca9e6f42a69ac755b8a6405fbaef93fe0130d98de35d689addfee3eecd26658903f774bda481c3f40ee0e9569a3c3e2da7ad576c7de82159d933e36fa29cfef99367005e34ab5082d80f48276d37dabc88dbb023bd01585329d2ccf417f78ec508aaa29751007d31f1669296b981d44c8fa99130c5df7a071725b496859314aaf9baf0ebc780355914249":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #31 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"2abe079077290ceb6c80ac5c61062ce8da814b1fb99a1a9fb2860ed900e6541856ec64bf19c0d9d1cc2280b7cc50af3e3d2ad8e044945d44761ca60891dd72bd6aa26a33274ffcf7ae7d661b5e651135fcff21aaf06b4a2db18fe5827e0243884f2841760b9f1c65fbda870f7f0cfbd6ff484f0825e688614928f2d12d1e7080":RSA_PKCS_V15:POLARSSL_MD_SHA384:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"10001":"402631f3cddfb02cc4d9cb58ef1ab6726bd787a50e12e98567c9702bfdf47af85904aec5a2f6c5df9a10f08f90f93728eb090ae2ac21ded9f38faecd8195f3eb3d4107521b1cee956e7a214245b038adae912fa35ec97cb3bdc41352e8aaff80173561284cb740f999a3cd6653a6c3d5a3f911a416f41e2155083982c99eb5998a0a74d77f1ae999d901ee24a7f2c424179a3f92b07dc0b3498c1884e60677bee0175e810b426c4ad008d2743cd19b00b33177bf8be3fed7f7406e1bce0c2ea3":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #32 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"da9505809dc92cfd8e01a1857dde52df6677c40d98f4577c1659ca7d3e9f01f9a809065f51b54fe2f9723fe2c9d1eea7397f2d5531d1c51c6ea100b028596bf9f24dd90be14eab58f07b4f24a35b073aeb29ecde4a6f320237d7adbdc43d94f87e08866b95bbcac83dc7db3553a42400441f088e2bf6259539a2da8b5a74065f":RSA_PKCS_V15:POLARSSL_MD_SHA384:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"11":"57edd0560df9840a25c28ff6d254e432395a5cd2d92248b3b44d7eab0fc65b3c4e545a916a8e90ce89745119db9ec9799aa8890f5250fb589cfc12dac1b6e406a39bc3b3663892da5354ba453cbd5e4c89bdce82d0ffe97052a03a5c3308819c1139ebc780c13cf6dc1477faf734abcb1db3fafaed6f22885c9c0222ff5deacb8cc6d027f2e959c3075011b382e88c4b27b83b4f2e6fda022e331c3602d19f5ac7bccfe95ea1e93d736dbd918ae5b1f468cd0b5b536a2f918d5e27a0757e75b7":0 RSA PKCS1 Verify v1.5 CAVS #33 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"d0cd038c65b3acca45822eaf91ea5176e82043268876dec0b62e2abd619023b7023abc67c6b823cfef5447b8772f985ff7910d6cc87e6c23688ac6de1fee40bbe2da1a92770de92adaa427ace02fee571a0a0176fceb0c8f3eb72dde839ab201395625f5c0db8641ce19d7711212dec61733262c6ce4476c025e67a3d5bc01f3":RSA_PKCS_V15:POLARSSL_MD_SHA512:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"11":"2f30629c1117d013bb36e6099dee931dcaf0a1032b07ec23e2b262898a8945e569c9573d81e22bb0a5f8a28b0d7b8ff01367dd7f089c68ed1daa11cf53a96ee91b38e6b839b6e90bea34d14b78f5d2c7629b68c5b4f2ecfff66b483b2233cb14f95df533c867a2b610aebcdbb7ea3109aaf2f5762ab3edc2571deccc7da0c9a5b443ca2b924c0f18de7bbb736a08fed3916795018a436a3ae62c85d554a53a6d48623908e06e7d275f4251d3b3bd530bd11e155dcf2b5c2adf030cdf931ae749":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Verify v1.5 CAVS #34 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA512:1536:16:"a59d9b7269b102b7be684ec5e28db79992e6d3231e77c90b78960c2638b35ef6dbdac1ac59e7249d96d426e7f99397eabc6b8903fe1942da580322b98bafacd81bb911c29666f83886a2a2864f3552044300e60cedd5a8c321c43e280413dc41673c39a11b98a885486f8187a70f270185c4c12bc48a1968305269776c070ef69d4913589a887c4d0f5e7dd58bd806d0d49a14a1762c38665cef4646ff13a0cd29c3a60460703c3d051d5b28c660bffb5f8bd43d495ffa64175f72b8abe5fddd":16:"11":"0b4d96f411c727a262d6d0ade34195b78603551061917d060f89add47b09dfe8715f4f9147d327dc25e91fe457e5d1a2f22cd8fe6fe8e29d2060658307c87a40640650fef3d4b289a6c3febc5a100b29a8b56623afb29fd3c13ea372bf3c638c1db25f8bd8c74c821beec7b5affcace1d05d056a6c2d3035926c7a268df4751a54bc20a6b8cfd729a7cba309ae817daccbef9950a482cf23950a8ca1d3a13ddb7d8d0f87ad5587d4d9ebe19fe93457597a7bdd056c2fd4cea7d31e4a0e595a7b":0 RSA PKCS1 Sign #1 (SHA512, 1536 bits RSA) -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_sign:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA512:1536:16:"c8c67df894c882045ede26a9008ab09ea0672077d7bc71d412511cd93981ddde8f91b967da404056c39f105f7f239abdaff92923859920f6299e82b95bd5b8c959948f4a035cbd693ad83014294d349813d1ad57911a6355d0731fe3a034e9db":16:"f15147d0e7c04a1e3f37adde802cdc610999bf7ab0088434aaeda0c0ab3910b14d2ce56cb66bffd97552195fae8b061077e03920814d8b9cfb5a3958b3a82c2a7fc97e55db5978b47a922156eb8a3e55c06a54a45d1670abdfb995489c4d0051":16:"bd429bb7c3b00bbea19ba664c0f8172d1a73c3cfa05e2ed656d570c1590918bb7e372ed25e2cd71395ba0a9b1a30f3ee012ffb0546cab8e3581fe3e23f44ab57a8aee9717e71a936a580fa8572d450fb00339a6f6704b717df0c149a465bab768c61500cd93b61113ff3e4389167f7b2c8e3c0da2d4765286bee555b0bcb4998f59b14fad03180a17c8b4f69bcd1234f4ae85950137665ac2ba80b55cc9b1aafb454b83771aa755acd2a00e93ddb65e696dbed8bdca69fb5e0c5c2097b9cfe4b":16:"3":"93b6fa99485c116ca6efdd4202ea1cf49f4c6345fae692584413743ce5b65510e8e4690aee9a19ea1ff10d57f22aa3548d839f28a8525a34354e9e58e0f3947e056ce2554e21bf287e220b98db3b551258cd42b495e5d1a3bbc83c9d1a02f2a300ef6d866ea75108e44ebb3e16b47df2f6de28feb2be3874dbbf21599451082d86e9f2f462575a8185c69aa1f1fcb6a363c5d71aeba2103449eaf3845285291148d5f78d1646b8dc95cbcc4082f987d948b0e7d4e80b60595f8a7517584e1643":0 RSA PKCS1 Sign #1 Verify -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA512:1536:16:"bd429bb7c3b00bbea19ba664c0f8172d1a73c3cfa05e2ed656d570c1590918bb7e372ed25e2cd71395ba0a9b1a30f3ee012ffb0546cab8e3581fe3e23f44ab57a8aee9717e71a936a580fa8572d450fb00339a6f6704b717df0c149a465bab768c61500cd93b61113ff3e4389167f7b2c8e3c0da2d4765286bee555b0bcb4998f59b14fad03180a17c8b4f69bcd1234f4ae85950137665ac2ba80b55cc9b1aafb454b83771aa755acd2a00e93ddb65e696dbed8bdca69fb5e0c5c2097b9cfe4b":16:"3":"93b6fa99485c116ca6efdd4202ea1cf49f4c6345fae692584413743ce5b65510e8e4690aee9a19ea1ff10d57f22aa3548d839f28a8525a34354e9e58e0f3947e056ce2554e21bf287e220b98db3b551258cd42b495e5d1a3bbc83c9d1a02f2a300ef6d866ea75108e44ebb3e16b47df2f6de28feb2be3874dbbf21599451082d86e9f2f462575a8185c69aa1f1fcb6a363c5d71aeba2103449eaf3845285291148d5f78d1646b8dc95cbcc4082f987d948b0e7d4e80b60595f8a7517584e1643":0 RSA PKCS1 Sign #2 (SHA256, 2048 bits RSA) -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_sign:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA256:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"5aee2b9dbc02a6a2d87ff64a64165dc0b9ce70c79bab2d287939e2601c3223e0493988d5468731ae4edc7d5f5d449335c204fdb0e192c1915c9d694d3a61c3be14df79c4b34d6ac73707829024d263c94f9107fa93f3783de3965522336e18d1e01a142b5103451bb97839eaf2f44703a63050a36b78aef4072ea1a8daaaf1a2918fc03ee957a9c09efdc7287bcb4d6aec4723290294b249b3e3dc63157b560ad9c867323a73ebeb360cc9e482111643b0d86c4e33dcf170155590f0eba7d170789e84de336b7fe2f6cf485ddca94607a4ff379fc49d375c730249dd1a210e7dccd762d1c23c7532e769c6aa88e38e8654ff90f7b34df4c07ba90e89099ec1ed":0 RSA PKCS1 Sign #2 Verify -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA256:2048:16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"5aee2b9dbc02a6a2d87ff64a64165dc0b9ce70c79bab2d287939e2601c3223e0493988d5468731ae4edc7d5f5d449335c204fdb0e192c1915c9d694d3a61c3be14df79c4b34d6ac73707829024d263c94f9107fa93f3783de3965522336e18d1e01a142b5103451bb97839eaf2f44703a63050a36b78aef4072ea1a8daaaf1a2918fc03ee957a9c09efdc7287bcb4d6aec4723290294b249b3e3dc63157b560ad9c867323a73ebeb360cc9e482111643b0d86c4e33dcf170155590f0eba7d170789e84de336b7fe2f6cf485ddca94607a4ff379fc49d375c730249dd1a210e7dccd762d1c23c7532e769c6aa88e38e8654ff90f7b34df4c07ba90e89099ec1ed":0 RSA PKCS1 Sign #2 Verify (Fail) -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA256:2048:16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"5aee2b9dbc02a6a2d87ff64a64165dc0b9ce70c79bab2d287939e2601c3223e0493988d5468731ae4edc7d5f5d449335c204fdb0e192c1915c9d694d3a61c3be14df79c4b34d6ac73707829024d263c94f9107fa93f3783de3965522336e18d1e01a142b5103451bb97839eaf2f44703a63050a36b78aef4072ea1a8daaaf1a2918fc03ee957a9c09efdc6287bcb4d6aec4723290294b249b3e3dc63157b560ad9c867323a73ebeb360cc9e482111643b0d86c4e33dcf170155590f0eba7d170789e84de336b7fe2f6cf485ddca94607a4ff379fc49d375c730249dd1a210e7dccd763d1c23c7532e769c6aa88e38e8654ff90f7b34df4c07ba90e89099ec1ed":POLARSSL_ERR_RSA_INVALID_PADDING RSA PKCS1 Sign #3 (SHA224, 2048 bits RSA) -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_sign:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA224:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"9d768b8b31421f9d9ced890aafaf8b3468656419049ed268f6e1992066f45dc3e4cd349e8c5ed5a06e4ef5badaba064ba94907dfedf3d708becaf44ae9b27c3866d329311ba93e8ddc7fc284fba05d1bb84fb1e060a5b76b7fa515cfcd2c8144474623672703cac1e15ff4fdf8ef19d365c51ba86e60f4cbbcd07f956060625751bfbecc47945646459cadaddd900603a8149a93b31a6d432e1da1a67eb765f5b2f0bd1adb9af12d731c7b02931b42dbbfd8c7cecde76b817e96f664147a2c5091c6ce4dc562c5f57159d6f9dc9ba2daa212db56677839621bd4805dde62955fb2d0cc2c448109d10ecc6206ea81f0a02e1646471358f3ec146cd3c75f2d390b":0 RSA PKCS1 Sign #3 Verify -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C rsa_pkcs1_verify:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA224:2048:16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"9d768b8b31421f9d9ced890aafaf8b3468656419049ed268f6e1992066f45dc3e4cd349e8c5ed5a06e4ef5badaba064ba94907dfedf3d708becaf44ae9b27c3866d329311ba93e8ddc7fc284fba05d1bb84fb1e060a5b76b7fa515cfcd2c8144474623672703cac1e15ff4fdf8ef19d365c51ba86e60f4cbbcd07f956060625751bfbecc47945646459cadaddd900603a8149a93b31a6d432e1da1a67eb765f5b2f0bd1adb9af12d731c7b02931b42dbbfd8c7cecde76b817e96f664147a2c5091c6ce4dc562c5f57159d6f9dc9ba2daa212db56677839621bd4805dde62955fb2d0cc2c448109d10ecc6206ea81f0a02e1646471358f3ec146cd3c75f2d390b":0 RSA PKCS1 Sign #4 (SHA384, 2048 bits RSA) -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_sign:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA384:2048:16:"e79a373182bfaa722eb035f772ad2a9464bd842de59432c18bbab3a7dfeae318c9b915ee487861ab665a40bd6cda560152578e8579016c929df99fea05b4d64efca1d543850bc8164b40d71ed7f3fa4105df0fb9b9ad2a18ce182c8a4f4f975bea9aa0b9a1438a27a28e97ac8330ef37383414d1bd64607d6979ac050424fd17":16:"c6749cbb0db8c5a177672d4728a8b22392b2fc4d3b8361d5c0d5055a1b4e46d821f757c24eef2a51c561941b93b3ace7340074c058c9bb48e7e7414f42c41da4cccb5c2ba91deb30c586b7fb18af12a52995592ad139d3be429add6547e044becedaf31fa3b39421e24ee034fbf367d11f6b8f88ee483d163b431e1654ad3e89":16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"40dcc96822e5612eb33f1dca247a35109ba3845c7a3d556a60e656624bf1c103d94686ca7379e9e329ccd1b19b52bfd48b608df9f59a96a82d3feb0101096dbcb80e46da543b4c982ac6bb1717f24f9fe3f76b7154492b47525be1ddcaf4631d33481531be8f3e685837b40bdf4a02827d79f6a32374147174680f51c8e0d8eed9d5c445a563a7bce9ef4236e7cfdc12b2223ef457c3e8ccc6dd65cc23e977a1f03f5ef584feb9af00efc71a701f9d413b0290af17692cb821a1e863d5778e174b1130659f30583f434f09cb1212471a41dd65c102de64a194b6ae3e43cd75928049db78042c58e980aff3ea2774e42845bcf217410a118cf5deeaa64224dbc8":0 RSA PKCS1 Sign #4 Verify -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C rsa_pkcs1_verify:"59779fd2a39e56640c4fc1e67b60aeffcecd78aed7ad2bdfa464e93d04198d48466b8da7445f25bfa19db2844edd5c8f539cf772cc132b483169d390db28a43bc4ee0f038f6568ffc87447746cb72fefac2d6d90ee3143a915ac4688028805905a68eb8f8a96674b093c495eddd8704461eaa2b345efbb2ad6930acd8023f870":RSA_PKCS_V15:POLARSSL_MD_SHA384:2048:16:"b38ac65c8141f7f5c96e14470e851936a67bf94cc6821a39ac12c05f7c0b06d9e6ddba2224703b02e25f31452f9c4a8417b62675fdc6df46b94813bc7b9769a892c482b830bfe0ad42e46668ace68903617faf6681f4babf1cc8e4b0420d3c7f61dc45434c6b54e2c3ee0fc07908509d79c9826e673bf8363255adb0add2401039a7bcd1b4ecf0fbe6ec8369d2da486eec59559dd1d54c9b24190965eafbdab203b35255765261cd0909acf93c3b8b8428cbb448de4715d1b813d0c94829c229543d391ce0adab5351f97a3810c1f73d7b1458b97daed4209c50e16d064d2d5bfda8c23893d755222793146d0a78c3d64f35549141486c3b0961a7b4c1a2034f":16:"3":"40dcc96822e5612eb33f1dca247a35109ba3845c7a3d556a60e656624bf1c103d94686ca7379e9e329ccd1b19b52bfd48b608df9f59a96a82d3feb0101096dbcb80e46da543b4c982ac6bb1717f24f9fe3f76b7154492b47525be1ddcaf4631d33481531be8f3e685837b40bdf4a02827d79f6a32374147174680f51c8e0d8eed9d5c445a563a7bce9ef4236e7cfdc12b2223ef457c3e8ccc6dd65cc23e977a1f03f5ef584feb9af00efc71a701f9d413b0290af17692cb821a1e863d5778e174b1130659f30583f434f09cb1212471a41dd65c102de64a194b6ae3e43cd75928049db78042c58e980aff3ea2774e42845bcf217410a118cf5deeaa64224dbc8":0 RSA PKCS1 Sign #5 (MD2, 2048 bits RSA) diff --git a/tests/suites/test_suite_shax.data b/tests/suites/test_suite_shax.data index 3de993292..ed4e96f08 100644 --- a/tests/suites/test_suite_shax.data +++ b/tests/suites/test_suite_shax.data @@ -39,123 +39,123 @@ depends_on:POLARSSL_SHA1_C sha1:"8236153781bd2f1b81ffe0def1beb46f5a70191142926651503f1b3bb1016acdb9e7f7acced8dd168226f118ff664a01a8800116fd023587bfba52a2558393476f5fc69ce9c65001f23e70476d2cc81c97ea19caeb194e224339bcb23f77a83feac5096f9b3090c51a6ee6d204b735aa71d7e996d380b80822e4dfd43683af9c7442498cacbea64842dfda238cb099927c6efae07fdf7b23a4e4456e0152b24853fe0d5de4179974b2b9d4a1cdbefcbc01d8d311b5dda059136176ea698ab82acf20dd490be47130b1235cb48f8a6710473cfc923e222d94b582f9ae36d4ca2a32d141b8e8cc36638845fbc499bce17698c3fecae2572dbbd470552430d7ef30c238c2124478f1f780483839b4fb73d63a9460206824a5b6b65315b21e3c2f24c97ee7c0e78faad3df549c7ca8ef241876d9aafe9a309f6da352bec2caaa92ee8dca392899ba67dfed90aef33d41fc2494b765cb3e2422c8e595dabbfaca217757453fb322a13203f425f6073a9903e2dc5818ee1da737afc345f0057744e3a56e1681c949eb12273a3bfc20699e423b96e44bd1ff62e50a848a890809bfe1611c6787d3d741103308f849a790f9c015098286dbacfc34c1718b2c2b77e32194a75dda37954a320fa68764027852855a7e5b5274eb1e2cbcd27161d98b59ad245822015f48af82a45c0ed59be94f9af03d9736048570d6e3ef63b1770bc98dfb77de84b1bb1708d872b625d9ab9b06c18e5dbbf34399391f0f8aa26ec0dac7ff4cb8ec97b52bcb942fa6db2385dcd1b3b9d567aaeb425d567b0ebe267235651a1ed9bf78fd93d3c1dd077fe340bb04b00529c58f45124b717c168d07e9826e33376988bc5cf62845c2009980a4dfa69fbc7e5a0b1bb20a5958ca967aec68eb31dd8fccca9afcd30a26bab26279f1bf6724ff":"11863b483809ef88413ca9b0084ac4a5390640af" SHA-224 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"":"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f" SHA-224 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"ff":"e33f9d75e6ae1369dbabf81b96b4591ae46bba30b591a6b6c62542b5" SHA-224 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"984c":"2fa9df9157d9e027cfbc4c6a9df32e1adc0cbe2328ec2a63c5ae934e" SHA-224 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"50efd0":"b5a9820413c2bf8211fbbf5df1337043b32fa4eafaf61a0c8e9ccede" SHA-224 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"e5e09924":"fd19e74690d291467ce59f077df311638f1c3a46e510d0e49a67062d" SHA-224 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"21ebecb914":"78f4a71c21c694499ce1c7866611b14ace70d905012c356323c7c713" SHA-224 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha224:"fc488947c1a7a589726b15436b4f3d9556262f98fc6422fc5cdf20f0fad7fe427a3491c86d101ffe6b7514f06268f65b2d269b0f69ad9a97847eff1c16a2438775eb7be6847ccf11cb8b2e8dcd6640b095b49c0693fe3cf4a66e2d9b7ad68bff14f3ad69abf49d0aba36cbe0535202deb6599a47225ef05beb351335cd7bc0f480d691198c7e71305ffd53b39d33242bb79cfd98bfd69e137b5d18b2b89ac9ace01c8dbdcf2533cce3682ecc52118de0c1062ec2126c2e657d6ea3d9e2398e705d4b0b1f1ceecb266dffc4f31bf42744fb1e938dc22a889919ee1e73f463f7871fed720519e32186264b7ef2a0e5d9a18e6c95c0781894f77967f048951dec3b4d892a38710b1e3436d3c29088eb8b3da1789c25db3d3bc6c26081206e7155d210a89b80ca6ea877c41ff9947c0f25625dcb118294a163501f6239c326661a958fd12da4cd15a899f8b88cc723589056eaec5aa04a4cf5dbb6f480f9660423ccf38c486e210707e0fb25e1f126ceb2616f63e147a647dab0af9ebe89d65458bf636154a46e4cab95f5ee62da2c7974cd14b90d3e4f99f81733e85b3c1d5da2b508d9b90f5eed7eff0d9c7649de62bee00375454fee4a39576a5bbfdae428e7f8097bdf7797f167686cb68407e49079e4611ff3402b6384ba7b7e522bd2bb11ce8fd02ea4c1604d163ac4f6dde50b8b1f593f7edaadeac0868ed97df690200680c25f0f5d85431a529e4f339089dcdeda105e4ee51dead704cdf5a605c55fb055c9b0e86b8ba1b564c0dea3eb790a595cb103cb292268b07c5e59371e1a7ef597cd4b22977a820694c9f9aeb55d9de3ef62b75d6e656e3336698d960a3787bf8cf5b926a7faeef52ae128bcb5dc9e66d94b016c7b8e034879171a2d91c381f57e6a815b63b5ee6a6d2ff435b49f14c963966960194430d78f8f87627a67757fb3532b289550894da6dce4817a4e07f4d56877a1102ffcc8befa5c9f8fca6a4574d93ff70376c8861e0f8108cf907fce77ecb49728f86f034f80224b9695682e0824462f76cdb1fd1af151337b0d85419047a7aa284791718a4860cd586f7824b95bc837b6fd4f9be5aade68456e20356aa4d943dac36bf8b67b9e8f9d01a00fcda74b798bafa746c661b010f75b59904b29d0c8041504811c4065f82cf2ead58d2f595cbd8bc3e7043f4d94577b373b7cfe16a36fe564f505c03b70cfeb5e5f411c79481338aa67e86b3f5a2e77c21e454c333ae3da943ab723ab5f4c940395319534a5575f64acba0d0ecc43f60221ed3badf7289c9b3a7b903a2d6c94e15fa4c310dc4fa7faa0c24f405160a1002dbef20e4105d481db982f7243f79400a6e4cd9753c4b9732a47575f504b20c328fe9add7f432a4f075829da07b53b695037dc51737d3cd731934df333cd1a53fcf65aa31baa450ca501a6fae26e322347e618c5a444d92e9fec5a8261ae38b98fee5be77c02cec09ddccd5b3de92036":"1302149d1e197c41813b054c942329d420e366530f5517b470e964fe" SHA-256 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" SHA-256 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"bd":"68325720aabd7c82f30f554b313d0570c95accbb7dc4b5aae11204c08ffe732b" SHA-256 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"5fd4":"7c4fbf484498d21b487b9d61de8914b2eadaf2698712936d47c3ada2558f6788" SHA-256 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"b0bd69":"4096804221093ddccfbf46831490ea63e9e99414858f8d75ff7f642c7ca61803" SHA-256 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"c98c8e55":"7abc22c0ae5af26ce93dbb94433a0e0b2e119d014f8e7f65bd56c61ccccd9504" SHA-256 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"81a723d966":"7516fb8bb11350df2bf386bc3c33bd0f52cb4c67c6e4745e0488e62c2aea2605" SHA-256 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C sha256:"8390cf0be07661cc7669aac54ce09a37733a629d45f5d983ef201f9b2d13800e555d9b1097fec3b783d7a50dcb5e2b644b96a1e9463f177cf34906bf388f366db5c2deee04a30e283f764a97c3b377a034fefc22c259214faa99babaff160ab0aaa7e2ccb0ce09c6b32fe08cbc474694375aba703fadbfa31cf685b30a11c57f3cf4edd321e57d3ae6ebb1133c8260e75b9224fa47a2bb205249add2e2e62f817491482ae152322be0900355cdcc8d42a98f82e961a0dc6f537b7b410eff105f59673bfb787bf042aa071f7af68d944d27371c64160fe9382772372516c230c1f45c0d6b6cca7f274b394da9402d3eafdf733994ec58ab22d71829a98399574d4b5908a447a5a681cb0dd50a31145311d92c22a16de1ead66a5499f2dceb4cae694772ce90762ef8336afec653aa9b1a1c4820b221136dfce80dce2ba920d88a530c9410d0a4e0358a3a11052e58dd73b0b179ef8f56fe3b5a2d117a73a0c38a1392b6938e9782e0d86456ee4884e3c39d4d75813f13633bc79baa07c0d2d555afbf207f52b7dca126d015aa2b9873b3eb065e90b9b065a5373fe1fb1b20d594327d19fba56cb81e7b6696605ffa56eba3c27a438697cc21b201fd7e09f18deea1b3ea2f0d1edc02df0e20396a145412cd6b13c32d2e605641c948b714aec30c0649dc44143511f35ab0fd5dd64c34d06fe86f3836dfe9edeb7f08cfc3bd40956826356242191f99f53473f32b0cc0cf9321d6c92a112e8db90b86ee9e87cc32d0343db01e32ce9eb782cb24efbbbeb440fe929e8f2bf8dfb1550a3a2e742e8b455a3e5730e9e6a7a9824d17acc0f72a7f67eae0f0970f8bde46dcdefaed3047cf807e7f00a42e5fd11d40f5e98533d7574425b7d2bc3b3845c443008b58980e768e464e17cc6f6b3939eee52f713963d07d8c4abf02448ef0b889c9671e2f8a436ddeeffcca7176e9bf9d1005ecd377f2fa67c23ed1f137e60bf46018a8bd613d038e883704fc26e798969df35ec7bbc6a4fe46d8910bd82fa3cded265d0a3b6d399e4251e4d8233daa21b5812fded6536198ff13aa5a1cd46a5b9a17a4ddc1d9f85544d1d1cc16f3df858038c8e071a11a7e157a85a6a8dc47e88d75e7009a8b26fdb73f33a2a70f1e0c259f8f9533b9b8f9af9288b7274f21baeec78d396f8bacdcc22471207d9b4efccd3fedc5c5a2214ff5e51c553f35e21ae696fe51e8df733a8e06f50f419e599e9f9e4b37ce643fc810faaa47989771509d69a110ac916261427026369a21263ac4460fb4f708f8ae28599856db7cb6a43ac8e03d64a9609807e76c5f312b9d1863bfa304e8953647648b4f4ab0ed995e":"4109cdbec3240ad74cc6c37f39300f70fede16e21efc77f7865998714aad0b5e" SHA-384 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"":"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" SHA-384 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"ab":"fb94d5be118865f6fcbc978b825da82cff188faec2f66cb84b2537d74b4938469854b0ca89e66fa2e182834736629f3d" SHA-384 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"7c27":"3d80be467df86d63abb9ea1d3f9cb39cd19890e7f2c53a6200bedc5006842b35e820dc4e0ca90ca9b97ab23ef07080fc" SHA-384 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"31f5ca":"78d54b943421fdf7ba90a7fb9637c2073aa480454bd841d39ff72f4511fc21fb67797b652c0c823229342873d3bef955" SHA-384 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"7bdee3f8":"8bdafba0777ee446c3431c2d7b1fbb631089f71d2ca417abc1d230e1aba64ec2f1c187474a6f4077d372c14ad407f99a" SHA-384 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"8f05604915":"504e414bf1db1060f14c8c799e25b1e0c4dcf1504ebbd129998f0ae283e6de86e0d3c7e879c73ec3b1836c3ee89c2649" SHA-384 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"665da6eda214":"4c022f112010908848312f8b8f1072625fd5c105399d562ea1d56130619a7eac8dfc3748fd05ee37e4b690be9daa9980" SHA-384 Test Vector NIST CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha384:"7f46ce506d593c4ed53c82edeb602037e0485befbee03f7f930fe532d18ff2a3f5fd6076672c8145a1bf40dd94f7abab47c9ae71c234213d2ad1069c2dac0b0ba15257ae672b8245960ae55bd50315c0097daa3a318745788d70d14706910809ca6e396237fe4934fa46f9ce782d66606d8bd6b2d283b1160513ce9c24e9f084b97891f99d4cdefc169a029e431ca772ba1bba426fce6f01d8e286014e5acc66b799e4db62bd4783322f8a32ff78e0de3957df50ce10871f4e0680df4e8ca3960af9bc6f4efa8eb3962d18f474eb178c3265cc46b8f2ff5ab1a7449fea297dfcfabfa01f28abbb7289bb354b691b5664ec6d098af51be19947ec5ba7ebd66380d1141953ba78d4aa5401679fa7b0a44db1981f864d3535c45afe4c61183d5b0ad51fae71ca07e34240283959f7530a32c70d95a088e501c230059f333b0670825009e7e22103ef22935830df1fac8ef877f5f3426dd54f7d1128dd871ad9a7d088f94c0e8712013295b8d69ae7623b880978c2d3c6ad26dc478f8dc47f5c0adcc618665dc3dc205a9071b2f2191e16cac5bd89bb59148fc719633752303aa08e518dbc389f0a5482caaa4c507b8729a6f3edd061efb39026cecc6399f51971cf7381d605e144a5928c8c2d1ad7467b05da2f202f4f3234e1aff19a0198a28685721c3d2d52311c721e3fdcbaf30214cdc3acff8c433880e104fb63f2df7ce69a97857819ba7ac00ac8eae1969764fde8f68cf8e0916d7e0c151147d4944f99f42ae50f30e1c79a42d2b6c5188d133d3cbbf69094027b354b295ccd0f7dc5a87d73638bd98ebfb00383ca0fa69cb8dcb35a12510e5e07ad8789047d0b63841a1bb928737e8b0a0c33254f47aa8bfbe3341a09c2b76dbcefa67e30df300d34f7b8465c4f869e51b6bcfe6cf68b238359a645036bf7f63f02924e087ce7457e483b6025a859903cb484574aa3b12cf946f32127d537c33bee3141b5db96d10a148c50ae045f287210757710d6846e04b202f79e87dd9a56bc6da15f84a77a7f63935e1dee00309cd276a8e7176cb04da6bb0e9009534438732cb42d008008853d38d19beba46e61006e30f7efd1bc7c2906b024e4ff898a1b58c448d68b43c6ab63f34f85b3ac6aa4475867e51b583844cb23829f4b30f4bdd817d88e2ef3e7b4fc0a624395b05ec5e8686082b24d29fef2b0d3c29e031d5f94f504b1d3df9361eb5ffbadb242e66c39a8094cfe62f85f639f3fd65fc8ae0c74a8f4c6e1d070b9183a434c722caaa0225f8bcd68614d6f0738ed62f8484ec96077d155c08e26c46be262a73e3551698bd70d8d5610cf37c4c306eed04ba6a040a9c3e6d7e15e8acda17f477c2484cf5c56b813313927be8387b1024f995e98fc87f1029091c01424bdc2b296c2eadb7d25b3e762a2fd0c2dcd1727ddf91db97c5984305265f3695a7f5472f2d72c94d68c27914f14f82aa8dd5fe4e2348b0ca967a3f98626a091552f5d0ffa2bf10350d23c996256c01fdeffb2c2c612519869f877e4929c6e95ff15040f1485e22ed14119880232fef3b57b3848f15b1766a5552879df8f06":"cba9e3eb12a6f83db11e8a6ff40d1049854ee094416bc527fea931d8585428a8ed6242ce81f6769b36e2123a5c23483e" SHA-512 Test Vector NIST CAVS #1 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"":"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" SHA-512 Test Vector NIST CAVS #2 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"8f":"e4cd2d19931b5aad9c920f45f56f6ce34e3d38c6d319a6e11d0588ab8b838576d6ce6d68eea7c830de66e2bd96458bfa7aafbcbec981d4ed040498c3dd95f22a" SHA-512 Test Vector NIST CAVS #3 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"e724":"7dbb520221a70287b23dbcf62bfc1b73136d858e86266732a7fffa875ecaa2c1b8f673b5c065d360c563a7b9539349f5f59bef8c0c593f9587e3cd50bb26a231" SHA-512 Test Vector NIST CAVS #4 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"de4c90":"33ce98281045a5c4c9df0363d8196f1d7dfcd5ee46ac89776fd8a4344c12f123a66788af5bd41ceff1941aa5637654b4064c88c14e00465ab79a2fc6c97e1014" SHA-512 Test Vector NIST CAVS #5 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"a801e94b":"dadb1b5a27f9fece8d86adb2a51879beb1787ff28f4e8ce162cad7fee0f942efcabbf738bc6f797fc7cc79a3a75048cd4c82ca0757a324695bfb19a557e56e2f" SHA-512 Test Vector NIST CAVS #6 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"94390d3502":"b6175c4c4cccf69e0ce5f0312010886ea6b34d43673f942ae42483f9cbb7da817de4e11b5d58e25a3d9bd721a22cdffe1c40411cc45df1911fa5506129b69297" SHA-512 Test Vector NIST CAVS #7 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"49297dd63e5f":"1fcc1e6f6870859d11649f5e5336a9cd16329c029baf04d5a6edf257889a2e9522b497dd656bb402da461307c4ee382e2e89380c8e6e6e7697f1e439f650fa94" SHA-512 Test Vector NIST CAVS #8 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C sha512:"990d1ae71a62d7bda9bfdaa1762a68d296eee72a4cd946f287a898fbabc002ea941fd8d4d991030b4d27a637cce501a834bb95eab1b7889a3e784c7968e67cbf552006b206b68f76d9191327524fcc251aeb56af483d10b4e0c6c5e599ee8c0fe4faeca8293844a8547c6a9a90d093f2526873a19ad4a5e776794c68c742fb834793d2dfcb7fea46c63af4b70fd11cb6e41834e72ee40edb067b292a794990c288d5007e73f349fb383af6a756b8301ad6e5e0aa8cd614399bb3a452376b1575afa6bdaeaafc286cb064bb91edef97c632b6c1113d107fa93a0905098a105043c2f05397f702514439a08a9e5ddc196100721d45c8fc17d2ed659376f8a00bd5cb9a0860e26d8a29d8d6aaf52de97e9346033d6db501a35dbbaf97c20b830cd2d18c2532f3a59cc497ee64c0e57d8d060e5069b28d86edf1adcf59144b221ce3ddaef134b3124fbc7dd000240eff0f5f5f41e83cd7f5bb37c9ae21953fe302b0f6e8b68fa91c6ab99265c64b2fd9cd4942be04321bb5d6d71932376c6f2f88e02422ba6a5e2cb765df93fd5dd0728c6abdaf03bce22e0678a544e2c3636f741b6f4447ee58a8fc656b43ef817932176adbfc2e04b2c812c273cd6cbfa4098f0be036a34221fa02643f5ee2e0b38135f2a18ecd2f16ebc45f8eb31b8ab967a1567ee016904188910861ca1fa205c7adaa194b286893ffe2f4fbe0384c2aef72a4522aeafd3ebc71f9db71eeeef86c48394a1c86d5b36c352cc33a0a2c800bc99e62fd65b3a2fd69e0b53996ec13d8ce483ce9319efd9a85acefabdb5342226febb83fd1daf4b24265f50c61c6de74077ef89b6fecf9f29a1f871af1e9f89b2d345cda7499bd45c42fa5d195a1e1a6ba84851889e730da3b2b916e96152ae0c92154b49719841db7e7cc707ba8a5d7b101eb4ac7b629bb327817910fff61580b59aab78182d1a2e33473d05b00b170b29e331870826cfe45af206aa7d0246bbd8566ca7cfb2d3c10bfa1db7dd48dd786036469ce7282093d78b5e1a5b0fc81a54c8ed4ceac1e5305305e78284ac276f5d7862727aff246e17addde50c670028d572cbfc0be2e4f8b2eb28fa68ad7b4c6c2a239c460441bfb5ea049f23b08563b4e47729a59e5986a61a6093dbd54f8c36ebe87edae01f251cb060ad1364ce677d7e8d5a4a4ca966a7241cc360bc2acb280e5f9e9c1b032ad6a180a35e0c5180b9d16d026c865b252098cc1d99ba7375ca31c7702c0d943d5e3dd2f6861fa55bd46d94b67ed3e52eccd8dd06d968e01897d6de97ed3058d91dd":"8e4bc6f8b8c60fe4d68c61d9b159c8693c3151c46749af58da228442d927f23359bd6ccd6c2ec8fa3f00a86cecbfa728e1ad60b821ed22fcd309ba91a4138bc9" SHA1 Hash file #1 @@ -175,77 +175,77 @@ depends_on:POLARSSL_FS_IO:POLARSSL_SHA1_C sha1_file:"data_files/hash_file_4":"da39a3ee5e6b4b0d3255bfef95601890afd80709" SHA-224 Hash file #1 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha224_file:"data_files/hash_file_1":"8606da018870f0c16834a21bc3385704cb1683b9dbab04c5ddb90a48" SHA-224 Hash file #2 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha224_file:"data_files/hash_file_2":"733b2ab97b6f63f2e29b9a2089756d81e14c93fe4cc9615c0d5e8a03" SHA-224 Hash file #3 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha224_file:"data_files/hash_file_3":"e1df95867580e2cc2100e9565bf9c2e42c24fe5250c19efe33d1c4fe" SHA-224 Hash file #4 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha224_file:"data_files/hash_file_4":"d14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f" SHA-256 Hash file #1 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha256_file:"data_files/hash_file_1":"975d0c620d3936886f8a3665e585a3e84aa0501f4225bf53029710242823e391" SHA-256 Hash file #2 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha256_file:"data_files/hash_file_2":"11fcbf1baa36ca45745f10cc5467aee86f066f80ba2c46806d876bf783022ad2" SHA-256 Hash file #3 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha256_file:"data_files/hash_file_3":"9ae4b369f9f4f03b86505b46a5469542e00aaff7cf7417a71af6d6d0aba3b70c" SHA-256 Hash file #4 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA2_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA256_C sha256_file:"data_files/hash_file_4":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855" SHA-384 Hash file #1 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha384_file:"data_files/hash_file_1":"e0a3e6259d6378001b54ef82f5dd087009c5fad86d8db226a9fe1d14ecbe33a6fc916e3a4b16f5f286424de15d5a8e0e" SHA-384 Hash file #2 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha384_file:"data_files/hash_file_2":"eff727afc8495c92e2f370f97a317f93c3350324b0646b0f0e264708b3c97d3d332d3c5390e1e47130f5c92f1ef4b9cf" SHA-384 Hash file #3 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha384_file:"data_files/hash_file_3":"6fc10ebda96a1ccf61777cac72f6034f92533d42052a4bf9f9d929c672973c71e5aeb1213268043c21527ac0f7f349c4" SHA-384 Hash file #4 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha384_file:"data_files/hash_file_4":"38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b" SHA-512 Hash file #1 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha512_file:"data_files/hash_file_1":"d8207a2e1ff2b424f2c4163fe1b723c9bd42e464061eb411e8df730bcd24a7ab3956a6f3ff044a52eb2d262f9e4ca6b524092b544ab78f14d6f9c4cc8ddf335a" SHA-512 Hash file #2 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha512_file:"data_files/hash_file_2":"ecbb7f0ed8a702b49f16ad3088bcc06ea93451912a7187db15f64d93517b09630b039293aed418d4a00695777b758b1f381548c2fd7b92ce5ed996b32c8734e7" SHA-512 Hash file #3 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha512_file:"data_files/hash_file_3":"7ccc9b2da71ffde9966c3ce44d7f20945fccf33b1fade4da152b021f1afcc7293382944aa6c09eac67af25f22026758e2bf6bed86ae2a43592677ee50f8eea41" SHA-512 Hash file #4 -depends_on:POLARSSL_FS_IO:POLARSSL_SHA4_C +depends_on:POLARSSL_FS_IO:POLARSSL_SHA512_C sha512_file:"data_files/hash_file_4":"cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e" SHA-1 Selftest depends_on:POLARSSL_SELF_TEST:POLARSSL_SHA1_C sha1_selftest: -SHA-2 Selftest -depends_on:POLARSSL_SELF_TEST:POLARSSL_SHA2_C -sha2_selftest: +SHA-256 Selftest +depends_on:POLARSSL_SELF_TEST:POLARSSL_SHA256_C +sha256_selftest: -SHA-4 Selftest -depends_on:POLARSSL_SELF_TEST:POLARSSL_SHA4_C -sha4_selftest: +SHA-512 Selftest +depends_on:POLARSSL_SELF_TEST:POLARSSL_SHA512_C +sha512_selftest: diff --git a/tests/suites/test_suite_shax.function b/tests/suites/test_suite_shax.function index 13aff7ac8..f5efa48e3 100644 --- a/tests/suites/test_suite_shax.function +++ b/tests/suites/test_suite_shax.function @@ -39,7 +39,7 @@ sha224:hex_src_string:hex_hash_string src_len = unhexify( src_str, {hex_src_string} ); - sha2( src_str, src_len, output, 1 ); + sha256( src_str, src_len, output, 1 ); hexify( hash_str, output, 28 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -60,7 +60,7 @@ sha256:hex_src_string:hex_hash_string src_len = unhexify( src_str, {hex_src_string} ); - sha2( src_str, src_len, output, 0 ); + sha256( src_str, src_len, output, 0 ); hexify( hash_str, output, 32 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -81,7 +81,7 @@ sha384:hex_src_string:hex_hash_string src_len = unhexify( src_str, {hex_src_string} ); - sha4( src_str, src_len, output, 1 ); + sha512( src_str, src_len, output, 1 ); hexify( hash_str, output, 48 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -102,7 +102,7 @@ sha512:hex_src_string:hex_hash_string src_len = unhexify( src_str, {hex_src_string} ); - sha4( src_str, src_len, output, 0); + sha512( src_str, src_len, output, 0); hexify( hash_str, output, 64 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -134,7 +134,7 @@ sha224_file:filename:hex_hash_string memset(hash_str, 0x00, 57); memset(output, 0x00, 29); - sha2_file( {filename}, output, 1); + sha256_file( {filename}, output, 1); hexify( hash_str, output, 28 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -150,7 +150,7 @@ sha256_file:filename:hex_hash_string memset(hash_str, 0x00, 65); memset(output, 0x00, 33); - sha2_file( {filename}, output, 0); + sha256_file( {filename}, output, 0); hexify( hash_str, output, 32 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -166,7 +166,7 @@ sha384_file:filename:hex_hash_string memset(hash_str, 0x00, 97); memset(output, 0x00, 49); - sha4_file( {filename}, output, 1); + sha512_file( {filename}, output, 1); hexify( hash_str, output, 48 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -182,7 +182,7 @@ sha512_file:filename:hex_hash_string memset(hash_str, 0x00, 129); memset(output, 0x00, 65); - sha4_file( {filename}, output, 0); + sha512_file( {filename}, output, 0); hexify( hash_str, output, 64 ); TEST_ASSERT( strcmp( (char *) hash_str, {hex_hash_string} ) == 0 ); @@ -197,15 +197,15 @@ sha1_selftest: END_CASE BEGIN_CASE -sha2_selftest: +sha256_selftest: { - TEST_ASSERT( sha2_self_test( 0 ) == 0 ); + TEST_ASSERT( sha256_self_test( 0 ) == 0 ); } END_CASE BEGIN_CASE -sha4_selftest: +sha512_selftest: { - TEST_ASSERT( sha4_self_test( 0 ) == 0 ); + TEST_ASSERT( sha512_self_test( 0 ) == 0 ); } END_CASE diff --git a/tests/suites/test_suite_x509parse.data b/tests/suites/test_suite_x509parse.data index 66a4fa4b3..570513be4 100644 --- a/tests/suites/test_suite_x509parse.data +++ b/tests/suites/test_suite_x509parse.data @@ -279,23 +279,23 @@ depends_on:POLARSSL_SHA1_C:POLARSSL_PEM_C:POLARSSL_FS_IO x509_verify:"data_files/cert_sha1.crt":"data_files/test-ca.crt":"data_files/crl.pem":NULL:0:0:NULL X509 Certificate verification #15 (Valid Cert SHA224 Digest) -depends_on:POLARSSL_SHA2_C:POLARSSL_PEM_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_PEM_C:POLARSSL_FS_IO x509_verify:"data_files/cert_sha224.crt":"data_files/test-ca.crt":"data_files/crl.pem":NULL:0:0:NULL X509 Certificate verification #16 (Valid Cert SHA256 Digest) -depends_on:POLARSSL_SHA2_C:POLARSSL_PEM_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA256_C:POLARSSL_PEM_C:POLARSSL_FS_IO x509_verify:"data_files/cert_sha256.crt":"data_files/test-ca.crt":"data_files/crl.pem":NULL:0:0:NULL X509 Certificate verification #17 (Valid Cert SHA384 Digest) -depends_on:POLARSSL_SHA4_C:POLARSSL_PEM_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_PEM_C:POLARSSL_FS_IO x509_verify:"data_files/cert_sha384.crt":"data_files/test-ca.crt":"data_files/crl.pem":NULL:0:0:NULL X509 Certificate verification #18 (Valid Cert SHA512 Digest) -depends_on:POLARSSL_SHA4_C:POLARSSL_PEM_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_PEM_C:POLARSSL_FS_IO x509_verify:"data_files/cert_sha512.crt":"data_files/test-ca.crt":"data_files/crl.pem":NULL:0:0:NULL X509 Certificate verification #19 (Valid Cert, denying callback) -depends_on:POLARSSL_SHA4_C:POLARSSL_PEM_C:POLARSSL_FS_IO +depends_on:POLARSSL_SHA512_C:POLARSSL_PEM_C:POLARSSL_FS_IO x509_verify:"data_files/cert_sha512.crt":"data_files/test-ca.crt":"data_files/crl.pem":NULL:POLARSSL_ERR_X509_CERT_VERIFY_FAILED:BADCERT_OTHER:verify_none X509 Certificate verification #20 (Not trusted Cert, allowing callback) diff --git a/tests/suites/test_suite_x509write.data b/tests/suites/test_suite_x509write.data index aaf7c772b..c4984360b 100644 --- a/tests/suites/test_suite_x509write.data +++ b/tests/suites/test_suite_x509write.data @@ -3,19 +3,19 @@ depends_on:POLARSSL_SHA1_C x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA1:"data_files/server1.req.sha1" Certificate Request check Server1 SHA224 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA224:"data_files/server1.req.sha224" Certificate Request check Server1 SHA256 -depends_on:POLARSSL_SHA2_C +depends_on:POLARSSL_SHA256_C x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA256:"data_files/server1.req.sha256" Certificate Request check Server1 SHA384 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA384:"data_files/server1.req.sha384" Certificate Request check Server1 SHA512 -depends_on:POLARSSL_SHA4_C +depends_on:POLARSSL_SHA512_C x509_cert_req_check:"data_files/server1.key":POLARSSL_MD_SHA512:"data_files/server1.req.sha512" Certificate Request check Server1 MD4