coffee/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-09-13 14:22:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix guards and keep SHA

Browse Source 
Signed-off-by: Yi Wu <yi.wu2@arm.com>
This commit is contained in:
Yi Wu 2026-08-13 09:24:52 +01:00
parent 3cf6109ccb
commit efe8ab6518
2 changed files with 50 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
programs/x509/cert_req.c
View File

@ -327,29 +327,49 @@ usage:
} else
#endif
#if defined(PSA_WANT_ALG_SHA_1)
if (strcmp(q, "SHA1") == 0) {
if (strcmp(q, "SHA1") == 0 || strcmp(q, "SHA") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_224) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_224)
#if defined(PSA_WANT_ALG_SHA_224)
if (strcmp(q, "SHA224") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_256) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_256)
#if defined(PSA_WANT_ALG_SHA_256)
if (strcmp(q, "SHA256") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_384) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_384)
#if defined(PSA_WANT_ALG_SHA_384)
if (strcmp(q, "SHA384") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_512) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_512)
#if defined(PSA_WANT_ALG_SHA_512)
if (strcmp(q, "SHA512") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_224)
if (strcmp(q, "SHA3-224") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_224);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_256)
if (strcmp(q, "SHA3-256") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_256);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_384)
if (strcmp(q, "SHA3-384") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_384);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_512)
if (strcmp(q, "SHA3-512") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_512);
} else
#endif
{
md_info = NULL;

30
programs/x509/cert_write.c
View File

@ -445,29 +445,49 @@ usage:
} else
#endif
#if defined(PSA_WANT_ALG_SHA_1)
if (strcmp(q, "SHA1") == 0) {
if (strcmp(q, "SHA1") == 0 || strcmp(q, "SHA") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_224) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_224)
#if defined(PSA_WANT_ALG_SHA_224)
if (strcmp(q, "SHA224") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA224);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_256) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_256)
#if defined(PSA_WANT_ALG_SHA_256)
if (strcmp(q, "SHA256") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_384) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_384)
#if defined(PSA_WANT_ALG_SHA_384)
if (strcmp(q, "SHA384") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA384);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_512) || defined(MBEDTLS_PSA_ACCEL_ALG_SHA3_512)
#if defined(PSA_WANT_ALG_SHA_512)
if (strcmp(q, "SHA512") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_224)
if (strcmp(q, "SHA3-224") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_224);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_256)
if (strcmp(q, "SHA3-256") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_256);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_384)
if (strcmp(q, "SHA3-384") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_384);
} else
#endif
#if defined(PSA_WANT_ALG_SHA3_512)
if (strcmp(q, "SHA3-512") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA3_512);
} else
#endif
{
md_info = NULL;