diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-16 12:52:09 +0200 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-09-24 14:34:56 +0200 |
| commit | 29844ea5b3d2b7240d99b043a0d82cb177f0762d (patch) | |
| tree | 1cb0954dd516bb5a640876fa64d59ff6fe53d51d /include | |
| parent | 50eb2a507732b4d32879709dbfa335ccb542f676 (diff) | |
Prune low-level ASN.1 parse errors from error queue in decoder_process()
Fixes #12840
Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/12893)
Diffstat (limited to 'include')
| -rw-r--r-- | include/openssl/ecerr.h | 2 | ||||
| -rw-r--r-- | include/openssl/evperr.h | 1 | ||||
| -rw-r--r-- | include/openssl/pkcs12err.h | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/include/openssl/ecerr.h b/include/openssl/ecerr.h index bbed2b4b7c..60677d8560 100644 --- a/include/openssl/ecerr.h +++ b/include/openssl/ecerr.h @@ -233,7 +233,6 @@ int ERR_load_EC_strings(void); # define EC_R_CURVE_DOES_NOT_SUPPORT_ECDH 160 # define EC_R_CURVE_DOES_NOT_SUPPORT_ECDSA 170 # define EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING 159 -# define EC_R_D2I_ECPKPARAMETERS_FAILURE 117 # define EC_R_DECODE_ERROR 142 # define EC_R_DISCRIMINANT_IS_ZERO 118 # define EC_R_EC_GROUP_NEW_BY_NAME_FAILURE 119 @@ -283,7 +282,6 @@ int ERR_load_EC_strings(void); # define EC_R_OPERATION_NOT_SUPPORTED 152 # define EC_R_PASSED_NULL_PARAMETER 134 # define EC_R_PEER_KEY_ERROR 149 -# define EC_R_PKPARAMETERS2GROUP_FAILURE 127 # define EC_R_POINT_ARITHMETIC_FAILURE 155 # define EC_R_POINT_AT_INFINITY 106 # define EC_R_POINT_COORDINATES_BLIND_FAILURE 163 diff --git a/include/openssl/evperr.h b/include/openssl/evperr.h index ef74c10243..1a3f5b6fbd 100644 --- a/include/openssl/evperr.h +++ b/include/openssl/evperr.h @@ -214,7 +214,6 @@ int ERR_load_EVP_strings(void); # define EVP_R_INVALID_SECRET_LENGTH 223 # define EVP_R_INVALID_SEED_LENGTH 220 # define EVP_R_INVALID_VALUE 222 -# define EVP_R_KEYGEN_FAILURE 120 # define EVP_R_KEYMGMT_EXPORT_FAILURE 205 # define EVP_R_KEY_SETUP_FAILED 180 # define EVP_R_LOCKING_NOT_SUPPORTED 213 diff --git a/include/openssl/pkcs12err.h b/include/openssl/pkcs12err.h index 0a3f42bd62..60369447de 100644 --- a/include/openssl/pkcs12err.h +++ b/include/openssl/pkcs12err.h @@ -77,9 +77,7 @@ int ERR_load_PKCS12_strings(void); # define PKCS12_R_MAC_STRING_SET_ERROR 111 # define PKCS12_R_MAC_VERIFY_FAILURE 113 # define PKCS12_R_PARSE_ERROR 114 -# define PKCS12_R_PKCS12_ALGOR_CIPHERINIT_ERROR 115 # define PKCS12_R_PKCS12_CIPHERFINAL_ERROR 116 -# define PKCS12_R_PKCS12_PBE_CRYPT_ERROR 117 # define PKCS12_R_UNKNOWN_DIGEST_ALGORITHM 118 # define PKCS12_R_UNSUPPORTED_PKCS12_MODE 119 |