From: Andy Polyakov <appro@openssl.org>
Date: Tue, 6 Jan 2015 11:11:01 +0000 (+0100)
Subject: Revert "CHANGES: mention "universal" ARM support."
X-Git-Tag: master-post-reformat~88
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=219338115bea8a0450f39af2026c281375448310;p=oweals%2Fopenssl.git

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

This reverts commit 4fec91506975f62a2f93be71a46acc7fae7eef45.

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

diff --git a/CHANGES b/CHANGES
index f8dfbd427c..c9c19c3ae3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -337,14 +337,6 @@
 
  Changes between 1.0.1k and 1.0.2 [xx XXX xxxx]
 
-  *) 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 2f6ab6170f..886de0d81f 100644
--- a/crypto/bn/bn_lib.c
+++ b/crypto/bn/bn_lib.c
@@ -265,7 +265,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;