[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b3b045f6b0d23cb44f632cab8231fff362f16742 (commit)
      from  1aa516b9438497bec0bf6c2aea55ce00e90cdbb6 (commit)


- Log -----------------------------------------------------------------
commit b3b045f6b0d23cb44f632cab8231fff362f16742
Author: Matt Caswell <matt at openssl.org>
Date:   Tue Nov 12 16:02:24 2019 +0000

    Fix no-blake2
    
    We modify the build.info file to exclude the legacy_blake2.c file in
    the event that blake2 support has been disabled.
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/10425)

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

Summary of changes:
 crypto/evp/build.info | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/crypto/evp/build.info b/crypto/evp/build.info
index f16d08e0cb..681201d521 100644
--- a/crypto/evp/build.info
+++ b/crypto/evp/build.info
@@ -17,7 +17,7 @@ SOURCE[../../libcrypto]=$COMMON\
         e_aes_cbc_hmac_sha1.c e_aes_cbc_hmac_sha256.c e_rc4_hmac_md5.c \
         e_chacha20_poly1305.c \
         pkey_mac.c exchange.c \
-        legacy_sha.c legacy_md5_sha1.c legacy_blake2.c
+        legacy_sha.c legacy_md5_sha1.c
 
 IF[{- !$disabled{md2} -}]
   SOURCE[../../libcrypto]=legacy_md2.c
@@ -31,6 +31,10 @@ ENDIF
 IF[{- !$disabled{mdc2} -}]
   SOURCE[../../libcrypto]=legacy_mdc2.c
 ENDIF
+IF[{- !$disabled{blake2} -}]
+  SOURCE[../../libcrypto]=legacy_blake2.c
+ENDIF
+
 
 SOURCE[../../providers/libfips.a]=$COMMON