make providers includes self contained

Reviewed-by: Tomas Mraz <tomas@openssl.foundation>
Reviewed-by: Nikola Pajkovsky <nikolap@openssl.org>
Reviewed-by: Norbert Pocs <norbertp@openssl.org>
MergeDate: Wed May  6 11:36:07 2026
(Merged from https://github.com/openssl/openssl/pull/31001)

diff --git a/providers/common/include/prov/der_pq_dsa.h b/providers/common/include/prov/der_pq_dsa.h
index a17bcc798757156c2b469905518ed10ad3b58e91..1ac4d80bf5270d7ac68ea84d8ea0251c93b0076d 100644 (file)
--- a/providers/common/include/prov/der_pq_dsa.h
+++ b/providers/common/include/prov/der_pq_dsa.h
@@ -10,6 +10,9 @@
 #if !defined(OSSL_PROVIDERS_COMMON_INCLUDE_PROV_DER_PQ_DSA_H)
 #define OSSL_PROVIDERS_COMMON_INCLUDE_PROV_DER_PQ_DSA_H
 
+#include <stddef.h>
+#include <stdint.h>
+
 int ossl_der_oid_pq_dsa_prehash_digest(const char *oid_digest_name,
     const uint8_t **oid, size_t *oidlen, size_t *sz);
 

diff --git a/providers/implementations/ciphers/cipher_des.h b/providers/implementations/ciphers/cipher_des.h
index 3a965159b783f166fbe232d38d0397198fb8d9b4..afbb66566207aeda4fc3951ac57699dcde8d256d 100644 (file)
--- a/providers/implementations/ciphers/cipher_des.h
+++ b/providers/implementations/ciphers/cipher_des.h
@@ -12,6 +12,7 @@
 
 #include <openssl/des.h>
 #include "crypto/des_platform.h"
+#include "prov/ciphercommon.h"
 
 #define TDES_FLAGS 0
 

diff --git a/providers/implementations/ciphers/cipher_rc5.h b/providers/implementations/ciphers/cipher_rc5.h
index b2a5ff91bc6c52ed39c85a87704eabcad96dc924..131c34f520115b4fb4847fc47ce6354a7f6e81da 100644 (file)
--- a/providers/implementations/ciphers/cipher_rc5.h
+++ b/providers/implementations/ciphers/cipher_rc5.h
@@ -10,6 +10,7 @@
 #if !defined(OSSL_PROVIDERS_IMPLEMENTATIONS_CIPHERS_CIPHER_RC5_H)
 #define OSSL_PROVIDERS_IMPLEMENTATIONS_CIPHERS_CIPHER_RC5_H
 
+#if !defined(OPENSSL_NO_RC5)
 #include <openssl/rc5.h>
 #include "prov/ciphercommon.h"
 
@@ -27,4 +28,5 @@ const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc5_ecb(size_t keybits);
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc5_ofb64(size_t keybits);
 const PROV_CIPHER_HW *ossl_prov_cipher_hw_rc5_cfb64(size_t keybits);
 
+#endif /* defined(OPENSSL_NO_RC5) */
 #endif /* !defined(OSSL_PROVIDERS_IMPLEMENTATIONS_CIPHERS_CIPHER_RC5_H) */

diff --git a/providers/implementations/ciphers/cipher_tdes.h b/providers/implementations/ciphers/cipher_tdes.h
index 3ba509f3216238d9b2eb7a6a5e2bcfca2a953565..d3c383506fa3f32e759e0974d108f9ac210e0aa7 100644 (file)
--- a/providers/implementations/ciphers/cipher_tdes.h
+++ b/providers/implementations/ciphers/cipher_tdes.h
@@ -11,7 +11,9 @@
 #define OSSL_PROVIDERS_IMPLEMENTATIONS_CIPHERS_CIPHER_TDES_H
 
 #include <openssl/des.h>
+#include <openssl/evp.h>
 #include <openssl/core_dispatch.h>
+#include "prov/ciphercommon.h"
 #include "prov/securitycheck.h"
 #include "crypto/des_platform.h"
 

diff --git a/providers/implementations/digests/blake2_impl.h b/providers/implementations/digests/blake2_impl.h
index a4322b57620c60513d54c609c00a19a48f4bbe19..389f2473a620c3fa98ebd90b5add9fbcdbfd5a3c 100644 (file)
--- a/providers/implementations/digests/blake2_impl.h
+++ b/providers/implementations/digests/blake2_impl.h
@@ -18,6 +18,9 @@
 #define OSSL_PROVIDERS_IMPLEMENTATIONS_DIGESTS_BLAKE2_IMPL_H
 
 #include <string.h>
+
+#include <openssl/e_os2.h>
+
 #include "internal/endian.h"
 
 static ossl_inline uint32_t load32(const uint8_t *src)

diff --git a/providers/implementations/include/prov/ciphercommon_ccm.h b/providers/implementations/include/prov/ciphercommon_ccm.h
index ffe255064442fb4b8e8f26129340c49d1aad8ae5..2040eaade7a67940ce7ba222065ef1e296579269 100644 (file)
--- a/providers/implementations/include/prov/ciphercommon_ccm.h
+++ b/providers/implementations/include/prov/ciphercommon_ccm.h
@@ -11,6 +11,10 @@
 #define OSSL_PROV_CIPHERCOMMON_CCM_H
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+
+#include "prov/ciphercommon.h"
 #include "ciphercommon_aead.h"
 
 typedef struct prov_ccm_hw_st PROV_CCM_HW;

diff --git a/providers/implementations/include/prov/ciphercommon_gcm.h b/providers/implementations/include/prov/ciphercommon_gcm.h
index 9763cf7b5c29f445fbc9d17752ef650730c0344b..ba5d0b5f87f48a7b141f0776ff47c2fbbeafaf65 100644 (file)
--- a/providers/implementations/include/prov/ciphercommon_gcm.h
+++ b/providers/implementations/include/prov/ciphercommon_gcm.h
@@ -12,7 +12,11 @@
 #define OSSL_PROV_CIPHERCOMMON_GCM_H
 #pragma once
 
+#include <stddef.h>
+#include <stdint.h>
+
 #include <openssl/aes.h>
+#include "prov/ciphercommon.h"
 #include "ciphercommon_aead.h"
 
 typedef struct prov_gcm_hw_st PROV_GCM_HW;

diff --git a/providers/implementations/include/prov/ecx.h b/providers/implementations/include/prov/ecx.h
index 145f322c05056a8bb1b37dc7291d5bd3d8e165cd..455554a5a4f3f5e6cf90b25c746173e27dc9d53b 100644 (file)
--- a/providers/implementations/include/prov/ecx.h
+++ b/providers/implementations/include/prov/ecx.h
@@ -7,6 +7,14 @@
  * https://www.openssl.org/source/license.html
  */
 
+#if !defined(OSSL_PROVIDERS_IMPLEMENTATIONS_INCLUDE_PROV_ECX_H)
+#define OSSL_PROVIDERS_IMPLEMENTATIONS_INCLUDE_PROV_ECX_H
+
+#include <stddef.h>
+
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+
 #include "crypto/types.h"
 
 #ifndef OPENSSL_NO_EC
@@ -29,3 +37,5 @@ int ossl_ecx_dhkem_derive_private(ECX_KEY *ecx, unsigned char *privout,
 int ossl_ec_dhkem_derive_private(EC_KEY *ec, BIGNUM *privout,
     const unsigned char *ikm, size_t ikmlen);
 #endif
+
+#endif /* !defined(OSSL_PROVIDERS_IMPLEMENTATIONS_INCLUDE_PROV_ECX_H) */

diff --git a/providers/implementations/include/prov/file_store_local.h b/providers/implementations/include/prov/file_store_local.h
index d7f001d5cd57e0760b24d58417ac1feed3181271..61047ba2ecd2fbe501aef72338a36f8fe4365d17 100644 (file)
--- a/providers/implementations/include/prov/file_store_local.h
+++ b/providers/implementations/include/prov/file_store_local.h
@@ -10,6 +10,8 @@
 #if !defined(OSSL_PROVIDERS_IMPLEMENTATIONS_INCLUDE_PROV_FILE_STORE_LOCAL_H)
 #define OSSL_PROVIDERS_IMPLEMENTATIONS_INCLUDE_PROV_FILE_STORE_LOCAL_H
 
+#include <openssl/types.h>
+
 extern const OSSL_ALGORITHM ossl_any_to_obj_algorithm[];
 
 #endif /* !defined(OSSL_PROVIDERS_IMPLEMENTATIONS_INCLUDE_PROV_FILE_STORE_LOCAL_H) */

diff --git a/providers/implementations/include/prov/lms_codecs.h b/providers/implementations/include/prov/lms_codecs.h
index cd2523798442f87b183f88ba0354fa5732f9b3cb..6dfe9dff7113528014353a517544673515262474 100644 (file)
--- a/providers/implementations/include/prov/lms_codecs.h
+++ b/providers/implementations/include/prov/lms_codecs.h
@@ -14,6 +14,7 @@
 #ifndef OPENSSL_NO_LMS
 #include <openssl/e_os2.h>
 #include "crypto/lms.h"
+#include "prov/ciphercommon.h"
 #include "prov/provider_ctx.h"
 
 __owur LMS_KEY *