Cleanup OPENSSL_NO_xxx, part 1

[oweals/openssl.git] / crypto / ec / ec2_oct.c

diff --git a/crypto/ec/ec2_oct.c b/crypto/ec/ec2_oct.c
index f1d75e5ddf66a126b9afd9096f94e056048bde57..4788a1ea9d30679383c2adbcd3de11b990142ea9 100644 (file)
--- a/crypto/ec/ec2_oct.c
+++ b/crypto/ec/ec2_oct.c
@@ -73,7 +73,8 @@
 
 #ifndef OPENSSL_NO_EC2M
 
-/* Calculates and sets the affine coordinates of an EC_POINT from the given
+/*-
+ * Calculates and sets the affine coordinates of an EC_POINT from the given
  * compressed coordinates.  Uses algorithm 2.3.4 of SEC 1. 
  * Note that the simple implementation only uses affine coordinates.
  *
@@ -117,13 +118,13 @@ int ec_GF2m_simple_set_compressed_coordinates(const EC_GROUP *group, EC_POINT *p
        if (!BN_GF2m_mod_arr(x, x_, group->poly)) goto err;
        if (BN_is_zero(x))
                {
-               if (!BN_GF2m_mod_sqrt_arr(y, &group->b, group->poly, ctx)) goto err;
+               if (!BN_GF2m_mod_sqrt_arr(y, group->b, group->poly, ctx)) goto err;
                }
        else
                {
                if (!group->meth->field_sqr(group, tmp, x, ctx)) goto err;
-               if (!group->meth->field_div(group, tmp, &group->b, tmp, ctx)) goto err;
-               if (!BN_GF2m_add(tmp, &group->a, tmp)) goto err;
+               if (!group->meth->field_div(group, tmp, group->b, tmp, ctx)) goto err;
+               if (!BN_GF2m_add(tmp, group->a, tmp)) goto err;
                if (!BN_GF2m_add(tmp, x, tmp)) goto err;
                if (!BN_GF2m_mod_solve_quad_arr(z, tmp, group->poly, ctx))
                        {
@@ -359,7 +360,7 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
        if (yxi == NULL) goto err;
 
        if (!BN_bin2bn(buf + 1, field_len, x)) goto err;
-       if (BN_ucmp(x, &group->field) >= 0)
+       if (BN_ucmp(x, group->field) >= 0)
                {
                ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
                goto err;
@@ -372,7 +373,7 @@ int ec_GF2m_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
        else
                {
                if (!BN_bin2bn(buf + 1 + field_len, field_len, y)) goto err;
-               if (BN_ucmp(y, &group->field) >= 0)
+               if (BN_ucmp(y, group->field) >= 0)
                        {
                        ECerr(EC_F_EC_GF2M_SIMPLE_OCT2POINT, EC_R_INVALID_ENCODING);
                        goto err;