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

Add the CTX parameter back to EC_GROUP_cmp.

Browse Source 
It was a mistake to remove this in the first place.

Change-Id: Icd97b4db01e49151daa41dd892f9da573ddc2842
Reviewed-on: https://boringssl-review.googlesource.com/3541
Reviewed-by: David Benjamin <davidben@chromium.org>
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Adam Langley 2015-02-13 10:47:56 -08:00 committed by Adam Langley
parent d3a73360fa
commit 93531bd70f
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/ec/ec.c
View File

@ -499,7 +499,7 @@ err:
} }
} }
int EC_GROUP_cmp(const EC_GROUP *a, const EC_GROUP *b) { 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) { if (a->curve_name == NID_undef || b->curve_name == NID_undef) {
return 0; return 0;
} }

2
crypto/evp/p_ec_asn1.c
View File

@ -382,7 +382,7 @@ 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); return EC_GROUP_cmp(group_a, group_b, NULL);
} }
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); }

3
include/openssl/ec.h
View File

@ -117,7 +117,8 @@ 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 one if |a| and |b| are the same group and 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);
/* EC_GROUP_get0_generator returns a pointer to the internal |EC_POINT| object /* EC_GROUP_get0_generator returns a pointer to the internal |EC_POINT| object
* in |group| that specifies the generator for the group. */ * in |group| that specifies the generator for the group. */