diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c
index 8bb1dd8ac9..73d712915a 100644
--- a/programs/x509/cert_req.c
+++ b/programs/x509/cert_req.c
@@ -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;
diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c
index 49000b0dd7..5d9a306ee7 100644
--- a/programs/x509/cert_write.c
+++ b/programs/x509/cert_write.c
@@ -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;