Mbed-TLS/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2026-08-20 01:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10628 from yiwu0b11/strcmp_for_md_programs_example

Browse Source 
Replace mbedtls_md_info_from_string() with strcmp()
This commit is contained in:
Valerio Setti
2026-08-14 10:19:01 +00:00
committed by GitHub
parent a6b469a5f5 efe8ab6518
commit 0544d27cbc
2 changed files with 122 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
programs/x509/cert_req.c
+61 -2
View File
@@ -314,8 +314,67 @@ usage:
q = r;
}
} else if (strcmp(p, "md") == 0) {
const mbedtls_md_info_t *md_info =
mbedtls_md_info_from_string(q);
const mbedtls_md_info_t *md_info = NULL;
#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 || strcmp(q, "SHA") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
} else
#endif
#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)
if (strcmp(q, "SHA256") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
} else
#endif
#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)
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;
}
if (md_info == NULL) {
mbedtls_printf("Invalid argument for option %s\n", p);
goto usage;
programs/x509/cert_write.c
+61 -2
View File
@@ -432,8 +432,67 @@ usage:
goto usage;
}
} else if (strcmp(p, "md") == 0) {
const mbedtls_md_info_t *md_info =
mbedtls_md_info_from_string(q);
const mbedtls_md_info_t *md_info = NULL;
#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 || strcmp(q, "SHA") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA1);
} else
#endif
#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)
if (strcmp(q, "SHA256") == 0) {
md_info = mbedtls_md_info_from_type(MBEDTLS_MD_SHA256);
} else
#endif
#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)
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;
}
if (md_info == NULL) {
mbedtls_printf("Invalid argument for option %s\n", p);
goto usage;