summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-10-04 15:25:59 +0200
committerRichard Levitte <levitte@openssl.org>2019-10-10 14:12:15 +0200
commitddd21319e94636f308e115fd05cc48e7a8eadc55 (patch)
tree0899840884488f0c3fd1a915d495fdb485855814 /crypto
parentaf3e7e1bccbed8e3b958488a07daf5a8f4115fa9 (diff)
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)
Diffstat (limited to 'crypto')
-rw-r--r--crypto/err/err_all.c2
-rw-r--r--crypto/err/openssl.ec2
-rw-r--r--crypto/initthread.c2
-rw-r--r--crypto/rand/drbg_hash.c2
-rw-r--r--crypto/rand/drbg_hmac.c2
5 files changed, 5 insertions, 5 deletions
diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 5957730d18..13bef4a7a8 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -41,7 +41,7 @@
#include <openssl/storeerr.h>
#include <openssl/esserr.h>
#include "internal/propertyerr.h"
-#include "internal/providercommonerr.h"
+#include "prov/providercommonerr.h"
int err_load_crypto_strings_int(void)
{
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 179a3baa05..65633717ee 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -39,7 +39,7 @@ L SM2 include/crypto/sm2.h crypto/sm2/sm2_err.c
L OSSL_STORE include/openssl/store.h crypto/store/store_err.c
L ESS include/openssl/ess.h crypto/ess/ess_err.c
L PROP include/internal/property.h crypto/property/property_err.c
-L PROV providers/common/include/internal/providercommon.h providers/common/provider_err.c
+L PROV providers/common/include/prov/providercommon.h providers/common/provider_err.c
# additional header files to be scanned for function names
L NONE include/openssl/x509_vfy.h NONE
diff --git a/crypto/initthread.c b/crypto/initthread.c
index 930b94a817..da30d59fec 100644
--- a/crypto/initthread.c
+++ b/crypto/initthread.c
@@ -10,7 +10,7 @@
#include <openssl/crypto.h>
#include <openssl/core_numbers.h>
#include "crypto/cryptlib.h"
-#include "internal/providercommon.h"
+#include "prov/providercommon.h"
#include "internal/thread_once.h"
#ifdef FIPS_MODE
diff --git a/crypto/rand/drbg_hash.c b/crypto/rand/drbg_hash.c
index 4a64992af2..72068c67c0 100644
--- a/crypto/rand/drbg_hash.c
+++ b/crypto/rand/drbg_hash.c
@@ -14,7 +14,7 @@
#include <openssl/err.h>
#include <openssl/rand.h>
#include "internal/thread_once.h"
-#include "internal/providercommon.h"
+#include "prov/providercommon.h"
#include "rand_local.h"
/* 440 bits from SP800-90Ar1 10.1 table 2 */
diff --git a/crypto/rand/drbg_hmac.c b/crypto/rand/drbg_hmac.c
index 4d7676d21b..0289070f81 100644
--- a/crypto/rand/drbg_hmac.c
+++ b/crypto/rand/drbg_hmac.c
@@ -13,7 +13,7 @@
#include <openssl/err.h>
#include <openssl/rand.h>
#include "internal/thread_once.h"
-#include "internal/providercommon.h"
+#include "prov/providercommon.h"
#include "rand_local.h"
/*