jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

DPP: Fix testing code for invalid keys with OpenSSL 1.1.1

Browse source 
OpenSSL started reporting failures from
EC_POINT_set_affine_coordinates_GFp() similarly to BoringSSL, so use the
same workaround to enable this protocol testing case.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2018-05-01 12:02:57 +03:00
parent c456e6e3f7
commit 2439714f90
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/common/dpp.c
View file

@ -6214,13 +6214,14 @@ static int dpp_test_gen_invalid_key(struct wpabuf *msg,
if (EC_POINT_set_affine_coordinates_GFp(group, point, x, y, if (EC_POINT_set_affine_coordinates_GFp(group, point, x, y,
ctx) != 1) { ctx) != 1) {
#ifdef OPENSSL_IS_BORINGSSL #if OPENSSL_VERSION_NUMBER >= 0x10101000L || defined(OPENSSL_IS_BORINGSSL)
/* Unlike OpenSSL, BoringSSL returns an error from /* Unlike older OpenSSL versions, OpenSSL 1.1.1 and BoringSSL
* EC_POINT_set_affine_coordinates_GFp() is not on the curve. */ * return an error from EC_POINT_set_affine_coordinates_GFp()
* when the point is not on the curve. */
break; break;
#else /* OPENSSL_IS_BORINGSSL */ #else /* >=1.1.1 or OPENSSL_IS_BORINGSSL */
goto fail; goto fail;
#endif /* OPENSSL_IS_BORINGSSL */ #endif /* >= 1.1.1 or OPENSSL_IS_BORINGSSL */
} }
if (!EC_POINT_is_on_curve(group, point, ctx)) if (!EC_POINT_is_on_curve(group, point, ctx))