From: Richard Levitte <levitte@openssl.org>
Date: Tue, 5 Nov 2019 16:38:24 +0000 (+0100)
Subject: include/openssl/asn1.h: Remove version dependent inclusion of <openssl/bn.h>
X-Git-Tag: openssl-3.0.0-alpha1~1000
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=686923b19824546f5c76a012e41e1fc7141ae712;p=oweals%2Fopenssl.git

include/openssl/asn1.h: Remove version dependent inclusion of <openssl/bn.h>

It's unclear if this dependency was because ASN1 functions that use
BIGNUM didn't exist before 1.1.0, or if it was a mistaken attempt at
deprecation.  Since there exist ASN1 functions using BIGNUM now, it
seems pointless to keep that check, and unnecessarily including
<openssl/bn.h> should be harmless either way.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10364)
---

diff --git a/include/openssl/asn1.h b/include/openssl/asn1.h
index 507731a4fc..1aa4b8300c 100644
--- a/include/openssl/asn1.h
+++ b/include/openssl/asn1.h
@@ -25,9 +25,7 @@
 # include <openssl/symhacks.h>
 
 # include <openssl/types.h>
-# if !OPENSSL_API_1_1_0
-#  include <openssl/bn.h>
-# endif
+# include <openssl/bn.h>
 
 # ifdef OPENSSL_BUILD_SHLIBCRYPTO
 #  undef OPENSSL_EXTERN