[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b598b7a485e0ed6edf88d847e78d3c5bc74d7e2f (commit)
       via  285c691304890364a6126e9302415490b35130e5 (commit)
       via  501fcfb8cfc1aa114ffde437039c2dc2827554ae (commit)
      from  390b18a7a2b795b085c39b380e64d0f86b3801e5 (commit)


- Log -----------------------------------------------------------------
commit b598b7a485e0ed6edf88d847e78d3c5bc74d7e2f
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Dec 18 11:22:17 2019 +0000

    Fix no-dsa builds
    
    Add a guard in a build.info file for no-dsa builds
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/10644)

commit 285c691304890364a6126e9302415490b35130e5
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Dec 18 11:14:29 2019 +0000

    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 at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/10644)

commit 501fcfb8cfc1aa114ffde437039c2dc2827554ae
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Dec 18 11:00:42 2019 +0000

    Fix evp_extra_test with no-dh
    
    The new DH test in evp_extra_test.c broke the no-dh build so we add some
    guards to fix it.
    
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/10644)

-----------------------------------------------------------------------

Summary of changes:
 providers/defltprov.c                            | 2 ++
 providers/implementations/serializers/build.info | 8 ++++++--
 test/evp_extra_test.c                            | 4 ++++
 test/evp_pkey_provided_test.c                    | 4 ++++
 4 files changed, 16 insertions(+), 2 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..0ec2c547fb 100644
--- a/providers/implementations/serializers/build.info
+++ b/providers/implementations/serializers/build.info
@@ -8,5 +8,9 @@ $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
-SOURCE[$DSA_GOAL]=serializer_dsa.c serializer_dsa_priv.c serializer_dsa_pub.c serializer_dsa_param.c
+IF[{- !$disabled{dh} -}]
+  SOURCE[$DH_GOAL]=serializer_dh.c serializer_dh_priv.c serializer_dh_pub.c serializer_dh_param.c
+ENDIF
+IF[{- !$disabled{dsa} -}]
+  SOURCE[$DSA_GOAL]=serializer_dsa.c serializer_dsa_priv.c serializer_dsa_pub.c serializer_dsa_param.c
+ENDIF
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 93680796ea..387e29496f 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -1413,6 +1413,7 @@ static int test_decrypt_null_chunks(void)
 }
 #endif /* !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305) */
 
+#ifndef OPENSSL_NO_DH
 static int test_EVP_PKEY_set1_DH(void)
 {
     DH *x942dh, *pkcs3dh;
@@ -1447,6 +1448,7 @@ static int test_EVP_PKEY_set1_DH(void)
 
     return ret;
 }
+#endif
 
 int setup_tests(void)
 {
@@ -1483,7 +1485,9 @@ int setup_tests(void)
 #if !defined(OPENSSL_NO_CHACHA) && !defined(OPENSSL_NO_POLY1305)
     ADD_TEST(test_decrypt_null_chunks);
 #endif
+#ifndef OPENSSL_NO_DH
     ADD_TEST(test_EVP_PKEY_set1_DH);
+#endif
 
     return 1;
 }
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;
 }