From: Richard Levitte <levitte@openssl.org>
Date: Fri, 21 Sep 2018 09:11:15 +0000 (+0200)
Subject: crypto/bn/asm/x86_64-gcc.c: remove unnecessary redefinition of BN_ULONG
X-Git-Tag: OpenSSL_1_1_1a~144
X-Git-Url: https://git.openssl.org/gitweb/?a=commitdiff_plain;h=4ccd6c5479b8e4ed0f8557846d383bed41517e2e;p=openssl.git

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@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/7287)

(cherry picked from commit dda5396aaec315bdbcb080e42fb5cd0191f2ad72)
---

diff --git a/crypto/bn/asm/x86_64-gcc.c b/crypto/bn/asm/x86_64-gcc.c
index d38f337164..e6f1698314 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