[openssl] master update

[Richard Levitte]

The branch master has been updated
       via  7f02a0932c8c182bc2f6320748d81e86d650c1a6 (commit)
      from  2ce15a95dae9a933140731a53afdb84889588be8 (commit)


- Log -----------------------------------------------------------------
commit 7f02a0932c8c182bc2f6320748d81e86d650c1a6
Author: Richard Levitte <levitte at openssl.org>
Date:   Tue Jun 18 16:23:06 2019 +0200

    crypto/modes/build.conf: Fix MODES asm mistakes
    
    The old rule in Configure was that if the asm source had a file name
    with 'ghash-' as part of the name, GHASH_ASM should be defined.  Since
    none of the aarch64 asm files has such a name, that macro shouldn't
    have been defined.
    
    Fixes #9173
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9178)

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

Summary of changes:
 crypto/modes/build.info | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/modes/build.info b/crypto/modes/build.info
index 6024606..81525a9 100644
--- a/crypto/modes/build.info
+++ b/crypto/modes/build.info
@@ -25,7 +25,7 @@ IF[{- !$disabled{asm} -}]
   $MODESASM_armv4=ghash-armv4.S ghashv8-armx.S
   $MODESDEF_armv4=GHASH_ASM
   $MODESASM_aarch64=ghashv8-armx.S
-  $MODESDEF_aarch64=GHASH_ASM
+  $MODESDEF_aarch64=
 
   $MODESASM_parisc11=ghash-parisc.s
   $MODESDEF_parisc11=GHASH_ASM