From 1b75e5f7844f809e4f6fded25021d95b4627717b Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Tue, 4 Apr 2023 09:55:06 -0400 Subject: [PATCH 1/7] Add missing md.h includes MBEDTLS_MD_CAN_SHAXXX are defined there. Signed-off-by: Andrzej Kurek --- include/mbedtls/ssl.h | 2 ++ programs/pkey/dh_client.c | 1 + programs/pkey/dh_server.c | 1 + programs/pkey/pk_sign.c | 1 + programs/pkey/pk_verify.c | 1 + programs/pkey/rsa_sign.c | 1 + programs/pkey/rsa_sign_pss.c | 1 + programs/pkey/rsa_verify.c | 1 + programs/pkey/rsa_verify_pss.c | 1 + programs/psa/key_ladder_demo.c | 1 + programs/x509/cert_req.c | 1 + programs/x509/cert_write.c | 1 + 12 files changed, 13 insertions(+) diff --git a/include/mbedtls/ssl.h b/include/mbedtls/ssl.h index 7d526a7ab4..84c4beffcf 100644 --- a/include/mbedtls/ssl.h +++ b/include/mbedtls/ssl.h @@ -40,6 +40,8 @@ #include "mbedtls/dhm.h" #endif +#include "mbedtls/md.h" + #if defined(MBEDTLS_ECDH_C) #include "mbedtls/ecdh.h" #endif diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index 1fbf045460..6b4e49da50 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_NET_C) && \ diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index 66f7d6f350..0e033a50d7 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ defined(MBEDTLS_ENTROPY_C) && defined(MBEDTLS_NET_C) && \ diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index f3bcdb24ab..554fdf400a 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) || \ !defined(MBEDTLS_MD_CAN_SHA256) || !defined(MBEDTLS_MD_C) || \ diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index e24f27f0c0..db730fb550 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_MD_C) || \ !defined(MBEDTLS_MD_CAN_SHA256) || !defined(MBEDTLS_PK_PARSE_C) || \ diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 051db07c06..8fb01bb3d7 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_RSA_C) || \ !defined(MBEDTLS_MD_CAN_SHA256) || !defined(MBEDTLS_MD_C) || \ diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index 4fa3582a75..e4a776e48b 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) || \ !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_MD_CAN_SHA256) || \ diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index e17d776f8d..248b5625b9 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_RSA_C) || \ !defined(MBEDTLS_MD_CAN_SHA256) || !defined(MBEDTLS_MD_C) || \ diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index bbd8c17b28..684f6d25fa 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) || \ !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_MD_CAN_SHA256) || \ diff --git a/programs/psa/key_ladder_demo.c b/programs/psa/key_ladder_demo.c index a79fac640c..084beb8903 100644 --- a/programs/psa/key_ladder_demo.c +++ b/programs/psa/key_ladder_demo.c @@ -58,6 +58,7 @@ #include "mbedtls/platform.h" // for mbedtls_setbuf #include "mbedtls/platform_util.h" // for mbedtls_platform_zeroize +#include "mbedtls/md.h" #include diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index 01d09bc013..e651f3c8b7 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_X509_CSR_WRITE_C) || !defined(MBEDTLS_FS_IO) || \ !defined(MBEDTLS_PK_PARSE_C) || !defined(MBEDTLS_MD_CAN_SHA256) || \ diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index 99ede78fae..b8f68b97f2 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +#include "mbedtls/md.h" #if !defined(MBEDTLS_X509_CRT_WRITE_C) || \ !defined(MBEDTLS_X509_CRT_PARSE_C) || !defined(MBEDTLS_FS_IO) || \ From eaea30d30eebf18a6e75c3553461fcc3cc7d4674 Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Wed, 5 Apr 2023 14:36:51 -0400 Subject: [PATCH 2/7] Remove duplicated md.h includes Signed-off-by: Andrzej Kurek --- programs/pkey/pk_sign.c | 1 - programs/pkey/pk_verify.c | 1 - programs/pkey/rsa_sign.c | 1 - programs/pkey/rsa_sign_pss.c | 1 - programs/pkey/rsa_verify.c | 1 - programs/pkey/rsa_verify_pss.c | 1 - programs/x509/cert_write.c | 1 - 7 files changed, 7 deletions(-) diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index 554fdf400a..3335575e26 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -39,7 +39,6 @@ int main(void) #include "mbedtls/error.h" #include "mbedtls/entropy.h" #include "mbedtls/ctr_drbg.h" -#include "mbedtls/md.h" #include "mbedtls/pk.h" #include diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index db730fb550..a6d34816bb 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -35,7 +35,6 @@ int main(void) #else #include "mbedtls/error.h" -#include "mbedtls/md.h" #include "mbedtls/pk.h" #include diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 8fb01bb3d7..1308be28bd 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -35,7 +35,6 @@ int main(void) #else #include "mbedtls/rsa.h" -#include "mbedtls/md.h" #include #include diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index e4a776e48b..643ac47aa8 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -38,7 +38,6 @@ int main(void) #include "mbedtls/entropy.h" #include "mbedtls/ctr_drbg.h" -#include "mbedtls/md.h" #include "mbedtls/rsa.h" #include "mbedtls/pk.h" diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index 248b5625b9..f65883df6a 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -35,7 +35,6 @@ int main(void) #else #include "mbedtls/rsa.h" -#include "mbedtls/md.h" #include #include diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index 684f6d25fa..bc2ea64a37 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -39,7 +39,6 @@ int main(void) #include "mbedtls/md.h" #include "mbedtls/pem.h" #include "mbedtls/pk.h" -#include "mbedtls/md.h" #include #include diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index b8f68b97f2..9ff9488f66 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -42,7 +42,6 @@ int main(void) #include "mbedtls/oid.h" #include "mbedtls/entropy.h" #include "mbedtls/ctr_drbg.h" -#include "mbedtls/md.h" #include "mbedtls/error.h" #include "test/helpers.h" From da86e2e5bd5835ca6d1704002fcd8f88e83f31d8 Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Wed, 5 Apr 2023 14:39:22 -0400 Subject: [PATCH 3/7] Revert to using MBEDTLS_SHA_1_C when mbedtls_sha1 is called directly This was mistakingly changed in #7327. Signed-off-by: Andrzej Kurek --- programs/pkey/dh_client.c | 4 ++-- programs/pkey/dh_server.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index 6b4e49da50..be0b6e9f60 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -46,13 +46,13 @@ !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NET_C) || \ !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_MD_CAN_SHA256) || \ !defined(MBEDTLS_FS_IO) || !defined(MBEDTLS_CTR_DRBG_C) || \ - !defined(MBEDTLS_MD_CAN_SHA1) + !defined(MBEDTLS_SHA1_C) int main(void) { mbedtls_printf("MBEDTLS_AES_C and/or MBEDTLS_DHM_C and/or MBEDTLS_ENTROPY_C " "and/or MBEDTLS_NET_C and/or MBEDTLS_RSA_C and/or " "MBEDTLS_MD_CAN_SHA256 and/or MBEDTLS_FS_IO and/or " - "MBEDTLS_CTR_DRBG_C not defined.\n"); + "MBEDTLS_CTR_DRBG_C and/or MBEDTLS_SHA1_C not defined.\n"); mbedtls_exit(0); } #else diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index 0e033a50d7..54165dcf92 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -46,13 +46,13 @@ !defined(MBEDTLS_ENTROPY_C) || !defined(MBEDTLS_NET_C) || \ !defined(MBEDTLS_RSA_C) || !defined(MBEDTLS_MD_CAN_SHA256) || \ !defined(MBEDTLS_FS_IO) || !defined(MBEDTLS_CTR_DRBG_C) || \ - !defined(MBEDTLS_MD_CAN_SHA1) + !defined(MBEDTLS_SHA1_C) int main(void) { mbedtls_printf("MBEDTLS_AES_C and/or MBEDTLS_DHM_C and/or MBEDTLS_ENTROPY_C " "and/or MBEDTLS_NET_C and/or MBEDTLS_RSA_C and/or " "MBEDTLS_MD_CAN_SHA256 and/or MBEDTLS_FS_IO and/or " - "MBEDTLS_CTR_DRBG_C not defined.\n"); + "MBEDTLS_CTR_DRBG_C and/or MBEDTLS_SHA1_C not defined.\n"); mbedtls_exit(0); } #else From 316b7dd19cae7db2883bf3a8431cacd4b0f3353e Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Wed, 5 Apr 2023 14:44:38 -0400 Subject: [PATCH 4/7] Add a justification for early md.h include in programs Signed-off-by: Andrzej Kurek --- programs/pkey/dh_server.c | 1 + programs/pkey/pk_sign.c | 1 + programs/pkey/pk_verify.c | 1 + programs/pkey/rsa_sign.c | 1 + programs/pkey/rsa_sign_pss.c | 1 + programs/pkey/rsa_verify.c | 1 + programs/pkey/rsa_verify_pss.c | 1 + programs/psa/key_ladder_demo.c | 1 + programs/x509/cert_req.c | 1 + programs/x509/cert_write.c | 1 + 10 files changed, 10 insertions(+) diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index 54165dcf92..b883653eb7 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index 3335575e26..2e9b2d8378 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index a6d34816bb..bdeb559eb0 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_MD_C) || \ diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 1308be28bd..8ba3e7d1f2 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_RSA_C) || \ diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index 643ac47aa8..fe3de0309a 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index f65883df6a..ccdf13eb48 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_RSA_C) || \ diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index bc2ea64a37..d7efa6549d 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/psa/key_ladder_demo.c b/programs/psa/key_ladder_demo.c index 084beb8903..6059fb132f 100644 --- a/programs/psa/key_ladder_demo.c +++ b/programs/psa/key_ladder_demo.c @@ -58,6 +58,7 @@ #include "mbedtls/platform.h" // for mbedtls_setbuf #include "mbedtls/platform_util.h" // for mbedtls_platform_zeroize +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #include diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index e651f3c8b7..f35d62963a 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_X509_CSR_WRITE_C) || !defined(MBEDTLS_FS_IO) || \ diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index 9ff9488f66..5c911ca758 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +// md.h is included this early since MD_CAN_XXX macros are defined there. #include "mbedtls/md.h" #if !defined(MBEDTLS_X509_CRT_WRITE_C) || \ From 468a99ed0bdd9159ab65358d71284bf5d24bffb3 Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Wed, 5 Apr 2023 17:50:43 -0400 Subject: [PATCH 5/7] Add a changelog entry Signed-off-by: Andrzej Kurek --- ChangeLog.d/add-missing-md-includes.txt | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 ChangeLog.d/add-missing-md-includes.txt diff --git a/ChangeLog.d/add-missing-md-includes.txt b/ChangeLog.d/add-missing-md-includes.txt new file mode 100644 index 0000000000..408c3615e3 --- /dev/null +++ b/ChangeLog.d/add-missing-md-includes.txt @@ -0,0 +1,5 @@ +Bugfix + * Add missing md.h includes to some of the external programs from + the programs directory. Without this, even though the configuration + was sufficient for a particular program to work, it would only print + a message that one of the required defines is missing. From 0e03f4c119b7e27a52a1d1f4f2dedfb6a955c006 Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Thu, 6 Apr 2023 07:55:25 -0400 Subject: [PATCH 6/7] Remove unnecessary include This is a PSA-based program and psa/crypto.h is already included. Signed-off-by: Andrzej Kurek --- programs/psa/key_ladder_demo.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/programs/psa/key_ladder_demo.c b/programs/psa/key_ladder_demo.c index 6059fb132f..a79fac640c 100644 --- a/programs/psa/key_ladder_demo.c +++ b/programs/psa/key_ladder_demo.c @@ -58,8 +58,6 @@ #include "mbedtls/platform.h" // for mbedtls_setbuf #include "mbedtls/platform_util.h" // for mbedtls_platform_zeroize -// md.h is included this early since MD_CAN_XXX macros are defined there. -#include "mbedtls/md.h" #include From 0af32483f3a3f4da503be948483c6d1f811b153a Mon Sep 17 00:00:00 2001 From: Andrzej Kurek Date: Fri, 7 Apr 2023 03:10:28 -0400 Subject: [PATCH 7/7] Change the format of md.h include comments Signed-off-by: Andrzej Kurek --- programs/pkey/dh_client.c | 1 + programs/pkey/dh_server.c | 2 +- programs/pkey/pk_sign.c | 2 +- programs/pkey/pk_verify.c | 2 +- programs/pkey/rsa_sign.c | 2 +- programs/pkey/rsa_sign_pss.c | 2 +- programs/pkey/rsa_verify.c | 2 +- programs/pkey/rsa_verify_pss.c | 2 +- programs/x509/cert_req.c | 2 +- programs/x509/cert_write.c | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index be0b6e9f60..5a2c30fc21 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -20,6 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index b883653eb7..c940be0c0f 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index 2e9b2d8378..82cb6a1d66 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index bdeb559eb0..0c549e06e7 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_MD_C) || \ diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index 8ba3e7d1f2..64375e9e70 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_RSA_C) || \ diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index fe3de0309a..03882cd2f4 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index ccdf13eb48..d525010dfa 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_RSA_C) || \ diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index d7efa6549d..e21e92749b 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_MD_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index f35d62963a..396aaf3f8a 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_X509_CSR_WRITE_C) || !defined(MBEDTLS_FS_IO) || \ diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index 5c911ca758..a822684241 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -20,7 +20,7 @@ #include "mbedtls/build_info.h" #include "mbedtls/platform.h" -// md.h is included this early since MD_CAN_XXX macros are defined there. +/* md.h is included this early since MD_CAN_XXX macros are defined there. */ #include "mbedtls/md.h" #if !defined(MBEDTLS_X509_CRT_WRITE_C) || \