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

Replace mbedtls_md_info_from_string() with strcmp()

Browse Source 
Signed-off-by: Yi Wu <yi.wu2@arm.com>
This commit is contained in:
Yi Wu 2026-03-02 14:45:22 +00:00
parent ce0384b999
commit 3cf6109ccb
2 changed files with 82 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
programs/x509/cert_req.c
View File

@ -314,8 +314,47 @@ usage:
q = r; q = r;
} }
} else if (strcmp(p, "md") == 0) { } else if (strcmp(p, "md") == 0) {
const mbedtls_md_info_t *md_info = const mbedtls_md_info_t *md_info = NULL;
mbedtls_md_info_from_string(q);
#if defined(PSA_WANT_ALG_MD5)
if (strcmp(q, "MD5") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_MD5);
} else
#endif
#if defined(PSA_WANT_ALG_RIPEMD160)
if (strcmp(q, "RIPEMD160") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_RIPEMD160);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_1)
if (strcmp(q, "SHA1") == 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 (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 (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 (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 (strcmp(q, "SHA512") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
} else
#endif
{
md_info = NULL;
}
if (md_info == NULL) { if (md_info == NULL) {
mbedtls_printf("Invalid argument for option %s\n", p); mbedtls_printf("Invalid argument for option %s\n", p);
goto usage; goto usage;

43
programs/x509/cert_write.c
View File

@ -432,8 +432,47 @@ usage:
goto usage; goto usage;
} }
} else if (strcmp(p, "md") == 0) { } else if (strcmp(p, "md") == 0) {
const mbedtls_md_info_t *md_info = const mbedtls_md_info_t *md_info = NULL;
mbedtls_md_info_from_string(q);
#if defined(PSA_WANT_ALG_MD5)
if (strcmp(q, "MD5") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_MD5);
} else
#endif
#if defined(PSA_WANT_ALG_RIPEMD160)
if (strcmp(q, "RIPEMD160") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_RIPEMD160);
} else
#endif
#if defined(PSA_WANT_ALG_SHA_1)
if (strcmp(q, "SHA1") == 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 (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 (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 (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 (strcmp(q, "SHA512") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA512);
} else
#endif
{
md_info = NULL;
}
if (md_info == NULL) { if (md_info == NULL) {
mbedtls_printf("Invalid argument for option %s\n", p); mbedtls_printf("Invalid argument for option %s\n", p);
goto usage; goto usage;