Browse Source

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)
Tomas Mraz 6 months ago
parent
commit
80f32964a5
3 changed files with 4 additions and 3 deletions
  1. 2 1
      crypto/asn1/asn1_gen.c
  2. 2 1
      crypto/x509/v3_addr.c
  3. 0 1
      include/internal/cryptlib.h

+ 2 - 1
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)

+ 2 - 1
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"

+ 0 - 1
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>