[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  9ff872e8a325651935cf1a42dc573bb6760fa0f8 (commit)
      from  a80caef5583d64460903656c0bdca612bd52fba5 (commit)


- Log -----------------------------------------------------------------
commit 9ff872e8a325651935cf1a42dc573bb6760fa0f8
Author: Richard Levitte <levitte at openssl.org>
Date:   Mon Oct 14 16:07:41 2019 +0200

    Restore MD5-SHA1 in legacy method database
    
    If we remove these, the functions EVP_get_digestbyname() and
    EVP_get_cipherbyname() will stop working entirely, and it's too early
    to criple them yet.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10176)

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

Summary of changes:
 crypto/evp/c_alld.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/evp/c_alld.c b/crypto/evp/c_alld.c
index 2f68eeb7cf..f7d62bd2ec 100644
--- a/crypto/evp/c_alld.c
+++ b/crypto/evp/c_alld.c
@@ -22,6 +22,7 @@ void openssl_add_all_digests_int(void)
 #ifndef OPENSSL_NO_MD5
     EVP_add_digest(EVP_md5());
     EVP_add_digest_alias(SN_md5, "ssl3-md5");
+    EVP_add_digest(EVP_md5_sha1());
 #endif
     EVP_add_digest(EVP_sha1());
     EVP_add_digest_alias(SN_sha1, "ssl3-sha1");