From 2741128e9deeb7f6fd73f10a1c657c05433a41cb Mon Sep 17 00:00:00 2001 From: Tomas Mraz Date: Fri, 5 Feb 2021 17:40:42 +0100 Subject: 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 Reviewed-by: Paul Dale Reviewed-by: Shane Lontis (Merged from https://github.com/openssl/openssl/pull/14086) --- crypto/err/openssl.ec | 2 +- include/openssl/proverr.h | 155 +++++++++++++++++++++ providers/common/include/prov/providercommonerr.h | 137 +----------------- providers/common/provider_err.c | 3 +- providers/common/provider_util.c | 2 +- providers/common/securitycheck.c | 2 +- providers/common/securitycheck_fips.c | 2 +- providers/fips/fipsprov.c | 2 +- providers/fips/self_test.c | 2 +- providers/implementations/asymciphers/rsa_enc.c | 2 +- providers/implementations/asymciphers/sm2_enc.c | 2 +- .../ciphers/cipher_aes_cbc_hmac_sha.c | 2 +- .../implementations/ciphers/cipher_aes_cts.inc | 2 +- providers/implementations/ciphers/cipher_aes_hw.c | 2 +- providers/implementations/ciphers/cipher_aes_ocb.c | 2 +- providers/implementations/ciphers/cipher_aes_siv.c | 2 +- providers/implementations/ciphers/cipher_aes_wrp.c | 2 +- providers/implementations/ciphers/cipher_aes_xts.c | 2 +- .../implementations/ciphers/cipher_camellia_hw.c | 1 - providers/implementations/ciphers/cipher_cast5.c | 2 +- .../implementations/ciphers/cipher_chacha20.c | 2 +- .../ciphers/cipher_chacha20_poly1305.c | 2 +- providers/implementations/ciphers/cipher_des.c | 4 +- providers/implementations/ciphers/cipher_null.c | 2 +- providers/implementations/ciphers/cipher_rc2.c | 2 +- .../implementations/ciphers/cipher_rc4_hmac_md5.c | 2 +- providers/implementations/ciphers/cipher_rc5.c | 2 +- providers/implementations/ciphers/cipher_tdes.c | 4 +- .../implementations/ciphers/cipher_tdes_common.c | 4 +- .../implementations/ciphers/cipher_tdes_wrap.c | 2 +- providers/implementations/ciphers/ciphercommon.c | 2 +- .../implementations/ciphers/ciphercommon_block.c | 2 +- .../implementations/ciphers/ciphercommon_ccm.c | 2 +- .../implementations/ciphers/ciphercommon_gcm.c | 4 +- providers/implementations/digests/digestcommon.c | 4 +- providers/implementations/digests/mdc2_prov.c | 2 +- providers/implementations/digests/sha3_prov.c | 2 +- .../implementations/encode_decode/decode_der2key.c | 2 +- .../implementations/encode_decode/decode_pem2der.c | 2 +- .../implementations/encode_decode/encode_key2any.c | 2 +- .../encode_decode/encode_key2text.c | 2 +- providers/implementations/exchange/ecx_exch.c | 2 +- providers/implementations/kdfs/hkdf.c | 2 +- providers/implementations/kdfs/kbkdf.c | 2 +- providers/implementations/kdfs/krb5kdf.c | 2 +- providers/implementations/kdfs/pbkdf2.c | 2 +- providers/implementations/kdfs/pkcs12kdf.c | 2 +- providers/implementations/kdfs/scrypt.c | 2 +- providers/implementations/kdfs/sshkdf.c | 2 +- providers/implementations/kdfs/sskdf.c | 2 +- providers/implementations/kdfs/tls1_prf.c | 2 +- providers/implementations/kdfs/x942kdf.c | 2 +- providers/implementations/kem/rsa_kem.c | 2 +- providers/implementations/keymgmt/ec_kmgmt.c | 2 +- providers/implementations/macs/blake2_mac_impl.c | 2 +- providers/implementations/macs/gmac_prov.c | 2 +- providers/implementations/macs/kmac_prov.c | 2 +- providers/implementations/macs/poly1305_prov.c | 2 +- providers/implementations/macs/siphash_prov.c | 2 +- providers/implementations/rands/drbg.c | 2 +- providers/implementations/rands/drbg_ctr.c | 2 +- providers/implementations/rands/drbg_hash.c | 2 +- providers/implementations/rands/drbg_hmac.c | 2 +- providers/implementations/rands/seed_src.c | 2 +- providers/implementations/signature/dsa.c | 2 +- providers/implementations/signature/ecdsa.c | 2 +- providers/implementations/signature/eddsa.c | 2 +- providers/implementations/signature/rsa.c | 2 +- providers/implementations/signature/sm2sig.c | 2 +- providers/implementations/storemgmt/file_store.c | 2 +- 70 files changed, 229 insertions(+), 209 deletions(-) create mode 100644 include/openssl/proverr.h diff --git a/crypto/err/openssl.ec b/crypto/err/openssl.ec index f265ca0f5d..677812e611 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 NONE 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/providercommonerr.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/include/openssl/proverr.h b/include/openssl/proverr.h new file mode 100644 index 0000000000..6c520bcef7 --- /dev/null +++ b/include/openssl/proverr.h @@ -0,0 +1,155 @@ +/* + * Generated by util/mkerr.pl DO NOT EDIT + * 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 + * in the file LICENSE in the source distribution or at + * https://www.openssl.org/source/license.html + */ + +#ifndef OPENSSL_PROVERR_H +# define OPENSSL_PROVERR_H +# pragma once + +# include +# include +# include + + + +/* + * 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 + +#endif 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 +#include #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 #include #include +#include #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 #include #include +#include #include #include #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 #include #include +#include #include #include #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 #include #include /* RAND_get0_public() */ +#include #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 #include #include +#include #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 #include #include +#include /* Just for SSL_MAX_MASTER_KEY_LENGTH */ #include #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 #include #include +#include #include -#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 +#include #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 #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 #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 #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 #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 #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/providers/implementations/ciphers/cipher_aes_xts.c @@ -15,10 +15,10 @@ */ #include "internal/deprecated.h" +#include #include "cipher_aes_xts.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define AES_XTS_FLAGS PROV_CIPHER_FLAG_CUSTOM_IV #define AES_XTS_IV_BITS 128 diff --git a/providers/implementations/ciphers/cipher_camellia_hw.c b/providers/implementations/ciphers/cipher_camellia_hw.c index e8ada99a7e..06b29ca287 100644 --- a/providers/implementations/ciphers/cipher_camellia_hw.c +++ b/providers/implementations/ciphers/cipher_camellia_hw.c @@ -14,7 +14,6 @@ #include "internal/deprecated.h" #include "cipher_camellia.h" -#include static int cipher_hw_camellia_initkey(PROV_CIPHER_CTX *dat, const unsigned char *key, size_t keylen) diff --git a/providers/implementations/ciphers/cipher_cast5.c b/providers/implementations/ciphers/cipher_cast5.c index 1d525343b4..f5f7cba631 100644 --- a/providers/implementations/ciphers/cipher_cast5.c +++ b/providers/implementations/ciphers/cipher_cast5.c @@ -15,10 +15,10 @@ /* Dispatch functions for cast cipher modes ecb, cbc, ofb, cfb */ +#include #include "cipher_cast.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define CAST5_FLAGS PROV_CIPHER_FLAG_VARIABLE_LENGTH diff --git a/providers/implementations/ciphers/cipher_chacha20.c b/providers/implementations/ciphers/cipher_chacha20.c index b2fe1b1957..c4042c1b39 100644 --- a/providers/implementations/ciphers/cipher_chacha20.c +++ b/providers/implementations/ciphers/cipher_chacha20.c @@ -9,10 +9,10 @@ /* Dispatch functions for chacha20 cipher */ +#include #include "cipher_chacha20.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define CHACHA20_KEYLEN (CHACHA_KEY_SIZE) #define CHACHA20_BLKLEN (1) diff --git a/providers/implementations/ciphers/cipher_chacha20_poly1305.c b/providers/implementations/ciphers/cipher_chacha20_poly1305.c index 919d4fba94..0565b05f39 100644 --- a/providers/implementations/ciphers/cipher_chacha20_poly1305.c +++ b/providers/implementations/ciphers/cipher_chacha20_poly1305.c @@ -9,10 +9,10 @@ /* Dispatch functions for chacha20_poly1305 cipher */ +#include #include "cipher_chacha20_poly1305.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define CHACHA20_POLY1305_KEYLEN CHACHA_KEY_SIZE diff --git a/providers/implementations/ciphers/cipher_des.c b/providers/implementations/ciphers/cipher_des.c index ec186445c8..dd8bbefa36 100644 --- a/providers/implementations/ciphers/cipher_des.c +++ b/providers/implementations/ciphers/cipher_des.c @@ -13,12 +13,12 @@ */ #include "internal/deprecated.h" +#include +#include #include "prov/ciphercommon.h" #include "cipher_des.h" -#include #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define DES_FLAGS 0 diff --git a/providers/implementations/ciphers/cipher_null.c b/providers/implementations/ciphers/cipher_null.c index c3ebb25c28..01db056983 100644 --- a/providers/implementations/ciphers/cipher_null.c +++ b/providers/implementations/ciphers/cipher_null.c @@ -10,10 +10,10 @@ #include #include #include +#include #include "prov/implementations.h" #include "prov/ciphercommon.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" typedef struct prov_cipher_null_ctx_st { int enc; diff --git a/providers/implementations/ciphers/cipher_rc2.c b/providers/implementations/ciphers/cipher_rc2.c index 09d66b2cdd..6e25d1534a 100644 --- a/providers/implementations/ciphers/cipher_rc2.c +++ b/providers/implementations/ciphers/cipher_rc2.c @@ -15,10 +15,10 @@ */ #include "internal/deprecated.h" +#include #include "cipher_rc2.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define RC2_40_MAGIC 0xa0 #define RC2_64_MAGIC 0x78 diff --git a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c index b757197110..c69b9aecb8 100644 --- a/providers/implementations/ciphers/cipher_rc4_hmac_md5.c +++ b/providers/implementations/ciphers/cipher_rc4_hmac_md5.c @@ -15,10 +15,10 @@ */ #include "internal/deprecated.h" +#include #include "cipher_rc4_hmac_md5.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define RC4_HMAC_MD5_FLAGS (PROV_CIPHER_FLAG_VARIABLE_LENGTH \ | PROV_CIPHER_FLAG_AEAD) diff --git a/providers/implementations/ciphers/cipher_rc5.c b/providers/implementations/ciphers/cipher_rc5.c index ec408ed885..db0dbaaf05 100644 --- a/providers/implementations/ciphers/cipher_rc5.c +++ b/providers/implementations/ciphers/cipher_rc5.c @@ -15,10 +15,10 @@ */ #include "internal/deprecated.h" +#include #include "cipher_rc5.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define RC5_FLAGS PROV_CIPHER_FLAG_VARIABLE_LENGTH diff --git a/providers/implementations/ciphers/cipher_tdes.c b/providers/implementations/ciphers/cipher_tdes.c index a2855af481..6ab083db41 100644 --- a/providers/implementations/ciphers/cipher_tdes.c +++ b/providers/implementations/ciphers/cipher_tdes.c @@ -13,11 +13,11 @@ */ #include "internal/deprecated.h" +#include +#include #include "prov/ciphercommon.h" #include "cipher_tdes.h" -#include #include "prov/implementations.h" -#include "prov/providercommonerr.h" /* * NOTE: ECB mode does not use an IV - but existing test code is setting diff --git a/providers/implementations/ciphers/cipher_tdes_common.c b/providers/implementations/ciphers/cipher_tdes_common.c index 17b8ce40b0..2accb24b0a 100644 --- a/providers/implementations/ciphers/cipher_tdes_common.c +++ b/providers/implementations/ciphers/cipher_tdes_common.c @@ -13,12 +13,12 @@ */ #include "internal/deprecated.h" +#include +#include #include "prov/ciphercommon.h" #include "cipher_tdes.h" -#include #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" void *tdes_newctx(void *provctx, int mode, size_t kbits, size_t blkbits, size_t ivbits, uint64_t flags, const PROV_CIPHER_HW *hw) diff --git a/providers/implementations/ciphers/cipher_tdes_wrap.c b/providers/implementations/ciphers/cipher_tdes_wrap.c index b78a77c254..d42bf78d8e 100644 --- a/providers/implementations/ciphers/cipher_tdes_wrap.c +++ b/providers/implementations/ciphers/cipher_tdes_wrap.c @@ -15,11 +15,11 @@ #include #include +#include #include "cipher_tdes_default.h" #include "crypto/evp.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #define TDES_WRAP_FLAGS PROV_CIPHER_FLAG_CUSTOM_IV diff --git a/providers/implementations/ciphers/ciphercommon.c b/providers/implementations/ciphers/ciphercommon.c index fa73edb473..2e0603ce19 100644 --- a/providers/implementations/ciphers/ciphercommon.c +++ b/providers/implementations/ciphers/ciphercommon.c @@ -13,10 +13,10 @@ /* For SSL3_VERSION */ #include +#include #include "ciphercommon_local.h" #include "prov/provider_ctx.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" /*- * Generic cipher functions for OSSL_PARAM gettables and settables diff --git a/providers/implementations/ciphers/ciphercommon_block.c b/providers/implementations/ciphers/ciphercommon_block.c index 68d5495b77..de375a6327 100644 --- a/providers/implementations/ciphers/ciphercommon_block.c +++ b/providers/implementations/ciphers/ciphercommon_block.c @@ -11,9 +11,9 @@ /* For SSL3_VERSION, TLS1_VERSION etc */ #include #include +#include #include "internal/constant_time.h" #include "ciphercommon_local.h" -#include "prov/providercommonerr.h" /* Functions defined in ssl/tls_pad.c */ int ssl3_cbc_remove_padding_and_mac(size_t *reclen, diff --git a/providers/implementations/ciphers/ciphercommon_ccm.c b/providers/implementations/ciphers/ciphercommon_ccm.c index 0009e9876c..a87bf487e6 100644 --- a/providers/implementations/ciphers/ciphercommon_ccm.c +++ b/providers/implementations/ciphers/ciphercommon_ccm.c @@ -9,10 +9,10 @@ /* Dispatch functions for ccm mode */ +#include #include "prov/ciphercommon.h" #include "prov/ciphercommon_ccm.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" static int ccm_cipher_internal(PROV_CCM_CTX *ctx, unsigned char *out, size_t *padlen, const unsigned char *in, diff --git a/providers/implementations/ciphers/ciphercommon_gcm.c b/providers/implementations/ciphers/ciphercommon_gcm.c index 974a8f6026..8b9d06b0a4 100644 --- a/providers/implementations/ciphers/ciphercommon_gcm.c +++ b/providers/implementations/ciphers/ciphercommon_gcm.c @@ -9,11 +9,11 @@ /* Dispatch functions for gcm mode */ +#include +#include #include "prov/ciphercommon.h" #include "prov/ciphercommon_gcm.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" -#include #include "prov/provider_ctx.h" static int gcm_tls_init(PROV_GCM_CTX *dat, unsigned char *aad, size_t aad_len); diff --git a/providers/implementations/digests/digestcommon.c b/providers/implementations/digests/digestcommon.c index b8e7efde60..cbf32ac2f9 100644 --- a/providers/implementations/digests/digestcommon.c +++ b/providers/implementations/digests/digestcommon.c @@ -7,9 +7,9 @@ * https://www.openssl.org/source/license.html */ -#include "openssl/err.h" +#include +#include #include "prov/digestcommon.h" -#include "prov/providercommonerr.h" int digest_default_get_params(OSSL_PARAM params[], size_t blksz, size_t paramsz, unsigned long flags) diff --git a/providers/implementations/digests/mdc2_prov.c b/providers/implementations/digests/mdc2_prov.c index b184c8393c..8dc1d1af74 100644 --- a/providers/implementations/digests/mdc2_prov.c +++ b/providers/implementations/digests/mdc2_prov.c @@ -18,9 +18,9 @@ #include #include #include +#include #include "prov/digestcommon.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" static OSSL_FUNC_digest_set_ctx_params_fn mdc2_set_ctx_params; static OSSL_FUNC_digest_settable_ctx_params_fn mdc2_settable_ctx_params; diff --git a/providers/implementations/digests/sha3_prov.c b/providers/implementations/digests/sha3_prov.c index 6e731fd842..cd8045f92c 100644 --- a/providers/implementations/digests/sha3_prov.c +++ b/providers/implementations/digests/sha3_prov.c @@ -13,10 +13,10 @@ #include #include #include +#include #include "internal/sha3.h" #include "prov/digestcommon.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #define SHA3_FLAGS PROV_DIGEST_FLAG_ALGID_ABSENT #define SHAKE_FLAGS PROV_DIGEST_FLAG_XOF diff --git a/providers/implementations/encode_decode/decode_der2key.c b/providers/implementations/encode_decode/decode_der2key.c index 6611e808d1..a22e3a6406 100644 --- a/providers/implementations/encode_decode/decode_der2key.c +++ b/providers/implementations/encode_decode/decode_der2key.c @@ -22,6 +22,7 @@ #include /* PEM_BUFSIZE and public PEM functions */ #include #include +#include #include "internal/cryptlib.h" /* ossl_assert() */ #include "internal/asn1.h" #include "crypto/dh.h" @@ -31,7 +32,6 @@ #include "crypto/rsa.h" #include "prov/bio.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "endecoder_local.h" #define SET_ERR_MARK() ERR_set_mark() diff --git a/providers/implementations/encode_decode/decode_pem2der.c b/providers/implementations/encode_decode/decode_pem2der.c index 6c8b108290..cb6ebcefb6 100644 --- a/providers/implementations/encode_decode/decode_pem2der.c +++ b/providers/implementations/encode_decode/decode_pem2der.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "internal/nelem.h" #include "prov/bio.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "endecoder_local.h" static int read_pem(PROV_CTX *provctx, OSSL_CORE_BIO *cin, diff --git a/providers/implementations/encode_decode/encode_key2any.c b/providers/implementations/encode_decode/encode_key2any.c index 7af53cca96..a8c9432f2d 100644 --- a/providers/implementations/encode_decode/encode_key2any.c +++ b/providers/implementations/encode_decode/encode_key2any.c @@ -25,12 +25,12 @@ #include #include #include +#include #include "internal/passphrase.h" #include "internal/cryptlib.h" #include "crypto/ecx.h" #include "crypto/rsa.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "prov/bio.h" #include "prov/provider_ctx.h" #include "prov/der_rsa.h" diff --git a/providers/implementations/encode_decode/encode_key2text.c b/providers/implementations/encode_decode/encode_key2text.c index 21cedbb0dd..05cccdce36 100644 --- a/providers/implementations/encode_decode/encode_key2text.c +++ b/providers/implementations/encode_decode/encode_key2text.c @@ -20,6 +20,7 @@ #include #include #include +#include #include "internal/ffc.h" #include "crypto/bn.h" /* bn_get_words() */ #include "crypto/dh.h" /* dh_get0_params() */ @@ -29,7 +30,6 @@ #include "crypto/rsa.h" /* RSA_PSS_PARAMS_30, etc... */ #include "prov/bio.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "endecoder_local.h" DEFINE_SPECIAL_STACK_OF_CONST(BIGNUM_const, BIGNUM) diff --git a/providers/implementations/exchange/ecx_exch.c b/providers/implementations/exchange/ecx_exch.c index db6aa90c03..3b082ab503 100644 --- a/providers/implementations/exchange/ecx_exch.c +++ b/providers/implementations/exchange/ecx_exch.c @@ -12,11 +12,11 @@ #include #include #include +#include #include "internal/cryptlib.h" #include "crypto/ecx.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #ifdef S390X_EC_ASM # include "s390x_arch.h" #endif 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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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 #include #include +#include #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" diff --git a/providers/implementations/kem/rsa_kem.c b/providers/implementations/kem/rsa_kem.c index 58a223fe42..0007224072 100644 --- a/providers/implementations/kem/rsa_kem.c +++ b/providers/implementations/kem/rsa_kem.c @@ -22,7 +22,7 @@ #include #include #include -#include "prov/providercommonerr.h" +#include #include "prov/provider_ctx.h" #include "prov/implementations.h" #include "prov/securitycheck.h" diff --git a/providers/implementations/keymgmt/ec_kmgmt.c b/providers/implementations/keymgmt/ec_kmgmt.c index 3a58d9e4dc..bb479181c3 100644 --- a/providers/implementations/keymgmt/ec_kmgmt.c +++ b/providers/implementations/keymgmt/ec_kmgmt.c @@ -20,11 +20,11 @@ #include #include #include +#include #include "crypto/bn.h" #include "crypto/ec.h" #include "prov/implementations.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/provider_ctx.h" #include "internal/param_build_set.h" diff --git a/providers/implementations/macs/blake2_mac_impl.c b/providers/implementations/macs/blake2_mac_impl.c index 542595efa1..4f57795500 100644 --- a/providers/implementations/macs/blake2_mac_impl.c +++ b/providers/implementations/macs/blake2_mac_impl.c @@ -10,10 +10,10 @@ #include #include #include +#include #include "prov/blake2.h" #include "internal/cryptlib.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/providercommon.h" diff --git a/providers/implementations/macs/gmac_prov.c b/providers/implementations/macs/gmac_prov.c index fe4d2c3c8a..c9d404d5ea 100644 --- a/providers/implementations/macs/gmac_prov.c +++ b/providers/implementations/macs/gmac_prov.c @@ -14,8 +14,8 @@ #include #include #include +#include -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "prov/provider_util.h" diff --git a/providers/implementations/macs/kmac_prov.c b/providers/implementations/macs/kmac_prov.c index b9a6318e12..8f74c2306a 100644 --- a/providers/implementations/macs/kmac_prov.c +++ b/providers/implementations/macs/kmac_prov.c @@ -53,8 +53,8 @@ #include #include #include +#include -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "prov/provider_util.h" diff --git a/providers/implementations/macs/poly1305_prov.c b/providers/implementations/macs/poly1305_prov.c index a3bc47253c..b029dfefd4 100644 --- a/providers/implementations/macs/poly1305_prov.c +++ b/providers/implementations/macs/poly1305_prov.c @@ -12,10 +12,10 @@ #include #include #include +#include #include "crypto/poly1305.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/providercommon.h" diff --git a/providers/implementations/macs/siphash_prov.c b/providers/implementations/macs/siphash_prov.c index 1a79ae0c6a..f2105a9c46 100644 --- a/providers/implementations/macs/siphash_prov.c +++ b/providers/implementations/macs/siphash_prov.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "crypto/siphash.h" /* @@ -22,7 +23,6 @@ */ #include "../../../crypto/siphash/siphash_local.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/providercommon.h" diff --git a/providers/implementations/rands/drbg.c b/providers/implementations/rands/drbg.c index cc965c9bc0..bdc980ef59 100644 --- a/providers/implementations/rands/drbg.c +++ b/providers/implementations/rands/drbg.c @@ -13,13 +13,13 @@ #include #include #include "crypto/rand.h" +#include #include "drbg_local.h" #include "internal/thread_once.h" #include "crypto/cryptlib.h" #include "prov/seeding.h" #include "crypto/rand_pool.h" #include "prov/provider_ctx.h" -#include "prov/providercommonerr.h" #include "prov/providercommon.h" /* diff --git a/providers/implementations/rands/drbg_ctr.c b/providers/implementations/rands/drbg_ctr.c index 9785c083fe..caf885c4cb 100644 --- a/providers/implementations/rands/drbg_ctr.c +++ b/providers/implementations/rands/drbg_ctr.c @@ -13,12 +13,12 @@ #include #include #include +#include #include "e_os.h" /* strcasecmp */ #include "crypto/modes.h" #include "internal/thread_once.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" -#include "prov/providercommonerr.h" #include "drbg_local.h" static OSSL_FUNC_rand_newctx_fn drbg_ctr_new_wrapper; diff --git a/providers/implementations/rands/drbg_hash.c b/providers/implementations/rands/drbg_hash.c index 57e789099b..9c44c0bdb4 100644 --- a/providers/implementations/rands/drbg_hash.c +++ b/providers/implementations/rands/drbg_hash.c @@ -15,12 +15,12 @@ #include #include #include +#include #include "internal/thread_once.h" #include "prov/providercommon.h" #include "prov/provider_ctx.h" #include "prov/provider_util.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "drbg_local.h" static OSSL_FUNC_rand_newctx_fn drbg_hash_new_wrapper; diff --git a/providers/implementations/rands/drbg_hmac.c b/providers/implementations/rands/drbg_hmac.c index 6311a57a97..314243d8ab 100644 --- a/providers/implementations/rands/drbg_hmac.c +++ b/providers/implementations/rands/drbg_hmac.c @@ -12,10 +12,10 @@ #include #include #include +#include #include "prov/provider_util.h" #include "internal/thread_once.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "drbg_local.h" diff --git a/providers/implementations/rands/seed_src.c b/providers/implementations/rands/seed_src.c index 0a533d016f..60088b2779 100644 --- a/providers/implementations/rands/seed_src.c +++ b/providers/implementations/rands/seed_src.c @@ -16,9 +16,9 @@ #include #include #include +#include #include "prov/implementations.h" #include "prov/provider_ctx.h" -#include "prov/providercommonerr.h" #include "crypto/rand.h" #include "crypto/rand_pool.h" diff --git a/providers/implementations/signature/dsa.c b/providers/implementations/signature/dsa.c index 515845c56c..be1a8fca3f 100644 --- a/providers/implementations/signature/dsa.c +++ b/providers/implementations/signature/dsa.c @@ -23,12 +23,12 @@ #include #include #include +#include #include "internal/nelem.h" #include "internal/sizes.h" #include "internal/cryptlib.h" #include "prov/providercommon.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "prov/provider_ctx.h" #include "prov/securitycheck.h" #include "crypto/dsa.h" diff --git a/providers/implementations/signature/ecdsa.c b/providers/implementations/signature/ecdsa.c index e8e8e8d143..ed21ac79c3 100644 --- a/providers/implementations/signature/ecdsa.c +++ b/providers/implementations/signature/ecdsa.c @@ -21,11 +21,11 @@ #include #include #include +#include #include "internal/nelem.h" #include "internal/sizes.h" #include "internal/cryptlib.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "prov/securitycheck.h" diff --git a/providers/implementations/signature/eddsa.c b/providers/implementations/signature/eddsa.c index 57c37096ef..0409ed1892 100644 --- a/providers/implementations/signature/eddsa.c +++ b/providers/implementations/signature/eddsa.c @@ -14,11 +14,11 @@ #include #include #include +#include #include "internal/nelem.h" #include "internal/sizes.h" #include "prov/providercommon.h" #include "prov/implementations.h" -#include "prov/providercommonerr.h" #include "prov/provider_ctx.h" #include "prov/der_ecx.h" #include "crypto/ecx.h" diff --git a/providers/implementations/signature/rsa.c b/providers/implementations/signature/rsa.c index e61d8ab04e..09b33bbdb7 100644 --- a/providers/implementations/signature/rsa.c +++ b/providers/implementations/signature/rsa.c @@ -22,12 +22,12 @@ #include #include #include +#include #include "internal/cryptlib.h" #include "internal/nelem.h" #include "internal/sizes.h" #include "crypto/rsa.h" #include "prov/providercommon.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "prov/der_rsa.h" diff --git a/providers/implementations/signature/sm2sig.c b/providers/implementations/signature/sm2sig.c index 45fd70ef40..a3709ff074 100644 --- a/providers/implementations/signature/sm2sig.c +++ b/providers/implementations/signature/sm2sig.c @@ -21,10 +21,10 @@ #include #include #include +#include #include "internal/nelem.h" #include "internal/sizes.h" #include "internal/cryptlib.h" -#include "prov/providercommonerr.h" #include "prov/implementations.h" #include "prov/provider_ctx.h" #include "crypto/ec.h" diff --git a/providers/implementations/storemgmt/file_store.c b/providers/implementations/storemgmt/file_store.c index 7f4dadbc28..a5edc53506 100644 --- a/providers/implementations/storemgmt/file_store.c +++ b/providers/implementations/storemgmt/file_store.c @@ -24,6 +24,7 @@ #include #include #include /* The OSSL_STORE_INFO type numbers */ +#include #include "internal/cryptlib.h" #include "internal/o_dir.h" #include "crypto/pem.h" /* For PVK and "blob" PEM headers */ @@ -31,7 +32,6 @@ #include "prov/implementations.h" #include "prov/bio.h" #include "prov/provider_ctx.h" -#include "prov/providercommonerr.h" #include "file_store_local.h" DEFINE_STACK_OF(OSSL_STORE_INFO) -- cgit v1.2.3