From: Tomas Mraz <tomas@openssl.org>
Date: Tue, 9 Feb 2021 12:25:16 +0000 (+0100)
Subject: Rename internal providercommonerr.h to less mouthful proverr.h
X-Git-Tag: openssl-3.0.0-alpha12~81
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=283df0b84bb6c35ad1291cabd6f693328faca267;p=thirdparty%2Fopenssl.git

Rename internal providercommonerr.h to less mouthful proverr.h

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Paul Dale <pauli@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/14086)
---

diff --git a/crypto/err/err_all.c b/crypto/err/err_all.c
index 1d26c19d90..b1e69b5cc5 100644
--- a/crypto/err/err_all.c
+++ b/crypto/err/err_all.c
@@ -43,7 +43,7 @@
 #include "crypto/storeerr.h"
 #include "crypto/esserr.h"
 #include "internal/propertyerr.h"
-#include "prov/providercommonerr.h"
+#include "prov/proverr.h"
 
 int err_load_crypto_strings_int(void)
 {
diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec
index 677812e611..3612c195f0 100644
--- a/crypto/err/openssl.ec
+++ b/crypto/err/openssl.ec
@@ -40,7 +40,7 @@ L SM2           NONE                            crypto/sm2/sm2_err.c
 L OSSL_STORE    include/openssl/storeerr.h      crypto/store/store_err.c                include/crypto/storeerr.h
 L ESS           include/openssl/esserr.h        crypto/ess/ess_err.c                    include/crypto/esserr.h
 L PROP          NONE                            crypto/property/property_err.c          include/internal/propertyerr.h
-L PROV          include/openssl/proverr.h       providers/common/provider_err.c         providers/common/include/prov/providercommonerr.h
+L PROV          include/openssl/proverr.h       providers/common/provider_err.c         providers/common/include/prov/proverr.h
 L OSSL_ENCODER  include/openssl/encodererr.h    crypto/encode_decode/encoder_err.c      include/crypto/encodererr.h
 L OSSL_DECODER  include/openssl/decodererr.h    crypto/encode_decode/decoder_err.c      include/crypto/decodererr.h
 L HTTP          include/openssl/httperr.h       crypto/http/http_err.c                  include/crypto/httperr.h
diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/proverr.h
similarity index 89%
rename from providers/common/include/prov/providercommonerr.h
rename to providers/common/include/prov/proverr.h
index f0ba1489e8..d9744d06b8 100644
--- a/providers/common/include/prov/providercommonerr.h
+++ b/providers/common/include/prov/proverr.h
@@ -8,8 +8,8 @@
  * https://www.openssl.org/source/license.html
  */
 
-#ifndef OSSL_PROVIDERCOMMONERR_H
-# define OSSL_PROVIDERCOMMONERR_H
+#ifndef OSSL_PROVERR_H
+# define OSSL_PROVERR_H
 # pragma once
 
 # include <openssl/opensslconf.h>
diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index ecd3b8e081..a64c5d2ece 100644
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -10,7 +10,7 @@
 
 #include <openssl/err.h>
 #include <openssl/proverr.h>
-#include "include/prov/providercommonerr.h"
+#include "include/prov/proverr.h"
 
 #ifndef OPENSSL_NO_ERR