diff options
| author | Adam Langley <agl@chromium.org> | 2015-02-13 21:47:56 +0300 |
|---|---|---|
| committer | Adam Langley <agl@google.com> | 2015-02-21 02:33:55 +0300 |
| commit | 93531bd70f48bc63ad7d4aedf32d69c8095170bd (patch) | |
| tree | e73db7eefb6c344061c7b956d38567e832fdd19e | |
| parent | d3a73360fa9021b1b906f4cf02849061a7f8b286 (diff) | |
Add the CTX parameter back to EC_GROUP_cmp.
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>
| -rw-r--r-- | crypto/ec/ec.c | 2 | ||||
| -rw-r--r-- | crypto/evp/p_ec_asn1.c | 2 | ||||
| -rw-r--r-- | include/openssl/ec.h | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/crypto/ec/ec.c b/crypto/ec/ec.c index 30f93461..21a39405 100644 --- a/crypto/ec/ec.c +++ b/crypto/ec/ec.c @@ -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) { return 0; } diff --git a/crypto/evp/p_ec_asn1.c b/crypto/evp/p_ec_asn1.c index d2d67921..8967b502 100644 --- a/crypto/evp/p_ec_asn1.c +++ b/crypto/evp/p_ec_asn1.c @@ -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) { const EC_GROUP *group_a = EC_KEY_get0_group(a->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); } diff --git a/include/openssl/ec.h b/include/openssl/ec.h index 73bfc416..c952d9a9 100644 --- a/include/openssl/ec.h +++ b/include/openssl/ec.h @@ -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 * 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 * in |group| that specifies the generator for the group. */ |