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)

(cherry picked from commit e257d3e76ffb848b7607b04057257323dc51c3b4)

diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 78acaccad4b9b134bb5f1c01556a66f77e4ea540..9d4c6c3c01de509bbb1ffbadccd852c1c830eb59 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 843598ca9d927ab46c5d3a61d88fc1254cc8ee85..ad352a258896d681042595c279521aab8153c978 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 d29bfa8674adad4689e3d91fb0d4e3e046befdd0..7c2e048685d6fe80918e9d682f9928fd20fac533 100644 (file)
--- a/crypto/cmp/cmp_http.c
+++ b/crypto/cmp/cmp_http.c
@@ -25,7 +25,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 1fd542d2375cfee14ef7d25c2b7a907ff774b4a8..ca9d549fa416fdfe20b321649cf94d70544f2d6b 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 b9ef0200bb8bc23134deacd6e2434204e0fc60c7..26ed5edcafc7c3cde494eb182d3411861bcedb89 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 c070c7b059d019502b070c005c48134acd9af22a..5fedd32b5334efae4ab823a38807e6b3185d9cc2 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 3df769650094de393b3f78fd104aab7a633d1eda..f091a272736170733eae33c0813780ab75fc4a4b 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 c78f1fbb5fa6bf1f738c5d1e0d37ac66533fd474..3c9b306ea61fc6f78566c9bc7119bf8213e2102c 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 8c9c16ec21209424710e4d1c7c0924410fff107c..957f6b0273598b1ea911d38a9d09de1164695f79 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);