Cleanup: move remaining providers/common/include/internal/*.h

The end up in providers/common/include/prov/.
All inclusions are adjusted accordingly.

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/10088)

12 files changed, 10 insertions, 10 deletions

diff --git a/providers/common/ciphers/block.c b/providers/common/ciphers/block.c
index ec2dab6849..95acfaf323 100644
--- a/providers/common/ciphers/block.c
+++ b/providers/common/ciphers/block.c
@@ -9,7 +9,7 @@
 
 #include <assert.h>
 #include "cipher_local.h"
-#include "internal/providercommonerr.h"
+#include "prov/providercommonerr.h"
 
 /*
  * Fills a single block of buffered data from the input, and returns the amount
diff --git a/providers/common/ciphers/cipher_ccm.c b/providers/common/ciphers/cipher_ccm.c
index 60fade83e0..904af3a5e0 100644
--- a/providers/common/ciphers/cipher_ccm.c
+++ b/providers/common/ciphers/cipher_ccm.c
@@ -11,7 +11,7 @@
 
 #include "prov/ciphercommon.h"
 #include "prov/cipher_ccm.h"
-#include "internal/providercommonerr.h"
+#include "prov/providercommonerr.h"
 
 static int ccm_cipher_internal(PROV_CCM_CTX *ctx, unsigned char *out,
                                size_t *padlen, const unsigned char *in,
diff --git a/providers/common/ciphers/cipher_common.c b/providers/common/ciphers/cipher_common.c
index 2577d94d7a..d06e7b8004 100644
--- a/providers/common/ciphers/cipher_common.c
+++ b/providers/common/ciphers/cipher_common.c
@@ -12,8 +12,8 @@
  */
 
 #include "cipher_local.h"
-#include "internal/provider_ctx.h"
-#include "internal/providercommonerr.h"
+#include "prov/provider_ctx.h"
+#include "prov/providercommonerr.h"
 
 /*-
  * Generic cipher functions for OSSL_PARAM gettables and settables
diff --git a/providers/common/ciphers/cipher_gcm.c b/providers/common/ciphers/cipher_gcm.c
index 72d17d0073..580928fdde 100644
--- a/providers/common/ciphers/cipher_gcm.c
+++ b/providers/common/ciphers/cipher_gcm.c
@@ -11,9 +11,9 @@
 
 #include "prov/ciphercommon.h"
 #include "prov/cipher_gcm.h"
-#include "internal/providercommonerr.h"
+#include "prov/providercommonerr.h"
 #include "crypto/rand.h"
-#include "internal/provider_ctx.h"
+#include "prov/provider_ctx.h"
 
 static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len);
 static int gcm_tls_iv_set_fixed(PROV_GCM_CTX *ctx, unsigned char *iv,
diff --git a/providers/common/digests/digest_common.c b/providers/common/digests/digest_common.c
index 92610a1524..9d30b2be2c 100644
--- a/providers/common/digests/digest_common.c
+++ b/providers/common/digests/digest_common.c
@@ -9,7 +9,7 @@
 
 #include "openssl/err.h"
 #include "prov/digestcommon.h"
-#include "internal/providercommonerr.h"
+#include "prov/providercommonerr.h"
 
 int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz,
                               unsigned long flags)
diff --git a/providers/common/include/internal/provider_ctx.h b/providers/common/include/prov/provider_ctx.h
index 365667d19e..365667d19e 100644
--- a/providers/common/include/internal/provider_ctx.h
+++ b/providers/common/include/prov/provider_ctx.h
diff --git a/providers/common/include/internal/provider_util.h b/providers/common/include/prov/provider_util.h
index 9925ac2b09..9925ac2b09 100644
--- a/providers/common/include/internal/provider_util.h
+++ b/providers/common/include/prov/provider_util.h
diff --git a/providers/common/include/internal/providercommon.h b/providers/common/include/prov/providercommon.h
index 569c08c0b1..569c08c0b1 100644
--- a/providers/common/include/internal/providercommon.h
+++ b/providers/common/include/prov/providercommon.h
diff --git a/providers/common/include/internal/providercommonerr.h b/providers/common/include/prov/providercommonerr.h
index 90c6d11d83..90c6d11d83 100644
--- a/providers/common/include/internal/providercommonerr.h
+++ b/providers/common/include/prov/providercommonerr.h
diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index 5216baf918..ae1552283d 100644
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -9,7 +9,7 @@
  */
 
 #include <openssl/err.h>
-#include "internal/providercommonerr.h"
+#include "prov/providercommonerr.h"
 
 #ifndef OPENSSL_NO_ERR
 
diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c
index 8384cdc2a0..bdc86b1c05 100644
--- a/providers/common/provider_util.c
+++ b/providers/common/provider_util.c
@@ -9,7 +9,7 @@
 
 #include <openssl/evp.h>
 #include <openssl/core_names.h>
-#include "internal/provider_util.h"
+#include "prov/provider_util.h"
 
 void ossl_prov_cipher_reset(PROV_CIPHER *pc)
 {
diff --git a/providers/common/provlib.c b/providers/common/provlib.c
index 2bab77dba0..e754b84d35 100644
--- a/providers/common/provlib.c
+++ b/providers/common/provlib.c
@@ -8,7 +8,7 @@
  */
 
 #include <openssl/objects.h>
-#include "internal/providercommon.h"
+#include "prov/providercommon.h"
 
 /*
  * The FIPS provider has its own version of this in fipsprov.c because it does