kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove ec hybrid point format

Browse Source 
According to rfc5480 and rfc4492 the hybrid format is not allowed
neither in certificates or the tls protocol.

Change-Id: I1d3fb5bef765bc7b58d29bdd60e15247fac4dc7a
Reviewed-on: https://boringssl-review.googlesource.com/2510
Reviewed-by: Adam Langley <agl@google.com>
This commit is contained in:
Håvard Molland 2014-12-08 15:41:59 +01:00 committed by Adam Langley
parent 8c37cb60d4
commit 306e520cda
2 changed files with 5 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
crypto/ec/oct.c
View File

@ -84,8 +84,7 @@ static size_t ec_GFp_simple_point2oct(const EC_GROUP *group,
size_t field_len, i; size_t field_len, i;
if ((form != POINT_CONVERSION_COMPRESSED) && if ((form != POINT_CONVERSION_COMPRESSED) &&
(form != POINT_CONVERSION_UNCOMPRESSED) && (form != POINT_CONVERSION_UNCOMPRESSED)) {
(form != POINT_CONVERSION_HYBRID)) {
OPENSSL_PUT_ERROR(EC, ec_GFp_simple_point2oct, EC_R_INVALID_FORM); OPENSSL_PUT_ERROR(EC, ec_GFp_simple_point2oct, EC_R_INVALID_FORM);
goto err; goto err;
} }
@ -134,8 +133,7 @@ static size_t ec_GFp_simple_point2oct(const EC_GROUP *group,
goto err; goto err;
} }
if ((form == POINT_CONVERSION_COMPRESSED || if ((form == POINT_CONVERSION_COMPRESSED) &&
form == POINT_CONVERSION_HYBRID) &&
BN_is_odd(y)) { BN_is_odd(y)) {
buf[0] = form + 1; buf[0] = form + 1;
} else { } else {
@ -149,8 +147,7 @@ static size_t ec_GFp_simple_point2oct(const EC_GROUP *group,
} }
i += field_len; i += field_len;
if (form == POINT_CONVERSION_UNCOMPRESSED || if (form == POINT_CONVERSION_UNCOMPRESSED) {
form == POINT_CONVERSION_HYBRID) {
if (!BN_bn2bin_padded(buf + i, field_len, y)) { if (!BN_bn2bin_padded(buf + i, field_len, y)) {
OPENSSL_PUT_ERROR(EC, ec_GFp_simple_point2oct, ERR_R_INTERNAL_ERROR); OPENSSL_PUT_ERROR(EC, ec_GFp_simple_point2oct, ERR_R_INTERNAL_ERROR);
goto err; goto err;
@ -201,8 +198,7 @@ static int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
y_bit = form & 1; y_bit = form & 1;
form = form & ~1U; form = form & ~1U;
if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED) && if ((form != 0) && (form != POINT_CONVERSION_COMPRESSED) &&
(form != POINT_CONVERSION_UNCOMPRESSED) && (form != POINT_CONVERSION_UNCOMPRESSED)) {
(form != POINT_CONVERSION_HYBRID)) {
OPENSSL_PUT_ERROR(EC, ec_GFp_simple_oct2point, EC_R_INVALID_ENCODING); OPENSSL_PUT_ERROR(EC, ec_GFp_simple_oct2point, EC_R_INVALID_ENCODING);
return 0; return 0;
} }
@ -258,12 +254,6 @@ static int ec_GFp_simple_oct2point(const EC_GROUP *group, EC_POINT *point,
OPENSSL_PUT_ERROR(EC, ec_GFp_simple_oct2point, EC_R_INVALID_ENCODING); OPENSSL_PUT_ERROR(EC, ec_GFp_simple_oct2point, EC_R_INVALID_ENCODING);
goto err; goto err;
} }
if (form == POINT_CONVERSION_HYBRID) {
if (y_bit != BN_is_odd(y)) {
OPENSSL_PUT_ERROR(EC, ec_GFp_simple_oct2point, EC_R_INVALID_ENCODING);
goto err;
}
}
if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx)) if (!EC_POINT_set_affine_coordinates_GFp(group, point, x, y, ctx))
goto err; goto err;

5
include/openssl/ec.h
View File

@ -85,10 +85,7 @@ typedef enum {
* which solution of the quadratic equation y is */ * which solution of the quadratic equation y is */
POINT_CONVERSION_COMPRESSED = 2, POINT_CONVERSION_COMPRESSED = 2,
/** the point is encoded as z||x||y, where z is the octet 0x02 */ /** the point is encoded as z||x||y, where z is the octet 0x02 */
POINT_CONVERSION_UNCOMPRESSED = 4, POINT_CONVERSION_UNCOMPRESSED = 4
/** the point is encoded as z||x||y, where the octet z specifies
* which solution of the quadratic equation y is */
POINT_CONVERSION_HYBRID = 6
} point_conversion_form_t; } point_conversion_form_t;