[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  5797e309fce89b5aa9f690ad82f272552b4c7987 (commit)
      from  760aaf1bb4696b51d50798a4a895ef04e312c49a (commit)


- Log -----------------------------------------------------------------
commit 5797e309fce89b5aa9f690ad82f272552b4c7987
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Jun 19 10:08:33 2020 +0200

    Build: Remove faulty DES assembler spec
    
    crypto/des/build.info had a faulty spec that ghash-ia64 should be
    compiled for DES.  Removed.
    
    Fixes #12197
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    (Merged from https://github.com/openssl/openssl/pull/12203)

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

Summary of changes:
 crypto/des/build.info | 1 -
 1 file changed, 1 deletion(-)

diff --git a/crypto/des/build.info b/crypto/des/build.info
index eb0c75496b..b73e740bec 100644
--- a/crypto/des/build.info
+++ b/crypto/des/build.info
@@ -1,7 +1,6 @@
 $DESASM=des_enc.c fcrypt_b.c
 IF[{- !$disabled{asm} -}]
   $DESASM_x86=des-586.s crypt586.s
-  $DESASM_ia64=ghash-ia64.s
   $DESASM_sparcv9=des_enc-sparc.S fcrypt_b.c dest4-sparcv9.S
   $DESASM_sparcv8=des_enc-sparc.S fcrypt_b.c