[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  8d0f8c818117132a38005a046f0daacd1219e217 (commit)
      from  98b687f8d053662f8d7fee586d5a91d86fecdfee (commit)


- Log -----------------------------------------------------------------
commit 8d0f8c818117132a38005a046f0daacd1219e217
Author: Matt Caswell <matt at openssl.org>
Date:   Wed Sep 11 10:04:23 2019 +0100

    Fix no-dsa
    
    Also fixes no-dh
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9861)

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

Summary of changes:
 providers/common/keymgmt/build.info | 6 +++++-
 test/evp_extra_test.c               | 4 ++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/providers/common/keymgmt/build.info b/providers/common/keymgmt/build.info
index 4e7bc750f5..e66190c401 100644
--- a/providers/common/keymgmt/build.info
+++ b/providers/common/keymgmt/build.info
@@ -1,5 +1,9 @@
 LIBS=../../../libcrypto
 IF[{- !$disabled{dh} -}]
   SOURCE[../../../libcrypto]=\
-          dh_kmgmt.c dsa_kmgmt.c
+          dh_kmgmt.c
+ENDIF
+IF[{- !$disabled{dsa} -}]
+  SOURCE[../../../libcrypto]=\
+          dsa_kmgmt.c
 ENDIF
diff --git a/test/evp_extra_test.c b/test/evp_extra_test.c
index 631ad65540..bbb846e6fd 100644
--- a/test/evp_extra_test.c
+++ b/test/evp_extra_test.c
@@ -1398,6 +1398,7 @@ static int test_EVP_CIPHER_fetch(int tst)
     return ret;
 }
 
+#ifndef OPENSSL_NO_DSA
 /* Test getting and setting parameters on an EVP_PKEY_CTX */
 static int test_EVP_PKEY_CTX_get_set_params(void)
 {
@@ -1508,6 +1509,7 @@ static int test_EVP_PKEY_CTX_get_set_params(void)
 
     return ret;
 }
+#endif
 
 int setup_tests(void)
 {
@@ -1545,6 +1547,8 @@ int setup_tests(void)
     ADD_ALL_TESTS(test_EVP_MD_fetch, 5);
     ADD_ALL_TESTS(test_EVP_CIPHER_fetch, 5);
 #endif
+#ifndef OPENSSL_NO_DSA
     ADD_TEST(test_EVP_PKEY_CTX_get_set_params);
+#endif
     return 1;
 }