From bf027e736a64af33307f15a5d1bd5c491c9b822e Mon Sep 17 00:00:00 2001 From: Ron Eldor Date: Mon, 9 Apr 2018 15:51:19 +0300 Subject: [PATCH] Minor modifications after PR review 1. Move ChangLog entry to correct location 2. Move point formats outside the ECP_ALT check, as it's part of the RFC --- ChangeLog | 6 +++--- include/mbedtls/ecp.h | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4249de766..a005eb258 100644 --- a/ChangeLog +++ b/ChangeLog @@ -54,6 +54,9 @@ Changes Wilson #481 * Improve the documentation of mbedtls_net_accept(). Contributed by Ivan Krylov. + * Put the Cryptographic API outside of the XXX_ALT macro check, so + alternative header file will not need to redefined the same API, + and to force alternative implementer to use the same API. = mbed TLS 2.8.0 branch released 2018-03-16 @@ -135,9 +138,6 @@ Changes * Clarify the documentation of mbedtls_ssl_setup. * Use (void) when defining functions with no parameters. Contributed by Joris Aerts. #678 - * Put the Cryptographic API outside of the XXX_ALT macro check, so - alternative header file will not need to redefined the same API, - and to force alternative implementer to use the same API. = mbed TLS 2.7.0 branch released 2018-02-03 diff --git a/include/mbedtls/ecp.h b/include/mbedtls/ecp.h index fe346141a..1bc5ac9e6 100644 --- a/include/mbedtls/ecp.h +++ b/include/mbedtls/ecp.h @@ -231,16 +231,16 @@ mbedtls_ecp_keypair; /* \} name SECTION: Module settings */ +#else /* MBEDTLS_ECP_ALT */ +#include "ecp_alt.h" +#endif /* MBEDTLS_ECP_ALT */ + /* * Point formats, from RFC 4492's enum ECPointFormat */ #define MBEDTLS_ECP_PF_UNCOMPRESSED 0 /**< Uncompressed point format */ #define MBEDTLS_ECP_PF_COMPRESSED 1 /**< Compressed point format */ -#else /* MBEDTLS_ECP_ALT */ -#include "ecp_alt.h" -#endif /* MBEDTLS_ECP_ALT */ - /* * Some other constants from RFC 4492 */