diff options
| author | Rich Salz <rsalz@akamai.com> | 2021-05-04 12:05:54 -0400 |
|---|---|---|
| committer | Pauli <pauli@openssl.org> | 2021-05-06 09:54:37 +1000 |
| commit | 08a337fac6d56a3b9419f4fbf9a19af958c9c2a1 (patch) | |
| tree | da4d47fe73eab089d8277365f333e2fc14cc8ace /include | |
| parent | a07b0bfb99169d23d2801b8aee210d98a0d12cac (diff) | |
Remove all trace of FIPS_mode functions
Removed error codes, and the mention of the functions.
This removal is already documented in the CHANGES doc.
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre@ncp-e.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/15140)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/cryptoerr.h | 1 | ||||
| -rw-r--r-- | include/openssl/cryptoerr_legacy.h | 1 | ||||
| -rw-r--r-- | include/openssl/evperr.h | 3 | ||||
| -rw-r--r-- | include/openssl/sslerr.h | 1 |
4 files changed, 0 insertions, 6 deletions
diff --git a/include/openssl/cryptoerr.h b/include/openssl/cryptoerr.h index 8db3064ce2..6799668089 100644 --- a/include/openssl/cryptoerr.h +++ b/include/openssl/cryptoerr.h @@ -23,7 +23,6 @@ */ # define CRYPTO_R_BAD_ALGORITHM_NAME 117 # define CRYPTO_R_CONFLICTING_NAMES 118 -# define CRYPTO_R_FIPS_MODE_NOT_SUPPORTED 101 # define CRYPTO_R_HEX_STRING_TOO_SHORT 121 # define CRYPTO_R_ILLEGAL_HEX_DIGIT 102 # define CRYPTO_R_INSUFFICIENT_DATA_SPACE 106 diff --git a/include/openssl/cryptoerr_legacy.h b/include/openssl/cryptoerr_legacy.h index 6b78c5624c..ccab33a5d4 100644 --- a/include/openssl/cryptoerr_legacy.h +++ b/include/openssl/cryptoerr_legacy.h @@ -463,7 +463,6 @@ OSSL_DEPRECATEDIN_3_0 int ERR_load_X509V3_strings(void); # define CRYPTO_F_CRYPTO_OCB128_COPY_CTX 0 # define CRYPTO_F_CRYPTO_OCB128_INIT 0 # define CRYPTO_F_CRYPTO_SET_EX_DATA 0 -# define CRYPTO_F_FIPS_MODE_SET 0 # define CRYPTO_F_GET_AND_LOCK 0 # define CRYPTO_F_OPENSSL_ATEXIT 0 # define CRYPTO_F_OPENSSL_BUF2HEXSTR 0 diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index ffa8bacd5b..a5053f6cd2 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -44,7 +44,6 @@ # define EVP_R_DIFFERENT_KEY_TYPES 101 # define EVP_R_DIFFERENT_PARAMETERS 153 # define EVP_R_ERROR_LOADING_SECTION 165 -# define EVP_R_ERROR_SETTING_FIPS_MODE 166 # define EVP_R_EXPECTING_AN_HMAC_KEY 174 # define EVP_R_EXPECTING_AN_RSA_KEY 127 # define EVP_R_EXPECTING_A_DH_KEY 128 @@ -54,7 +53,6 @@ # define EVP_R_EXPECTING_A_POLY1305_KEY 164 # define EVP_R_EXPECTING_A_SIPHASH_KEY 175 # define EVP_R_FINAL_ERROR 188 -# define EVP_R_FIPS_MODE_NOT_SUPPORTED 167 # define EVP_R_GENERATE_ERROR 214 # define EVP_R_GET_RAW_KEY_FAILED 182 # define EVP_R_ILLEGAL_SCRYPT_PARAMETERS 171 @@ -64,7 +62,6 @@ # define EVP_R_INPUT_NOT_INITIALIZED 111 # define EVP_R_INVALID_CUSTOM_LENGTH 185 # define EVP_R_INVALID_DIGEST 152 -# define EVP_R_INVALID_FIPS_MODE 168 # define EVP_R_INVALID_IV_LENGTH 194 # define EVP_R_INVALID_KEY 163 # define EVP_R_INVALID_KEY_LENGTH 130 diff --git a/include/openssl/sslerr.h b/include/openssl/sslerr.h index 30d843cf2d..87aa4f0d00 100644 --- a/include/openssl/sslerr.h +++ b/include/openssl/sslerr.h @@ -24,7 +24,6 @@ # define SSL_R_APPLICATION_DATA_AFTER_CLOSE_NOTIFY 291 # define SSL_R_APP_DATA_IN_HANDSHAKE 100 # define SSL_R_ATTEMPT_TO_REUSE_SESSION_IN_DIFFERENT_CONTEXT 272 -# define SSL_R_AT_LEAST_TLS_1_0_NEEDED_IN_FIPS_MODE 143 # define SSL_R_AT_LEAST_TLS_1_2_NEEDED_IN_SUITEB_MODE 158 # define SSL_R_BAD_CHANGE_CIPHER_SPEC 103 # define SSL_R_BAD_CIPHER 186 |