a2f2bc3a40
I messed up a few of these. ASN1_R_UNSUPPORTED_ALGORITHM doesn't exist. X509_R_UNSUPPORTED_ALGORITHM does exist as part of X509_PUBKEY_set, but the SPKI parser doesn't emit this. (I don't mind the legacy code having really weird errors, but since EVP is now limited to things we like, let's try to keep that clean.) To avoid churn in Conscrypt, we'll keep defining X509_R_UNSUPPORTED_ALGORITHM, but not actually do anything with it anymore. Conscrypt was already aware of EVP_R_UNSUPPORTED_ALGORITHM, so this should be fine. (I don't expect EVP_R_UNSUPPORTED_ALGORITHM to go away. The SPKI parsers we like live in EVP now.) A few other ASN1_R_* values didn't quite match upstream, so make those match again. Finally, I got some of the rsa_pss.c values wrong. Each of those corresponds to an (overly specific) RSA_R_* value in upstream. However, those were gone in BoringSSL since even the initial commit. We placed the RSA <-> EVP glue in crypto/evp (so crypto/rsa wouldn't depend on crypto/evp) while upstream placed them in crypto/rsa. Since no one seemed to notice the loss of RSA_R_INVALID_SALT_LENGTH, let's undo all the cross-module errors inserted in crypto/rsa. Instead, since that kind of specificity is not useful, funnel it all into X509_R_INVALID_PSS_PARAMETERS (formerly EVP_R_INVALID_PSS_PARAMETERS, formerly RSA_R_INVALID_PSS_PARAMETERS). Reset the error codes for all affected modules. (That our error code story means error codes are not stable across this kind of refactoring is kind of a problem. Hopefully this will be the last of it.) Change-Id: Ibfb3a0ac340bfc777bc7de6980ef3ddf0a8c84bc Reviewed-on: https://boringssl-review.googlesource.com/7458 Reviewed-by: Emily Stark (Dunn) <estark@google.com> Reviewed-by: David Benjamin <davidben@google.com>
36 lines
975 B
Plaintext
36 lines
975 B
Plaintext
X509,100,AKID_MISMATCH
|
|
X509,101,BAD_PKCS7_VERSION
|
|
X509,102,BAD_X509_FILETYPE
|
|
X509,103,BASE64_DECODE_ERROR
|
|
X509,104,CANT_CHECK_DH_KEY
|
|
X509,105,CERT_ALREADY_IN_HASH_TABLE
|
|
X509,106,CRL_ALREADY_DELTA
|
|
X509,107,CRL_VERIFY_FAILURE
|
|
X509,108,IDP_MISMATCH
|
|
X509,109,INVALID_BIT_STRING_BITS_LEFT
|
|
X509,110,INVALID_DIRECTORY
|
|
X509,111,INVALID_FIELD_NAME
|
|
X509,112,INVALID_PSS_PARAMETERS
|
|
X509,113,INVALID_TRUST
|
|
X509,114,ISSUER_MISMATCH
|
|
X509,115,KEY_TYPE_MISMATCH
|
|
X509,116,KEY_VALUES_MISMATCH
|
|
X509,117,LOADING_CERT_DIR
|
|
X509,118,LOADING_DEFAULTS
|
|
X509,119,NEWER_CRL_NOT_NEWER
|
|
X509,120,NOT_PKCS7_SIGNED_DATA
|
|
X509,121,NO_CERTIFICATES_INCLUDED
|
|
X509,122,NO_CERT_SET_FOR_US_TO_VERIFY
|
|
X509,123,NO_CRLS_INCLUDED
|
|
X509,124,NO_CRL_NUMBER
|
|
X509,125,PUBLIC_KEY_DECODE_ERROR
|
|
X509,126,PUBLIC_KEY_ENCODE_ERROR
|
|
X509,127,SHOULD_RETRY
|
|
X509,128,UNKNOWN_KEY_TYPE
|
|
X509,129,UNKNOWN_NID
|
|
X509,130,UNKNOWN_PURPOSE_ID
|
|
X509,131,UNKNOWN_TRUST_ID
|
|
X509,132,UNSUPPORTED_ALGORITHM
|
|
X509,133,WRONG_LOOKUP_TYPE
|
|
X509,134,WRONG_TYPE
|