diff options
author | Tomas Mraz <tomas@openssl.org> | 2023-10-19 09:18:37 +0200 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2023-10-19 10:15:56 +0200 |
commit | 80f32964a5388f5a313ced88f17a41f17794e369 (patch) | |
tree | 11302b083800fb3c6e4f8dfe4956f067873ec6c8 | |
parent | 1d768852e938ea1b4c6076df0c5a1e59f9027f8c (diff) |
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)
-rw-r--r-- | crypto/asn1/asn1_gen.c | 3 | ||||
-rw-r--r-- | crypto/x509/v3_addr.c | 3 | ||||
-rw-r--r-- | include/internal/cryptlib.h | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/crypto/asn1/asn1_gen.c b/crypto/asn1/asn1_gen.c index 2b27624d8a..6f73449cf4 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 f4c8de2d16..b990d54048 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 843a720b8f..64851fd8ed 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> |