kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

EC_GROUP_cmp should return zero if the groups match.

Browse Source 
(I got this wrong when reading the OpenSSL code.)

Change-Id: Ib289ef41d0ab5a3157ad8b9454d2de96d1f86c22
Reviewed-on: https://boringssl-review.googlesource.com/3620
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2015-02-24 14:30:15 -08:00
parent 3ce3c369cb
commit 7c21925a10
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crypto/ec/ec.c
View File

@ -500,10 +500,9 @@ err:
} }
int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ignored) { int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, BN_CTX *ignored) {
if (a->curve_name == NID_undef || b->curve_name == NID_undef) { return a->curve_name == NID_undef ||
return 0; b->curve_name == NID_undef ||
} a->curve_name != b->curve_name;
return a->curve_name == b->curve_name;
} }
const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group) { const EC_POINT *EC_GROUP_get0_generator(const EC_GROUP *group) {

6
crypto/evp/p_ec_asn1.c
View File

@ -382,7 +382,11 @@ static int ec_copy_parameters(EVP_PKEY *to, const EVP_PKEY *from) {
static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) { static int ec_cmp_parameters(const EVP_PKEY *a, const EVP_PKEY *b) {
const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec), const EC_GROUP *group_a = EC_KEY_get0_group(a->pkey.ec),
*group_b = EC_KEY_get0_group(b->pkey.ec); *group_b = EC_KEY_get0_group(b->pkey.ec);
return EC_GROUP_cmp(group_a, group_b, NULL); if (EC_GROUP_cmp(group_a, group_b, NULL) != 0) {
/* mismatch */
return 0;
}
return 1;
} }
static void int_ec_free(EVP_PKEY *pkey) { EC_KEY_free(pkey->pkey.ec); } static void int_ec_free(EVP_PKEY *pkey) { EC_KEY_free(pkey->pkey.ec); }

2
include/openssl/ec.h
View File

@ -115,7 +115,7 @@ OPENSSL_EXPORT int EC_GROUP_copy(EC_GROUP *dest, const EC_GROUP *src);
* error. */ * error. */
OPENSSL_EXPORT EC_GROUP *EC_GROUP_dup(const EC_GROUP *a); OPENSSL_EXPORT EC_GROUP *EC_GROUP_dup(const EC_GROUP *a);
/* EC_GROUP_cmp returns one if |a| and |b| are the same group and zero /* EC_GROUP_cmp returns zero if |a| and |b| are the same group and non-zero
* otherwise. */ * otherwise. */
OPENSSL_EXPORT int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b, OPENSSL_EXPORT int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b,
BN_CTX *ignored); BN_CTX *ignored);