commit 134dc92d41bc3d29481f0721bddee1444a17350f
author Adam Langley <agl@google.com> Mon Jun 29 16:02:33 2015 -0700
committer Adam Langley <agl@google.com> Mon Jun 29 16:04:59 2015 -0700
tree 948f60ea1aae971524ce7a432c92e9cc51e3d131
parent 5429f72d9c1e7bc6379e917e9b9116f1b0292b28

external/conscrypt: control binary-field EC with OPENSSL_NO_EC2M.

OpenSSL supports many feature #defines to disable things. One of them is
OPENSSL_NO_EC2M, which BoringSSL also defines because it doesn't support
binary fields.

This change alters the guard around the binary-field call to check
OPENSSL_NO_EC2M rather than OPENSSL_IS_BORINGSSL. This is a no-op for
BoringSSL because it already defines both, but it'll allow OpenSSL built
without binary-field code to function too.

Change-Id: I46b74827ad6b2a43799ef62baf2832645e4865b4

src/main/native/org_conscrypt_NativeCrypto.cpp

diff --git a/src/main/native/org_conscrypt_NativeCrypto.cpp b/src/main/native/org_conscrypt_NativeCrypto.cpp
index db51ea6..f7efd92 100644
--- a/src/main/native/org_conscrypt_NativeCrypto.cpp
+++ b/src/main/native/org_conscrypt_NativeCrypto.cpp
@@ -3899,7 +3899,7 @@
     case EC_CURVE_GFP:
         ret = EC_POINT_set_affine_coordinates_GFp(group, point, x.get(), y.get(), NULL);
         break;
-#if !defined(OPENSSL_IS_BORINGSSL)
+#if !defined(OPENSSL_NO_EC2M)
     case EC_CURVE_GF2M:
         ret = EC_POINT_set_affine_coordinates_GF2m(group, point, x.get(), y.get(), NULL);
         break;