mirror/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-04-05 07:20:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Correct minor merge mistakes

Browse Source 
Signed-off-by: Dave Rodgman <dave.rodgman@arm.com>
This commit is contained in:
Dave Rodgman 2023-06-07 17:59:57 +01:00
parent 8b0deef299
commit b61cd1042a
2 changed files with 0 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/mbedtls/md.h
View File

@ -158,16 +158,6 @@ typedef enum {
MBEDTLS_MD_SHA3_512, /**< The SHA3-512 message digest. */ MBEDTLS_MD_SHA3_512, /**< The SHA3-512 message digest. */
} mbedtls_md_type_t; } mbedtls_md_type_t;
/* Note: this should always be >= PSA_HASH_MAX_SIZE
* in all builds with both CRYPTO_C and MD_LIGHT.
*
* This is to make things easier for modules such as TLS that may define a
* buffer size using MD_MAX_SIZE in a part of the code that's common to PSA
* and legacy, then assume the buffer's size is PSA_HASH_MAX_SIZE in another
* part of the code based on PSA.
*
* Currently both macros have the same value, avoiding such issues.
*/
#if defined(MBEDTLS_MD_CAN_SHA512) || defined(MBEDTLS_SHA3_C) #if defined(MBEDTLS_MD_CAN_SHA512) || defined(MBEDTLS_SHA3_C)
#define MBEDTLS_MD_MAX_SIZE 64 /* longest known is SHA512 */ #define MBEDTLS_MD_MAX_SIZE 64 /* longest known is SHA512 */
#elif defined(MBEDTLS_MD_CAN_SHA384) #elif defined(MBEDTLS_MD_CAN_SHA384)

3
library/md.c
View File

@ -146,21 +146,18 @@ const mbedtls_md_info_t mbedtls_sha3_224_info = {
28, 28,
144, 144,
}; };
const mbedtls_md_info_t mbedtls_sha3_256_info = { const mbedtls_md_info_t mbedtls_sha3_256_info = {
"SHA3-256", "SHA3-256",
MBEDTLS_MD_SHA3_256, MBEDTLS_MD_SHA3_256,
32, 32,
136, 136,
}; };
const mbedtls_md_info_t mbedtls_sha3_384_info = { const mbedtls_md_info_t mbedtls_sha3_384_info = {
"SHA3-384", "SHA3-384",
MBEDTLS_MD_SHA3_384, MBEDTLS_MD_SHA3_384,
48, 48,
104, 104,
}; };
const mbedtls_md_info_t mbedtls_sha3_512_info = { const mbedtls_md_info_t mbedtls_sha3_512_info = {
"SHA3-512", "SHA3-512",
MBEDTLS_MD_SHA3_512, MBEDTLS_MD_SHA3_512,