From 283df0b84bb6c35ad1291cabd6f693328faca267 Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Tue, 9 Feb 2021 13:25:16 +0100 Subject: Rename internal providercommonerr.h to less mouthful proverr.h Reviewed-by: Richard Levitte Reviewed-by: Paul Dale Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/14086) --- crypto/err/err_all.c | 2 +- crypto/err/openssl.ec | 2 +- providers/common/include/prov/proverr.h | 27 +++++++++++++++++++++++ providers/common/include/prov/providercommonerr.h | 27 ----------------------- providers/common/provider_err.c | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) create mode 100644 providers/common/include/prov/proverr.h delete mode 100644 providers/common/include/prov/providercommonerr.h 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/proverr.h b/providers/common/include/prov/proverr.h new file mode 100644 index 0000000000..d9744d06b8 --- /dev/null +++ b/providers/common/include/prov/proverr.h @@ -0,0 +1,27 @@ +/* + * Generated by util/mkerr.pl DO NOT EDIT + * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. + * + * Licensed under the Apache License 2.0 (the "License"). You may not use + * this file except in compliance with the License. You can obtain a copy + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef OSSL_PROVERR_H +# define OSSL_PROVERR_H +# pragma once + +# include +# include + +# ifdef __cplusplus +extern "C" { +# endif + +int err_load_PROV_strings_int(void); + +# ifdef __cplusplus +} +# endif +#endif diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/providercommonerr.h deleted file mode 100644 index f0ba1489e8..0000000000 --- a/providers/common/include/prov/providercommonerr.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020-2021 The OpenSSL Project Authors. All Rights Reserved. - * - * Licensed under the Apache License 2.0 (the "License"). You may not use - * this file except in compliance with the License. You can obtain a copy - * in the file LICENSE in the source distribution or at - * https://www.openssl.org/source/license.html - */ - -#ifndef OSSL_PROVIDERCOMMONERR_H -# define OSSL_PROVIDERCOMMONERR_H -# pragma once - -# include -# include - -# ifdef __cplusplus -extern "C" { -# endif - -int err_load_PROV_strings_int(void); - -# ifdef __cplusplus -} -# endif -#endif 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 #include -#include "include/prov/providercommonerr.h" +#include "include/prov/proverr.h" #ifndef OPENSSL_NO_ERR -- cgit v1.2.3