summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Langley <agl@google.com>2015-04-20 10:49:33 -0700
committerKenny Root <kroot@google.com>2015-04-20 18:10:40 +0000
commit830beae6ebcc7761769f86a354a2d3d5fdc54507 (patch)
tree49fc24502a91b51bf9d21b3aeb60a43b7bb0f26b
parenteef60be96fb91dc632a18173b4a4f21e9813aba7 (diff)
downloadexternal_boringssl-830beae6ebcc7761769f86a354a2d3d5fdc54507.zip
external_boringssl-830beae6ebcc7761769f86a354a2d3d5fdc54507.tar.gz
external_boringssl-830beae6ebcc7761769f86a354a2d3d5fdc54507.tar.bz2
external/boringssl: add dummy EC_GROUP_set_point_conversion_form.
BoringSSL always uses uncompressed points. This function aborts if another form is requested or does nothing if uncompressed points are requested. Bug: 20419899 Change-Id: Ib5d0707c4e9eaee67e46a0d73d41be70ce0a9353
-rw-r--r--src/crypto/ec/ec.c7
-rw-r--r--src/include/openssl/ec.h5
2 files changed, 12 insertions, 0 deletions
diff --git a/src/crypto/ec/ec.c b/src/crypto/ec/ec.c
index 7d16f2c..6e676c9 100644
--- a/src/crypto/ec/ec.c
+++ b/src/crypto/ec/ec.c
@@ -863,3 +863,10 @@ const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group) {
int EC_METHOD_get_field_type(const EC_METHOD *meth) {
return NID_X9_62_prime_field;
}
+
+void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
+ point_conversion_form_t form) {
+ if (form != POINT_CONVERSION_UNCOMPRESSED) {
+ abort();
+ }
+}
diff --git a/src/include/openssl/ec.h b/src/include/openssl/ec.h
index d266653..36a3a29 100644
--- a/src/include/openssl/ec.h
+++ b/src/include/openssl/ec.h
@@ -303,6 +303,11 @@ OPENSSL_EXPORT const EC_METHOD *EC_GROUP_method_of(const EC_GROUP *group);
/* EC_METHOD_get_field_type returns NID_X9_62_prime_field. */
OPENSSL_EXPORT int EC_METHOD_get_field_type(const EC_METHOD *meth);
+/* EC_GROUP_set_point_conversion_form aborts the process if |form| is not
+ * |POINT_CONVERSION_UNCOMPRESSED| and otherwise does nothing. */
+void EC_GROUP_set_point_conversion_form(EC_GROUP *group,
+ point_conversion_form_t form);
+
/* Old code expects to get EC_KEY from ec.h. */
#if !defined(OPENSSL_HEADER_EC_KEY_H)