Fix no-dh

The new serializer code broke no-dh builds so we add some more guards to fix it.

Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/10644)

diff --git a/providers/defltprov.c b/providers/defltprov.c
index b8e96f9c21d00a2be87eab2b8ba9fdd314506143..51cd2b97945a650872c9526b1f00b4f6c2fe7dbd 100644 (file)
--- a/providers/defltprov.c
+++ b/providers/defltprov.c
@@ -399,6 +399,7 @@ static const OSSL_ALGORITHM deflt_serializer[] = {
     { "RSA", "default=yes,format=pem,type=public",
       rsa_pub_pem_serializer_functions },
 
+#ifndef OPENSSL_NO_DH
     { "DH", "default=yes,format=text,type=private",
       dh_priv_text_serializer_functions },
     { "DH", "default=yes,format=text,type=public",
@@ -417,6 +418,7 @@ static const OSSL_ALGORITHM deflt_serializer[] = {
       dh_pub_pem_serializer_functions },
     { "DH", "default=yes,format=pem,type=domainparams",
       dh_param_pem_serializer_functions },
+#endif
 
     { NULL, NULL, NULL }
 };

diff --git a/providers/implementations/serializers/build.info b/providers/implementations/serializers/build.info
index 43bdee6b7738712c8e4067c8eb69f39e01f67b07..f92437eede4d2b3145f21927533ebfa1716640dd 100644 (file)
--- a/providers/implementations/serializers/build.info
+++ b/providers/implementations/serializers/build.info
@@ -8,5 +8,7 @@ $DSA_GOAL=../../libimplementations.a
 
 SOURCE[$SERIALIZER_GOAL]=serializer_common.c
 SOURCE[$RSA_GOAL]=serializer_rsa.c serializer_rsa_priv.c serializer_rsa_pub.c
-SOURCE[$DH_GOAL]=serializer_dh.c serializer_dh_priv.c serializer_dh_pub.c serializer_dh_param.c
+IF[{- !$disabled{dh} -}]
+  SOURCE[$DH_GOAL]=serializer_dh.c serializer_dh_priv.c serializer_dh_pub.c serializer_dh_param.c
+ENDIF
 SOURCE[$DSA_GOAL]=serializer_dsa.c serializer_dsa_priv.c serializer_dsa_pub.c serializer_dsa_param.c

diff --git a/test/evp_pkey_provided_test.c b/test/evp_pkey_provided_test.c
index 6dcd0fe70122fea73712bc6be91f7ff27817ca8a..c38f79ce79fc60ccf7a5b449b7bdaf3f70d67385 100644 (file)
--- a/test/evp_pkey_provided_test.c
+++ b/test/evp_pkey_provided_test.c
@@ -139,6 +139,7 @@ static int test_fromdata_rsa(void)
     return ret;
 }
 
+#ifndef OPENSSL_NO_DH
 /* Array indexes used in test_fromdata_dh */
 #define PRIV_KEY        0
 #define PUB_KEY         1
@@ -187,10 +188,13 @@ static int test_fromdata_dh(void)
 
     return ret;
 }
+#endif
 
 int setup_tests(void)
 {
     ADD_TEST(test_fromdata_rsa);
+#ifndef OPENSSL_NO_DH
     ADD_TEST(test_fromdata_dh);
+#endif
     return 1;
 }