summaryrefslogtreecommitdiff
path: root/library/version_features.c
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>2018-09-11 11:08:12 +0200
committerManuel Pégourié-Gonnard <manuel.pegourie-gonnard@arm.com>2018-09-11 12:39:14 +0200
commit125af948c34939ea1197a6379c0570c93ac95e55 (patch)
treeee87ac6c65d321d484f6ca6218c25286daa69d69 /library/version_features.c
parentc8c12b6007b4249e1fbc67c94bb28b3ec2dadc3f (diff)
parent53546ea099f6f53d0be653a64accd250e170337f (diff)
Merge branch 'development-restricted' into iotssl-1260-non-blocking-ecc-restricted
* development-restricted: (578 commits) Update library version number to 2.13.1 Don't define _POSIX_C_SOURCE in header file Don't declare and define gmtime()-mutex on Windows platforms Correct preprocessor guards determining use of gmtime() Correct documentation of mbedtls_platform_gmtime_r() Correct typo in documentation of mbedtls_platform_gmtime_r() Correct POSIX version check to determine presence of gmtime_r() Improve documentation of mbedtls_platform_gmtime_r() platform_utils.{c/h} -> platform_util.{c/h} Don't include platform_time.h if !MBEDTLS_HAVE_TIME Improve wording of documentation of MBEDTLS_PLATFORM_GMTIME_R_ALT Fix typo in documentation of MBEDTLS_PLATFORM_GMTIME_R_ALT Replace 'thread safe' by 'thread-safe' in the documentation Improve documentation of MBEDTLS_HAVE_TIME_DATE ChangeLog: Add missing renamings gmtime -> gmtime_r Improve documentation of MBEDTLS_HAVE_TIME_DATE Minor documentation improvements Style: Add missing period in documentation in threading.h Rename mbedtls_platform_gmtime() to mbedtls_platform_gmtime_r() Guard decl and use of gmtime mutex by HAVE_TIME_DATE and !GMTIME_ALT ...
Diffstat (limited to 'library/version_features.c')
-rw-r--r--library/version_features.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/library/version_features.c b/library/version_features.c
index b1b5f306..f1798a7f 100644
--- a/library/version_features.c
+++ b/library/version_features.c
@@ -39,6 +39,9 @@ static const char *features[] = {
#if defined(MBEDTLS_NO_UDBL_DIVISION)
"MBEDTLS_NO_UDBL_DIVISION",
#endif /* MBEDTLS_NO_UDBL_DIVISION */
+#if defined(MBEDTLS_NO_64BIT_MULTIPLICATION)
+ "MBEDTLS_NO_64BIT_MULTIPLICATION",
+#endif /* MBEDTLS_NO_64BIT_MULTIPLICATION */
#if defined(MBEDTLS_HAVE_SSE2)
"MBEDTLS_HAVE_SSE2",
#endif /* MBEDTLS_HAVE_SSE2 */
@@ -102,6 +105,12 @@ static const char *features[] = {
#if defined(MBEDTLS_CCM_ALT)
"MBEDTLS_CCM_ALT",
#endif /* MBEDTLS_CCM_ALT */
+#if defined(MBEDTLS_CHACHA20_ALT)
+ "MBEDTLS_CHACHA20_ALT",
+#endif /* MBEDTLS_CHACHA20_ALT */
+#if defined(MBEDTLS_CHACHAPOLY_ALT)
+ "MBEDTLS_CHACHAPOLY_ALT",
+#endif /* MBEDTLS_CHACHAPOLY_ALT */
#if defined(MBEDTLS_CMAC_ALT)
"MBEDTLS_CMAC_ALT",
#endif /* MBEDTLS_CMAC_ALT */
@@ -117,6 +126,9 @@ static const char *features[] = {
#if defined(MBEDTLS_GCM_ALT)
"MBEDTLS_GCM_ALT",
#endif /* MBEDTLS_GCM_ALT */
+#if defined(MBEDTLS_NIST_KW_ALT)
+ "MBEDTLS_NIST_KW_ALT",
+#endif /* MBEDTLS_NIST_KW_ALT */
#if defined(MBEDTLS_MD2_ALT)
"MBEDTLS_MD2_ALT",
#endif /* MBEDTLS_MD2_ALT */
@@ -126,6 +138,9 @@ static const char *features[] = {
#if defined(MBEDTLS_MD5_ALT)
"MBEDTLS_MD5_ALT",
#endif /* MBEDTLS_MD5_ALT */
+#if defined(MBEDTLS_POLY1305_ALT)
+ "MBEDTLS_POLY1305_ALT",
+#endif /* MBEDTLS_POLY1305_ALT */
#if defined(MBEDTLS_RIPEMD160_ALT)
"MBEDTLS_RIPEMD160_ALT",
#endif /* MBEDTLS_RIPEMD160_ALT */
@@ -555,6 +570,12 @@ static const char *features[] = {
#if defined(MBEDTLS_CERTS_C)
"MBEDTLS_CERTS_C",
#endif /* MBEDTLS_CERTS_C */
+#if defined(MBEDTLS_CHACHA20_C)
+ "MBEDTLS_CHACHA20_C",
+#endif /* MBEDTLS_CHACHA20_C */
+#if defined(MBEDTLS_CHACHAPOLY_C)
+ "MBEDTLS_CHACHAPOLY_C",
+#endif /* MBEDTLS_CHACHAPOLY_C */
#if defined(MBEDTLS_CIPHER_C)
"MBEDTLS_CIPHER_C",
#endif /* MBEDTLS_CIPHER_C */
@@ -603,6 +624,9 @@ static const char *features[] = {
#if defined(MBEDTLS_HMAC_DRBG_C)
"MBEDTLS_HMAC_DRBG_C",
#endif /* MBEDTLS_HMAC_DRBG_C */
+#if defined(MBEDTLS_NIST_KW_C)
+ "MBEDTLS_NIST_KW_C",
+#endif /* MBEDTLS_NIST_KW_C */
#if defined(MBEDTLS_MD_C)
"MBEDTLS_MD_C",
#endif /* MBEDTLS_MD_C */
@@ -654,6 +678,9 @@ static const char *features[] = {
#if defined(MBEDTLS_PLATFORM_C)
"MBEDTLS_PLATFORM_C",
#endif /* MBEDTLS_PLATFORM_C */
+#if defined(MBEDTLS_POLY1305_C)
+ "MBEDTLS_POLY1305_C",
+#endif /* MBEDTLS_POLY1305_C */
#if defined(MBEDTLS_RIPEMD160_C)
"MBEDTLS_RIPEMD160_C",
#endif /* MBEDTLS_RIPEMD160_C */