diff options
Diffstat (limited to 'providers')
68 files changed, 73 insertions, 208 deletions
diff --git a/providers/common/include/prov/providercommonerr.h b/providers/common/include/prov/providercommonerr.h index e59ee36abb..f0ba1489e8 100644 --- a/providers/common/include/prov/providercommonerr.h +++ b/providers/common/include/prov/providercommonerr.h @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 2020 The OpenSSL Project Authors. All Rights Reserved. + * 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 @@ -21,141 +21,6 @@ extern "C" { int err_load_PROV_strings_int(void); -/* - * PROV reason codes. - */ -# define PROV_R_ADDITIONAL_INPUT_TOO_LONG 184 -# define PROV_R_AES_KEY_SETUP_FAILED 101 -# define PROV_R_ALGORITHM_MISMATCH 173 -# define PROV_R_ALREADY_INSTANTIATED 185 -# define PROV_R_BAD_DECRYPT 100 -# define PROV_R_BAD_ENCODING 141 -# define PROV_R_BAD_LENGTH 142 -# define PROV_R_BAD_TLS_CLIENT_VERSION 161 -# define PROV_R_BN_ERROR 160 -# define PROV_R_BOTH_MODE_AND_MODE_INT 127 -# define PROV_R_CIPHER_OPERATION_FAILED 102 -# define PROV_R_DERIVATION_FUNCTION_INIT_FAILED 205 -# define PROV_R_DERIVATION_FUNCTION_MANDATORY_FOR_FIPS 186 -# define PROV_R_DIGEST_NOT_ALLOWED 174 -# define PROV_R_DRBG_ALREADY_INITIALIZED 187 -# define PROV_R_ERROR_INSTANTIATING_DRBG 188 -# define PROV_R_ERROR_RETRIEVING_ENTROPY 189 -# define PROV_R_ERROR_RETRIEVING_NONCE 190 -# define PROV_R_FAILED_DURING_DERIVATION 164 -# define PROV_R_FAILED_TO_CREATE_LOCK 180 -# define PROV_R_FAILED_TO_DECRYPT 162 -# define PROV_R_FAILED_TO_GENERATE_KEY 121 -# define PROV_R_FAILED_TO_GET_PARAMETER 103 -# define PROV_R_FAILED_TO_SET_PARAMETER 104 -# define PROV_R_FAILED_TO_SIGN 175 -# define PROV_R_FIPS_MODULE_CONDITIONAL_ERROR 227 -# define PROV_R_FIPS_MODULE_ENTERING_ERROR_STATE 224 -# define PROV_R_FIPS_MODULE_IN_ERROR_STATE 225 -# define PROV_R_GENERATE_ERROR 191 -# define PROV_R_ILLEGAL_OR_UNSUPPORTED_PADDING_MODE 165 -# define PROV_R_INAVLID_UKM_LENGTH 146 -# define PROV_R_INDICATOR_INTEGRITY_FAILURE 210 -# define PROV_R_INSUFFICIENT_DRBG_STRENGTH 181 -# define PROV_R_INVALID_AAD 108 -# define PROV_R_INVALID_CONFIG_DATA 211 -# define PROV_R_INVALID_CONSTANT_LENGTH 157 -# define PROV_R_INVALID_CURVE 176 -# define PROV_R_INVALID_CUSTOM_LENGTH 111 -# define PROV_R_INVALID_DATA 115 -# define PROV_R_INVALID_DIGEST 122 -# define PROV_R_INVALID_DIGEST_LENGTH 166 -# define PROV_R_INVALID_DIGEST_SIZE 218 -# define PROV_R_INVALID_ITERATION_COUNT 123 -# define PROV_R_INVALID_IVLEN 116 -# define PROV_R_INVALID_IV_LENGTH 109 -# define PROV_R_INVALID_KEY 158 -# define PROV_R_INVALID_KEYLEN 117 -# define PROV_R_INVALID_KEY_LEN 124 -# define PROV_R_INVALID_KEY_LENGTH 105 -# define PROV_R_INVALID_MAC 151 -# define PROV_R_INVALID_MGF1_MD 167 -# define PROV_R_INVALID_MODE 125 -# define PROV_R_INVALID_MODE_INT 126 -# define PROV_R_INVALID_PADDING_MODE 168 -# define PROV_R_INVALID_PSS_SALTLEN 169 -# define PROV_R_INVALID_PUBINFO 198 -# define PROV_R_INVALID_RSA_KEY 217 -# define PROV_R_INVALID_SALT_LENGTH 112 -# define PROV_R_INVALID_SEED_LENGTH 154 -# define PROV_R_INVALID_SIGNATURE_SIZE 179 -# define PROV_R_INVALID_STATE 212 -# define PROV_R_INVALID_TAG 110 -# define PROV_R_INVALID_TAGLEN 118 -# define PROV_R_INVALID_UKM_LENGTH 200 -# define PROV_R_INVALID_X931_DIGEST 170 -# define PROV_R_IN_ERROR_STATE 192 -# define PROV_R_KEY_SIZE_TOO_SMALL 171 -# define PROV_R_MISSING_CEK_ALG 144 -# define PROV_R_MISSING_CIPHER 155 -# define PROV_R_MISSING_CONFIG_DATA 213 -# define PROV_R_MISSING_CONSTANT 156 -# define PROV_R_MISSING_KEY 128 -# define PROV_R_MISSING_MAC 150 -# define PROV_R_MISSING_MESSAGE_DIGEST 129 -# define PROV_R_MISSING_OID 209 -# define PROV_R_MISSING_PASS 130 -# define PROV_R_MISSING_SALT 131 -# define PROV_R_MISSING_SECRET 132 -# define PROV_R_MISSING_SEED 140 -# define PROV_R_MISSING_SESSION_ID 133 -# define PROV_R_MISSING_TYPE 134 -# define PROV_R_MISSING_XCGHASH 135 -# define PROV_R_MODULE_INTEGRITY_FAILURE 214 -# define PROV_R_NOT_A_PRIVATE_KEY 221 -# define PROV_R_NOT_A_PUBLIC_KEY 220 -# define PROV_R_NOT_INSTANTIATED 193 -# define PROV_R_NOT_PARAMETERS 226 -# define PROV_R_NOT_SUPPORTED 136 -# define PROV_R_NOT_XOF_OR_INVALID_LENGTH 113 -# define PROV_R_NO_KEY_SET 114 -# define PROV_R_NO_PARAMETERS_SET 177 -# define PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE 178 -# define PROV_R_OUTPUT_BUFFER_TOO_SMALL 106 -# define PROV_R_PARENT_CANNOT_GENERATE_RANDOM_NUMBERS 228 -# define PROV_R_PARENT_LOCKING_NOT_ENABLED 182 -# define PROV_R_PARENT_STRENGTH_TOO_WEAK 194 -# define PROV_R_PATH_MUST_BE_ABSOLUTE 219 -# define PROV_R_PERSONALISATION_STRING_TOO_LONG 195 -# define PROV_R_PSS_SALTLEN_TOO_SMALL 172 -# define PROV_R_READ_KEY 159 -# define PROV_R_REQUEST_TOO_LARGE_FOR_DRBG 196 -# define PROV_R_REQUIRE_CTR_MODE_CIPHER 206 -# define PROV_R_RESEED_ERROR 197 -# define PROV_R_SEARCH_ONLY_SUPPORTED_FOR_DIRECTORIES 222 -# define PROV_R_SEED_SOURCES_MUST_NOT_HAVE_A_PARENT 229 -# define PROV_R_SELF_TEST_KAT_FAILURE 215 -# define PROV_R_SELF_TEST_POST_FAILURE 216 -# define PROV_R_TAG_NOTSET 119 -# define PROV_R_TAG_NOT_NEEDED 120 -# define PROV_R_UNABLE_TO_FIND_CIPHERS 207 -# define PROV_R_UNABLE_TO_GET_ENTROPY 202 -# define PROV_R_UNABLE_TO_GET_NONCE 203 -# define PROV_R_UNABLE_TO_GET_PARENT_STRENGTH 199 -# define PROV_R_UNABLE_TO_INITIALISE_CIPHERS 208 -# define PROV_R_UNABLE_TO_LOAD_SHA1 143 -# define PROV_R_UNABLE_TO_LOAD_SHA256 147 -# define PROV_R_UNABLE_TO_LOCK_PARENT 201 -# define PROV_R_UNABLE_TO_RESEED 204 -# define PROV_R_UNKNOWN_PADDING_TYPE 163 -# define PROV_R_UNSUPPORTED_CEK_ALG 145 -# define PROV_R_UNSUPPORTED_KEY_SIZE 153 -# define PROV_R_UNSUPPORTED_MAC_TYPE 137 -# define PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS 152 -# define PROV_R_URI_AUTHORITY_UNSUPPORTED 223 -# define PROV_R_VALUE_ERROR 138 -# define PROV_R_WRONG_FINAL_BLOCK_LENGTH 107 -# define PROV_R_WRONG_OUTPUT_BUFFER_SIZE 139 -# define PROV_R_XOF_DIGESTS_NOT_ALLOWED 183 -# define PROV_R_XTS_DATA_UNIT_IS_TOO_LARGE 148 -# define PROV_R_XTS_DUPLICATED_KEYS 149 - - # ifdef __cplusplus } # endif diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c index 3a28eaaa2d..55978a1095 100644 --- a/providers/common/provider_err.c +++ b/providers/common/provider_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2020 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-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 @@ -9,6 +9,7 @@ */ #include <openssl/err.h> +#include <openssl/proverr.h> #include "include/prov/providercommonerr.h" #ifndef OPENSSL_NO_ERR diff --git a/providers/common/provider_util.c b/providers/common/provider_util.c index 2499d1534e..516ec46dd7 100644 --- a/providers/common/provider_util.c +++ b/providers/common/provider_util.c @@ -13,8 +13,8 @@ #include <openssl/evp.h> #include <openssl/core_names.h> #include <openssl/err.h> +#include <openssl/proverr.h> #include "prov/provider_util.h" -#include "prov/providercommonerr.h" #include "internal/nelem.h" void ossl_prov_cipher_reset(PROV_CIPHER *pc) diff --git a/providers/common/securitycheck.c b/providers/common/securitycheck.c index 9d02536c38..9457f4b53a 100644 --- a/providers/common/securitycheck.c +++ b/providers/common/securitycheck.c @@ -14,10 +14,10 @@ #include <openssl/dh.h> #include <openssl/ec.h> #include <openssl/err.h> +#include <openssl/proverr.h> #include <openssl/core_names.h> #include <openssl/obj_mac.h> #include "prov/securitycheck.h" -#include "prov/providercommonerr.h" /* * FIPS requires a minimum security strength of 112 bits (for encryption or diff --git a/providers/common/securitycheck_fips.c b/providers/common/securitycheck_fips.c index 94457d6ccf..5bf59c9a35 100644 --- a/providers/common/securitycheck_fips.c +++ b/providers/common/securitycheck_fips.c @@ -14,10 +14,10 @@ #include <openssl/dh.h> #include <openssl/ec.h> #include <openssl/err.h> +#include <openssl/proverr.h> #include <openssl/core_names.h> #include <openssl/obj_mac.h> #include "prov/securitycheck.h" -#include "prov/providercommonerr.h" extern int FIPS_security_check_enabled(void); diff --git a/providers/fips/fipsprov.c b/providers/fips/fipsprov.c index dc1bd7b472..90491b0e5f 100644 --- a/providers/fips/fipsprov.c +++ b/providers/fips/fipsprov.c @@ -12,11 +12,11 @@ #include <openssl/params.h> #include <openssl/fips_names.h> #include <openssl/rand.h> /* RAND_get0_public() */ +#include <openssl/proverr.h> #include "internal/cryptlib.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/provider_util.h" #include "prov/seeding.h" #include "self_test.h" diff --git a/providers/fips/self_test.c b/providers/fips/self_test.c index a3dd621262..17053d6f9f 100644 --- a/providers/fips/self_test.c +++ b/providers/fips/self_test.c @@ -13,8 +13,8 @@ #include <openssl/crypto.h> #include <openssl/fipskey.h> #include <openssl/err.h> +#include <openssl/proverr.h> #include "e_os.h" -#include "prov/providercommonerr.h" #include "prov/providercommon.h" /* diff --git a/providers/implementations/asymciphers/rsa_enc.c b/providers/implementations/asymciphers/rsa_enc.c index 3b6dbe09fa..461dee8c6d 100644 --- a/providers/implementations/asymciphers/rsa_enc.c +++ b/providers/implementations/asymciphers/rsa_enc.c @@ -20,12 +20,12 @@ #include <openssl/rsa.h> #include <openssl/params.h> #include <openssl/err.h> +#include <openssl/proverr.h> /* Just for SSL_MAX_MASTER_KEY_LENGTH */ #include <openssl/ssl.h> #include "internal/constant_time.h" #include "internal/sizes.h" #include "crypto/rsa.h" -#include "prov/providercommonerr.h" #include "prov/provider_ctx.h" #include "prov/implementations.h" #include "prov/providercommon.h" diff --git a/providers/implementations/asymciphers/sm2_enc.c b/providers/implementations/asymciphers/sm2_enc.c index 3dd4d83838..923ee5694a 100644 --- a/providers/implementations/asymciphers/sm2_enc.c +++ b/providers/implementations/asymciphers/sm2_enc.c @@ -15,8 +15,8 @@ #include <openssl/core_names.h> #include <openssl/params.h> #include <openssl/err.h> +#include <openssl/proverr.h> #include <crypto/sm2.h> -#include "prov/providercommonerr.h" #include "prov/provider_ctx.h" #include "prov/implementations.h" #include "prov/provider_util.h" diff --git a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c index 03f216d22e..abefc20ab2 100644 --- a/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c +++ b/providers/implementations/ciphers/cipher_aes_cbc_hmac_sha.c @@ -18,6 +18,7 @@ /* Only for SSL3_VERSION and TLS1_VERSION */ #include <openssl/ssl.h> +#include <openssl/proverr.h> #include "cipher_aes_cbc_hmac_sha.h" #include "prov/implementations.h" #include "prov/providercommon.h" @@ -28,7 +29,6 @@ const OSSL_DISPATCH ossl_##nm##kbits##sub##_functions[] = { \ { 0, NULL } \ }; #else -# include "prov/providercommonerr.h" # define AES_CBC_HMAC_SHA_FLAGS (PROV_CIPHER_FLAG_AEAD \ | PROV_CIPHER_FLAG_TLS1_MULTIBLOCK) diff --git a/providers/implementations/ciphers/cipher_aes_cts.inc b/providers/implementations/ciphers/cipher_aes_cts.inc index dae112febf..f398534dda 100644 --- a/providers/implementations/ciphers/cipher_aes_cts.inc +++ b/providers/implementations/ciphers/cipher_aes_cts.inc @@ -9,8 +9,8 @@ /* Dispatch functions for AES CBC CTS ciphers */ +#include <openssl/proverr.h> #include "cipher_aes_cts.h" -#include "prov/providercommonerr.h" #define AES_CTS_FLAGS PROV_CIPHER_FLAG_CTS diff --git a/providers/implementations/ciphers/cipher_aes_hw.c b/providers/implementations/ciphers/cipher_aes_hw.c index 0b6f06f915..3aed088171 100644 --- a/providers/implementations/ciphers/cipher_aes_hw.c +++ b/providers/implementations/ciphers/cipher_aes_hw.c @@ -13,8 +13,8 @@ */ #include "internal/deprecated.h" +#include <openssl/proverr.h> #include "cipher_aes.h" -#include "prov/providercommonerr.h" static int cipher_hw_aes_initkey(PROV_CIPHER_CTX *dat, const unsigned char *key, size_t keylen) diff --git a/providers/implementations/ciphers/cipher_aes_ocb.c b/providers/implementations/ciphers/cipher_aes_ocb.c index 26ffdab7a4..b94d7644df 100644 --- a/providers/implementations/ciphers/cipher_aes_ocb.c +++ b/providers/implementations/ciphers/cipher_aes_ocb.c @@ -14,9 +14,9 @@ */ #include "internal/deprecated.h" +#include <openssl/proverr.h> #include "cipher_aes_ocb.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/ciphercommon_aead.h" #include "prov/implementations.h" diff --git a/providers/implementations/ciphers/cipher_aes_siv.c b/providers/implementations/ciphers/cipher_aes_siv.c index 469515bb8c..9a9adb02d9 100644 --- a/providers/implementations/ciphers/cipher_aes_siv.c +++ b/providers/implementations/ciphers/cipher_aes_siv.c @@ -15,10 +15,10 @@ */ #include "internal/deprecated.h" +#include <openssl/proverr.h> #include "cipher_aes_siv.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/ciphercommon_aead.h" #include "prov/provider_ctx.h" diff --git a/providers/implementations/ciphers/cipher_aes_wrp.c b/providers/implementations/ciphers/cipher_aes_wrp.c index dc625216ca..967e12206b 100644 --- a/providers/implementations/ciphers/cipher_aes_wrp.c +++ b/providers/implementations/ciphers/cipher_aes_wrp.c @@ -13,9 +13,9 @@ */ #include "internal/deprecated.h" +#include <openssl/proverr.h> #include "cipher_aes.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" /* AES wrap with padding has IV length of 4, without padding 8 */ diff --git a/providers/implementations/ciphers/cipher_aes_xts.c b/providers/implementations/ciphers/cipher_aes_xts.c index cf768d27d4..c5699d645b 100644 --- a/providers/implementations/ciphers/cipher_aes_xts.c +++ b/ |