generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make no-ec2m work again (backport from HEAD).

Browse Source
This commit is contained in:
Dr. Stephen Henson 2011-06-06 13:00:30 +00:00
parent 69e2ec63c5
commit c090562828
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
crypto/ec/ec_oct.c
View File

@ -88,8 +88,15 @@ int EC_POINT_set_compressed_coordinates_GFp(const EC_GROUP *group, EC_POINT *poi
return ec_GFp_simple_set_compressed_coordinates( return ec_GFp_simple_set_compressed_coordinates(
group, point, x, y_bit, ctx); group, point, x, y_bit, ctx);
else else
#ifdef OPENSSL_NO_EC2M
{
ECerr(EC_F_EC_POINT_SET_COMPRESSED_COORDINATES_GFP, EC_R_GF2M_NOT_SUPPORTED);
return 0;
}
#else
return ec_GF2m_simple_set_compressed_coordinates( return ec_GF2m_simple_set_compressed_coordinates(
group, point, x, y_bit, ctx); group, point, x, y_bit, ctx);
#endif
} }
return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx); return group->meth->point_set_compressed_coordinates(group, point, x, y_bit, ctx);
} }
@ -142,8 +149,15 @@ size_t EC_POINT_point2oct(const EC_GROUP *group, const EC_POINT *point, point_co
return ec_GFp_simple_point2oct(group, point, return ec_GFp_simple_point2oct(group, point,
form, buf, len, ctx); form, buf, len, ctx);
else else
#ifdef OPENSSL_NO_EC2M
{
ECerr(EC_F_EC_POINT_POINT2OCT, EC_R_GF2M_NOT_SUPPORTED);
return 0;
}
#else
return ec_GF2m_simple_point2oct(group, point, return ec_GF2m_simple_point2oct(group, point,
form, buf, len, ctx); form, buf, len, ctx);
#endif
} }
return group->meth->point2oct(group, point, form, buf, len, ctx); return group->meth->point2oct(group, point, form, buf, len, ctx);
@ -170,8 +184,15 @@ int EC_POINT_oct2point(const EC_GROUP *group, EC_POINT *point,
return ec_GFp_simple_oct2point(group, point, return ec_GFp_simple_oct2point(group, point,
buf, len, ctx); buf, len, ctx);
else else
#ifdef OPENSSL_NO_EC2M
{
ECerr(EC_F_EC_POINT_OCT2POINT, EC_R_GF2M_NOT_SUPPORTED);
return 0;
}
#else
return ec_GF2m_simple_oct2point(group, point, return ec_GF2m_simple_oct2point(group, point,
buf, len, ctx); buf, len, ctx);
#endif
} }
return group->meth->oct2point(group, point, buf, len, ctx); return group->meth->oct2point(group, point, buf, len, ctx);
} }