From: JHH20 <jhh.20@icloud.com>
Date: Mon, 2 May 2022 10:50:04 +0000 (+0900)
Subject: Remove duplicated #include headers
X-Git-Tag: openssl-3.2.0-alpha1~2713
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e257d3e76ffb848b7607b04057257323dc51c3b4;p=thirdparty%2Fopenssl.git

Remove duplicated #include headers

CLA: trivial

Reviewed-by: Tomas Mraz <tomas@openssl.org>
Reviewed-by: Todd Short <todd.short@me.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/18220)
---

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 317a0008686..a7ac4368efe 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -44,7 +44,6 @@
 #include <openssl/rand.h>
 #include <openssl/bn.h>
 #include <openssl/ssl.h>
-#include <openssl/store.h>
 #include <openssl/core_names.h>
 #include "s_apps.h"
 #include "apps.h"
diff --git a/apps/s_server.c b/apps/s_server.c
index baddc280be9..56db4791df9 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -42,7 +42,6 @@ typedef unsigned int u_int;
 #include <openssl/err.h>
 #include <openssl/pem.h>
 #include <openssl/x509.h>
-#include <openssl/ssl.h>
 #include <openssl/rand.h>
 #include <openssl/ocsp.h>
 #ifndef OPENSSL_NO_DH
diff --git a/crypto/cmp/cmp_http.c b/crypto/cmp/cmp_http.c
index 43c2acb4a54..c7d24c17957 100644
--- a/crypto/cmp/cmp_http.c
+++ b/crypto/cmp/cmp_http.c
@@ -24,7 +24,6 @@
 #include <stdlib.h>
 #include <openssl/bio.h>
 #include <openssl/buffer.h>
-#include <openssl/cmp.h>
 #include <openssl/err.h>
 
 static int keep_alive(int keep_alive, int body_type)
diff --git a/crypto/cms/cms_lib.c b/crypto/cms/cms_lib.c
index 9c69764cfdd..a2de6db5f27 100644
--- a/crypto/cms/cms_lib.c
+++ b/crypto/cms/cms_lib.c
@@ -14,7 +14,6 @@
 #include <openssl/bio.h>
 #include <openssl/asn1.h>
 #include <openssl/cms.h>
-#include <openssl/cms.h>
 #include "internal/sizes.h"
 #include "crypto/x509.h"
 #include "cms_local.h"
diff --git a/crypto/crmf/crmf_pbm.c b/crypto/crmf/crmf_pbm.c
index 88a8480cf73..96590a80f08 100644
--- a/crypto/crmf/crmf_pbm.c
+++ b/crypto/crmf/crmf_pbm.c
@@ -22,7 +22,6 @@
 #include <openssl/asn1t.h>
 #include <openssl/crmf.h>
 #include <openssl/err.h>
-#include <openssl/evp.h>
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 
diff --git a/crypto/dh/dh_kdf.c b/crypto/dh/dh_kdf.c
index a0fe99f4a2e..64f8064d9dd 100644
--- a/crypto/dh/dh_kdf.c
+++ b/crypto/dh/dh_kdf.c
@@ -13,7 +13,6 @@
  */
 #include "internal/deprecated.h"
 
-#include "internal/e_os.h"
 #include "internal/e_os.h"
 #include <string.h>
 #include <openssl/core_names.h>
diff --git a/crypto/evp/evp_fetch.c b/crypto/evp/evp_fetch.c
index 90759c9f7ae..25ecd1b912f 100644
--- a/crypto/evp/evp_fetch.c
+++ b/crypto/evp/evp_fetch.c
@@ -17,7 +17,6 @@
 #include "internal/core.h"
 #include "internal/provider.h"
 #include "internal/namemap.h"
-#include "internal/property.h"
 #include "crypto/evp.h"    /* evp_local.h needs it */
 #include "evp_local.h"
 
diff --git a/crypto/evp/p_seal.c b/crypto/evp/p_seal.c
index 475082d4311..b52d33c2351 100644
--- a/crypto/evp/p_seal.c
+++ b/crypto/evp/p_seal.c
@@ -15,7 +15,6 @@
 #include <openssl/evp.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
-#include <openssl/evp.h>
 
 int EVP_SealInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
                  unsigned char **ek, int *ekl, unsigned char *iv,
diff --git a/crypto/sm2/sm2_sign.c b/crypto/sm2/sm2_sign.c
index 5861f420fb6..a2e644b642b 100644
--- a/crypto/sm2/sm2_sign.c
+++ b/crypto/sm2/sm2_sign.c
@@ -17,7 +17,6 @@
 #include "internal/numbers.h"
 #include <openssl/err.h>
 #include <openssl/evp.h>
-#include <openssl/err.h>
 #include <openssl/bn.h>
 #include <string.h>
 
diff --git a/providers/implementations/digests/sha2_prov.c b/providers/implementations/digests/sha2_prov.c
index 3b731796bdc..6f9c41a3a69 100644
--- a/providers/implementations/digests/sha2_prov.c
+++ b/providers/implementations/digests/sha2_prov.c
@@ -17,7 +17,6 @@
 #include <openssl/core_dispatch.h>
 #include <openssl/evp.h>
 #include <openssl/sha.h>
-#include <openssl/evp.h>
 #include <openssl/params.h>
 #include <openssl/core_names.h>
 #include "prov/digestcommon.h"
@@ -92,4 +91,3 @@ IMPLEMENT_digest_functions(sha512_224, SHA512_CTX,
 IMPLEMENT_digest_functions(sha512_256, SHA512_CTX,
                            SHA512_CBLOCK, SHA256_DIGEST_LENGTH, SHA2_FLAGS,
                            sha512_256_init, SHA512_Update, SHA512_Final)
-
diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c
index 7a8679f7a47..e914eef9921 100644
--- a/providers/implementations/kdfs/scrypt.c
+++ b/providers/implementations/kdfs/scrypt.c
@@ -20,7 +20,6 @@
 #include "prov/implementations.h"
 #include "prov/provider_ctx.h"
 #include "prov/providercommon.h"
-#include "prov/implementations.h"
 #include "prov/provider_util.h"
 
 #ifndef OPENSSL_NO_SCRYPT
diff --git a/providers/implementations/rands/seeding/rand_unix.c b/providers/implementations/rands/seeding/rand_unix.c
index c9f0c90ad3a..11dacc02a96 100644
--- a/providers/implementations/rands/seeding/rand_unix.c
+++ b/providers/implementations/rands/seeding/rand_unix.c
@@ -17,7 +17,6 @@
 #include <openssl/crypto.h>
 #include "crypto/rand_pool.h"
 #include "crypto/rand.h"
-#include <stdio.h>
 #include "internal/dso.h"
 #include "prov/seeding.h"
 
diff --git a/providers/implementations/signature/dsa_sig.c b/providers/implementations/signature/dsa_sig.c
index 28fd7c498e9..abcee00284e 100644
--- a/providers/implementations/signature/dsa_sig.c
+++ b/providers/implementations/signature/dsa_sig.c
@@ -22,7 +22,6 @@
 #include <openssl/dsa.h>
 #include <openssl/params.h>
 #include <openssl/evp.h>
-#include <openssl/err.h>
 #include <openssl/proverr.h>
 #include "internal/nelem.h"
 #include "internal/sizes.h"
diff --git a/providers/implementations/signature/eddsa_sig.c b/providers/implementations/signature/eddsa_sig.c
index eb1a7691283..41b0eb172f6 100644
--- a/providers/implementations/signature/eddsa_sig.c
+++ b/providers/implementations/signature/eddsa_sig.c
@@ -13,7 +13,6 @@
 #include <openssl/err.h>
 #include <openssl/params.h>
 #include <openssl/evp.h>
-#include <openssl/err.h>
 #include <openssl/proverr.h>
 #include "internal/nelem.h"
 #include "internal/sizes.h"
diff --git a/ssl/statem/extensions.c b/ssl/statem/extensions.c
index 4dc11f88eef..bbc1233cdb9 100644
--- a/ssl/statem/extensions.c
+++ b/ssl/statem/extensions.c
@@ -17,7 +17,6 @@
 #include "internal/cryptlib.h"
 #include "../ssl_local.h"
 #include "statem_local.h"
-#include "internal/cryptlib.h"
 
 static int final_renegotiate(SSL *s, unsigned int context, int sent);
 static int init_server_name(SSL *s, unsigned int context);
diff --git a/test/localetest.c b/test/localetest.c
index ea80039b3b8..270236a72d3 100644
--- a/test/localetest.c
+++ b/test/localetest.c
@@ -5,7 +5,6 @@
 #include "testutil.h"
 #include "testutil/output.h"
 
-#include <stdio.h>
 #include <stdlib.h>
 #include <locale.h>
 #ifdef OPENSSL_SYS_WINDOWS