Skip to content

Commit 729648f

Browse files
davidbenBoringssl LUCI CQ
authored andcommitted
Rename EVP_R_EXPECTING_AN_EC_KEY_KEY to match OpenSSL
EC_KEY_KEY looks very silly. In OpenSSL, this is EVP_R_EXPECTING_A_EC_KEY. It's a little odd that they say "a EC key" instead of "an EC key", but ah well. (They do say "an RSA key".) May as well match. Update-Note: Code search finds no references to the BoringSSL name, so this is not expected to impact anything. Change-Id: I7563645fd269e4a62fbc46de2647f06bde00e1e4 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/81428 Auto-Submit: David Benjamin <davidben@google.com> Commit-Queue: Lily Chen <chlily@google.com> Commit-Queue: David Benjamin <davidben@google.com> Reviewed-by: Lily Chen <chlily@google.com>
1 parent 716f066 commit 729648f

4 files changed

Lines changed: 499 additions & 499 deletions

File tree

crypto/err/evp.errordata

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ EVP,103,DIFFERENT_KEY_TYPES
55
EVP,104,DIFFERENT_PARAMETERS
66
EVP,136,EMPTY_PSK
77
EVP,105,ENCODE_ERROR
8-
EVP,106,EXPECTING_AN_EC_KEY_KEY
98
EVP,107,EXPECTING_AN_RSA_KEY
109
EVP,138,EXPECTING_A_DH_KEY
1110
EVP,108,EXPECTING_A_DSA_KEY
11+
EVP,106,EXPECTING_A_EC_KEY
1212
EVP,109,ILLEGAL_OR_UNSUPPORTED_PADDING_MODE
1313
EVP,137,INVALID_BUFFER_SIZE
1414
EVP,110,INVALID_DIGEST_LENGTH

crypto/evp/p_ec_asn1.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ int EVP_PKEY_assign_EC_KEY(EVP_PKEY *pkey, EC_KEY *key) {
272272

273273
EC_KEY *EVP_PKEY_get0_EC_KEY(const EVP_PKEY *pkey) {
274274
if (EVP_PKEY_id(pkey) != EVP_PKEY_EC) {
275-
OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_AN_EC_KEY_KEY);
275+
OPENSSL_PUT_ERROR(EVP, EVP_R_EXPECTING_A_EC_KEY);
276276
return NULL;
277277
}
278278
return reinterpret_cast<EC_KEY *>(pkey->pkey);

0 commit comments

Comments
 (0)