summaryrefslogtreecommitdiffstats
path: root/src/crypto/ec/ec.c
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-06-12 16:28:27 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-06-12 16:28:27 +0000
commit9701a2fbe20a18d08253e84e8ec39d94db5376e0 (patch)
tree26c038b10145f502cb98f5675516a7ed6bd27fdb /src/crypto/ec/ec.c
parent82ea518198c8ce74418c90597ccf8f444d1154ab (diff)
parent53b272a2813a0b11f107d77100ff8805ada8fbd2 (diff)
downloadexternal_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.zip
external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.tar.gz
external_boringssl-9701a2fbe20a18d08253e84e8ec39d94db5376e0.tar.bz2
am 53b272a2: Bump revision of BoringSSL.
* commit '53b272a2813a0b11f107d77100ff8805ada8fbd2': Bump revision of BoringSSL.
Diffstat (limited to 'src/crypto/ec/ec.c')
-rw-r--r--src/crypto/ec/ec.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/crypto/ec/ec.c b/src/crypto/ec/ec.c
index 5e30730..f38eba6 100644
--- a/src/crypto/ec/ec.c
+++ b/src/crypto/ec/ec.c
@@ -289,6 +289,12 @@ EC_GROUP *EC_GROUP_new_curve_GFp(const BIGNUM *p, const BIGNUM *a,
int EC_GROUP_set_generator(EC_GROUP *group, const EC_POINT *generator,
const BIGNUM *order, const BIGNUM *cofactor) {
+ if (group->curve_name != NID_undef) {
+ /* |EC_GROUP_set_generator| should only be used with |EC_GROUP|s returned
+ * by |EC_GROUP_new_curve_GFp|. */
+ return 0;
+ }
+
if (group->generator == NULL) {
group->generator = EC_POINT_new(group);
if (group->generator == NULL) {