diff options
author | Tomas Mraz <tomas@openssl.org> | 2021-02-05 17:40:42 +0100 |
---|---|---|
committer | Tomas Mraz <tomas@openssl.org> | 2021-02-11 09:34:31 +0100 |
commit | 2741128e9deeb7f6fd73f10a1c657c05433a41cb (patch) | |
tree | d8839a5c0f19b10c6cc16104d639168facee239b /providers/implementations/kdfs | |
parent | dc9ec65a018d92306e4b3139239505c5cfc5b15e (diff) |
Move the PROV_R reason codes to a public header
The PROV_R codes can be returned to applications so it is useful
to have some common set of provider reason codes for the applications
or third party providers.
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)
Diffstat (limited to 'providers/implementations/kdfs')
-rw-r--r-- | providers/implementations/kdfs/hkdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/kbkdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/krb5kdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/pbkdf2.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/pkcs12kdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/scrypt.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/sshkdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/sskdf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/tls1_prf.c | 2 | ||||
-rw-r--r-- | providers/implementations/kdfs/x942kdf.c | 2 |
10 files changed, 10 insertions, 10 deletions
diff --git a/providers/implementations/kdfs/hkdf.c b/providers/implementations/kdfs/hkdf.c index a985c85440..5fa24b93e3 100644 --- a/providers/implementations/kdfs/hkdf.c +++ b/providers/implementations/kdfs/hkdf.c @@ -20,12 +20,12 @@ #include <openssl/evp.h> #include <openssl/kdf.h> #include <openssl/core_names.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" #include "e_os.h" diff --git a/providers/implementations/kdfs/kbkdf.c b/providers/implementations/kdfs/kbkdf.c index a8f09bdbff..2e1a96e28f 100644 --- a/providers/implementations/kdfs/kbkdf.c +++ b/providers/implementations/kdfs/kbkdf.c @@ -33,6 +33,7 @@ #include <openssl/hmac.h> #include <openssl/kdf.h> #include <openssl/params.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "crypto/evp.h" @@ -42,7 +43,6 @@ #include "prov/provider_ctx.h" #include "prov/provider_util.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "e_os.h" diff --git a/providers/implementations/kdfs/krb5kdf.c b/providers/implementations/kdfs/krb5kdf.c index 56a61b5cec..a928edbb0c 100644 --- a/providers/implementations/kdfs/krb5kdf.c +++ b/providers/implementations/kdfs/krb5kdf.c @@ -21,6 +21,7 @@ #include <openssl/des.h> #include <openssl/evp.h> #include <openssl/kdf.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "crypto/evp.h" @@ -29,7 +30,6 @@ #include "prov/provider_ctx.h" #include "prov/provider_util.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" /* KRB5 KDF defined in RFC 3961, Section 5.1 */ diff --git a/providers/implementations/kdfs/pbkdf2.c b/providers/implementations/kdfs/pbkdf2.c index 37a81f00ba..7420819a09 100644 --- a/providers/implementations/kdfs/pbkdf2.c +++ b/providers/implementations/kdfs/pbkdf2.c @@ -20,12 +20,12 @@ #include <openssl/evp.h> #include <openssl/kdf.h> #include <openssl/core_names.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" #include "pbkdf2.h" diff --git a/providers/implementations/kdfs/pkcs12kdf.c b/providers/implementations/kdfs/pkcs12kdf.c index b058005e1d..b388efe786 100644 --- a/providers/implementations/kdfs/pkcs12kdf.c +++ b/providers/implementations/kdfs/pkcs12kdf.c @@ -14,12 +14,12 @@ #include <openssl/evp.h> #include <openssl/kdf.h> #include <openssl/core_names.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" diff --git a/providers/implementations/kdfs/scrypt.c b/providers/implementations/kdfs/scrypt.c index 023b1916a1..3aba9f7955 100644 --- a/providers/implementations/kdfs/scrypt.c +++ b/providers/implementations/kdfs/scrypt.c @@ -14,12 +14,12 @@ #include <openssl/kdf.h> #include <openssl/err.h> #include <openssl/core_names.h> +#include <openssl/proverr.h> #include "crypto/evp.h" #include "internal/numbers.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #ifndef OPENSSL_NO_SCRYPT diff --git a/providers/implementations/kdfs/sshkdf.c b/providers/implementations/kdfs/sshkdf.c index e86c502184..058f3b95b7 100644 --- a/providers/implementations/kdfs/sshkdf.c +++ b/providers/implementations/kdfs/sshkdf.c @@ -13,12 +13,12 @@ #include <openssl/evp.h> #include <openssl/kdf.h> #include <openssl/core_names.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" diff --git a/providers/implementations/kdfs/sskdf.c b/providers/implementations/kdfs/sskdf.c index 84711dde27..641aacbe97 100644 --- a/providers/implementations/kdfs/sskdf.c +++ b/providers/implementations/kdfs/sskdf.c @@ -42,12 +42,12 @@ #include <openssl/kdf.h> #include <openssl/core_names.h> #include <openssl/params.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" diff --git a/providers/implementations/kdfs/tls1_prf.c b/providers/implementations/kdfs/tls1_prf.c index aba08068ca..2cb825229b 100644 --- a/providers/implementations/kdfs/tls1_prf.c +++ b/providers/implementations/kdfs/tls1_prf.c @@ -52,12 +52,12 @@ #include <openssl/kdf.h> #include <openssl/core_names.h> #include <openssl/params.h> +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "internal/numbers.h" #include "crypto/evp.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" #include "e_os.h" diff --git a/providers/implementations/kdfs/x942kdf.c b/providers/implementations/kdfs/x942kdf.c index ae3ed69201..7f1f0e6c9d 100644 --- a/providers/implementations/kdfs/x942kdf.c +++ b/providers/implementations/kdfs/x942kdf.c @@ -14,11 +14,11 @@ #include <openssl/err.h> #include <openssl/evp.h> #include <openssl/params.h> +#include <openssl/proverr.h> #include "internal/packet.h" #include "internal/der.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_util.h" #include "prov/der_wrap.h" |