diff options
| -rw-r--r-- | providers/defltprov.c | 2 | ||||
| -rw-r--r-- | providers/implementations/serializers/build.info | 4 | ||||
| -rw-r--r-- | test/evp_pkey_provided_test.c | 4 |
3 files changed, 9 insertions, 1 deletions
diff --git a/providers/defltprov.c b/providers/defltprov.c index b8e96f9c21..51cd2b9794 100644 --- 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 43bdee6b77..f92437eede 100644 --- 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 6dcd0fe701..c38f79ce79 100644 --- 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; } |