From: Andy Polyakov <appro@openssl.org>
Date: Tue, 6 Jan 2015 11:12:15 +0000 (+0100)
Subject: Revert "CHANGES: mention "universal" ARM support."
X-Git-Tag: OpenSSL_1_0_2~90
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=2996157127bb5f607efa35001951439fa440b7ca

Revert "CHANGES: mention "universal" ARM support."

This reverts commit caeed719fe3fd619415755f245ab8a904978d99d.

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index ccaab0505b..8ce76971d8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -43,14 +43,6 @@
      (CVE-2014-3566)
      [Adam Langley, Bodo Moeller]
 
-  *) Facilitate "universal" ARM builds targeting range of ARM ISAs, e.g.
-     ARMv5 through ARMv8, as opposite to "locking" it to single one.
-     So far those who have to target multiple plaforms would compromise
-     and argue that binary targeting say ARMv5 would still execute on
-     ARMv8. "Universal" build resolves this compromise by providing
-     near-optimal performance even on newer platforms.
-     [Andy Polyakov]
-
   *) Accelerated NIST P-256 elliptic curve implementation for x86_64
      (other platforms pending).
      [Shay Gueron & Vlad Krasnov (Intel Corp), Andy Polyakov]
diff --git a/crypto/bn/bn_lib.c b/crypto/bn/bn_lib.c
index cac632d4d5..d5a211e288 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -263,7 +263,7 @@ void BN_free(BIGNUM *a)
 		OPENSSL_free(a);
 	else
 		{
-#ifdef OPENSSL_USE_DEPRECATED
+#ifndef OPENSSL_NO_DEPRECATED
 		a->flags|=BN_FLG_FREE;
 #endif
 		a->d = NULL;