#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/crypto/ecdsa/ecs_ossl.c b/jni/openssl/crypto/ecdsa/ecs_ossl.c
index 7725935..1bbf328 100644
--- a/jni/openssl/crypto/ecdsa/ecs_ossl.c
+++ b/jni/openssl/crypto/ecdsa/ecs_ossl.c
@@ -167,7 +167,6 @@
goto err;
}
}
-#ifndef OPENSSL_NO_EC2M
else /* NID_X9_62_characteristic_two_field */
{
if (!EC_POINT_get_affine_coordinates_GF2m(group,
@@ -177,7 +176,6 @@
goto err;
}
}
-#endif
if (!BN_nnmod(r, X, order, ctx))
{
ECDSAerr(ECDSA_F_ECDSA_SIGN_SETUP, ERR_R_BN_LIB);
@@ -456,7 +454,6 @@
goto err;
}
}
-#ifndef OPENSSL_NO_EC2M
else /* NID_X9_62_characteristic_two_field */
{
if (!EC_POINT_get_affine_coordinates_GF2m(group,
@@ -466,7 +463,7 @@
goto err;
}
}
-#endif
+
if (!BN_nnmod(u1, X, order, ctx))
{
ECDSAerr(ECDSA_F_ECDSA_DO_VERIFY, ERR_R_BN_LIB);