[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  19ea6b2b375b15919f9f5f523d1312398315017f (commit)
      from  9a131ad7477f85d40ee96853e60d0de86f5f4e09 (commit)


- Log -----------------------------------------------------------------
commit 19ea6b2b375b15919f9f5f523d1312398315017f
Author: Matt Caswell <matt at openssl.org>
Date:   Fri Jun 28 15:06:55 2019 +0100

    Fix a leak in evp_test
    
    If evp_test fails to load the legacy provider then it leaks a reference
    to the default provider.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Shane Lontis <shane.lontis at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/9270)

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

Summary of changes:
 test/evp_test.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/evp_test.c b/test/evp_test.c
index 6fc9f03..b70b4ea 100644
--- a/test/evp_test.c
+++ b/test/evp_test.c
@@ -3096,8 +3096,10 @@ int setup_tests(void)
         return 0;
 #ifndef NO_LEGACY_MODULE
     legacyprov = OSSL_PROVIDER_load(NULL, "legacy");
-    if (!TEST_ptr(legacyprov))
+    if (!TEST_ptr(legacyprov)) {
+        OSSL_PROVIDER_unload(defltprov);
         return 0;
+    }
 #endif /* NO_LEGACY_MODULE */
 
     ADD_ALL_TESTS(run_file_tests, n);