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 317a0008686929008d6e744176ef7cce601f641a..a7ac4368efe4c5a7a3d22cbb276c3d0c774af693 100644 (file)
--- 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 baddc280be91b2f1f78a083c83085643c7844991..56db4791df97ea0868b220c341e46e97654b9d7c 100644 (file)
--- 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 43c2acb4a548c40b81cc47aa217908c41df7ad1a..c7d24c17957381781b77924d43c966e2bb20aa37 100644 (file)
--- 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 9c69764cfdd8e79d36618e4d164c673d5e28ec1b..a2de6db5f2756b3af4add00a97275447db6b024c 100644 (file)
--- 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 88a8480cf73a338b6805a0106e0aec77edce51c7..96590a80f08e1e5ab3bb09548f454e7d93109455 100644 (file)
--- 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 a0fe99f4a2edba1957e712abec579224a368a99a..64f8064d9ddad8dd2ed8f9784e55e14cd10a8e72 100644 (file)
--- 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 90759c9f7ae5060702812a91eb357ad8f350e563..25ecd1b912fb5aeba71bd3c6844448b1d400bc6c 100644 (file)
--- 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 475082d431161d89f186e6b3810e7f0a584b068f..b52d33c235177da9b08ad5191d06e5b5cbb73b62 100644 (file)
--- 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 5861f420fb6607d60d3a27e0943b5cef23f70b9b..a2e644b642b7e7304d4dcd0d1c840ae63a453401 100644 (file)
--- 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 3b731796bdc4a5441760a0dac8f00e1667539d0a..6f9c41a3a695871e20befed18911f6c576dd9ddd 100644 (file)
--- 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 7a8679f7a479342b1841500029f01b09ae71bf38..e914eef9921d0ce45c1a84cfdcbfb38958416e61 100644 (file)
--- 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 c9f0c90ad3a66a8601d44c2e423b5ac17bb0a4a7..11dacc02a96509a8f89345218a6e6cdfa4cb0ff1 100644 (file)
--- 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 28fd7c498e9922b6fabd1fafa452afe7ca3734ec..abcee00284e8c41a0f912f7cadea4b7011808c8a 100644 (file)
--- 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 eb1a7691283827e72e9257d527cdf3ad884ad7fd..41b0eb172f65502fbbc88ad33408527cca53270e 100644 (file)
--- 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 4dc11f88eef6b089894c34990539f64dd5365a74..bbc1233cdb9a8b813ecee38b2eb12de66e82c1de 100644 (file)
--- 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 ea80039b3b88e1b0bf8717a8ba4a3deb9a308675..270236a72d3bb750148dc3a64b7f72a1a4dfecef 100644 (file)
--- 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