[openssl-commits] [openssl] OpenSSL_1_1_0-stable update

[Richard Levitte]

The branch OpenSSL_1_1_0-stable has been updated
       via  4aa1739c111e1390909533e7b2f485bc655c2489 (commit)
      from  ad1730359220cef5903d16c7f58b602fc3713414 (commit)


- Log -----------------------------------------------------------------
commit 4aa1739c111e1390909533e7b2f485bc655c2489
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Sep 21 11:11:15 2018 +0200

    crypto/bn/asm/x86_64-gcc.c: remove unnecessary redefinition of BN_ULONG
    
    This module includes bn.h via other headers, so it picks up the
    definition from there and doesn't need to define them locally (any
    more?).  Worst case scenario, the redefinition may be different and
    cause all sorts of compile errors.
    
    Fixes #7227
    
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
    (Merged from https://github.com/openssl/openssl/pull/7287)
    
    (cherry picked from commit dda5396aaec315bdbcb080e42fb5cd0191f2ad72)

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

Summary of changes:
 crypto/bn/asm/x86_64-gcc.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index 0ff3805..cdb54fa 100644
--- a/crypto/bn/asm/x86_64-gcc.c
+++ b/crypto/bn/asm/x86_64-gcc.c
@@ -64,12 +64,6 @@
  *    machine.
  */
 
-# if defined(_WIN64) || !defined(__LP64__)
-#  define BN_ULONG unsigned long long
-# else
-#  define BN_ULONG unsigned long
-# endif
-
 # undef mul
 # undef mul_add