lib/mbedtls
1
0
Fork 0
mirror of https://github.com/Mbed-TLS/mbedtls.git synced 2025-12-24 17:41:01 +03:00
Code Activity

Merge remote-tracking branch 'upstream-public/pr/1304' into development

Browse Source
This commit is contained in:
Jaeden Amero
2018-01-25 10:07:39 +00:00
parent e7bf4926ea 087d5ad593
commit cef0c5a2c8
5 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
library/ecjpake.c
View File

@@ -36,6 +36,8 @@
#include <string.h>
#if !defined(MBEDTLS_ECJPAKE_ALT)
/*
* Convert a mbedtls_ecjpake_role to identifier string
*/
@@ -764,6 +766,7 @@ cleanup:
#undef ID_MINE
#undef ID_PEER
#endif /* ! MBEDTLS_ECJPAKE_ALT */
#if defined(MBEDTLS_SELF_TEST)

3
library/version_features.c
View File

@@ -108,6 +108,9 @@ static const char *features[] = {
#if defined(MBEDTLS_DHM_ALT)
"MBEDTLS_DHM_ALT",
#endif /* MBEDTLS_DHM_ALT */
#if defined(MBEDTLS_ECJPAKE_ALT)
"MBEDTLS_ECJPAKE_ALT",
#endif /* MBEDTLS_ECJPAKE_ALT */
#if defined(MBEDTLS_GCM_ALT)
"MBEDTLS_GCM_ALT",
#endif /* MBEDTLS_GCM_ALT */