From: Tomas Mraz <tomas@openssl.org>
Date: Thu, 19 Oct 2023 07:18:37 +0000 (+0200)
Subject: Do not include crypto/asn1.h from internal/cryptlib.h
X-Git-Tag: openssl-3.2.0-beta1~67
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80f32964a5388f5a313ced88f17a41f17794e369;p=thirdparty%2Fopenssl.git

Do not include crypto/asn1.h from internal/cryptlib.h

This is unnecessary and conceptualy wrong as
headers from internal should not include headers from crypto

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/22432)
---

diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c
index 2b27624d8ae..6f73449cf40 100644
--- a/crypto/asn1/asn1_gen.c
+++ b/crypto/asn1/asn1_gen.c
@@ -7,9 +7,10 @@
  * https://www.openssl.org/source/license.html
  */
 
-#include "internal/cryptlib.h"
 #include <openssl/asn1.h>
 #include <openssl/x509v3.h>
+#include "internal/cryptlib.h"
+#include "crypto/asn1.h"
 
 #define ASN1_GEN_FLAG           0x10000
 #define ASN1_GEN_FLAG_IMP       (ASN1_GEN_FLAG|1)
diff --git a/crypto/x509/v3_addr.c b/crypto/x509/v3_addr.c
index f4c8de2d160..b990d54048e 100644
--- a/crypto/x509/v3_addr.c
+++ b/crypto/x509/v3_addr.c
@@ -16,12 +16,13 @@
 #include <assert.h>
 #include <string.h>
 
-#include "internal/cryptlib.h"
 #include <openssl/conf.h>
 #include <openssl/asn1.h>
 #include <openssl/asn1t.h>
 #include <openssl/buffer.h>
 #include <openssl/x509v3.h>
+#include "internal/cryptlib.h"
+#include "crypto/asn1.h"
 #include "crypto/x509.h"
 #include "ext_dat.h"
 #include "x509_local.h"
diff --git a/include/internal/cryptlib.h b/include/internal/cryptlib.h
index 843a720b8f1..64851fd8ed3 100644
--- a/include/internal/cryptlib.h
+++ b/include/internal/cryptlib.h
@@ -19,7 +19,6 @@
 # endif
 
 # include "internal/common.h"
-# include "crypto/asn1.h"
 
 # include <openssl/crypto.h>
 # include <openssl/buffer.h>