From 9fa2e86d93b9b6e04c0a797b34aaf7b6066fbb25 Mon Sep 17 00:00:00 2001 From: -~- redtangent ~-~ Date: Thu, 26 May 2016 10:07:49 +0100 Subject: [PATCH] Add missing mbedtls_time_t definitions (#493) Add missing mbedtls_time_t definitions to sample applications and the error.c generation script. Fixes #490. --- library/error.c | 1 + programs/pkey/dh_client.c | 1 + programs/pkey/dh_genprime.c | 1 + programs/pkey/dh_server.c | 1 + programs/ssl/dtls_client.c | 1 + programs/ssl/dtls_server.c | 1 + programs/ssl/ssl_fork_server.c | 1 + scripts/data_files/error.fmt | 1 + 8 files changed, 8 insertions(+) diff --git a/library/error.c b/library/error.c index debda1d786..4718b514d2 100644 --- a/library/error.c +++ b/library/error.c @@ -34,6 +34,7 @@ #include "mbedtls/platform.h" #else #define mbedtls_snprintf snprintf +#define mbedtls_time_t time_t #endif #if defined(MBEDTLS_ERROR_C) diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index 59c4fa8c21..230bf4d7c8 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -30,6 +30,7 @@ #else #include #define mbedtls_printf printf +#define mbedtls_time_t time_t #endif #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c index 6005a62f5d..d30c73bf7f 100644 --- a/programs/pkey/dh_genprime.c +++ b/programs/pkey/dh_genprime.c @@ -30,6 +30,7 @@ #else #include #define mbedtls_printf printf +#define mbedtls_time_t time_t #endif #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_ENTROPY_C) || \ diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index 83b0b44569..cb156f79b3 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -30,6 +30,7 @@ #else #include #define mbedtls_printf printf +#define mbedtls_time_t time_t #endif #if defined(MBEDTLS_AES_C) && defined(MBEDTLS_DHM_C) && \ diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c index b37eb838cd..14fb612029 100644 --- a/programs/ssl/dtls_client.c +++ b/programs/ssl/dtls_client.c @@ -31,6 +31,7 @@ #include #define mbedtls_printf printf #define mbedtls_fprintf fprintf +#define mbedtls_time_t time_t #endif #if !defined(MBEDTLS_SSL_CLI_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) || \ diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c index df0fc780a6..1d6eb3bea0 100644 --- a/programs/ssl/dtls_server.c +++ b/programs/ssl/dtls_server.c @@ -31,6 +31,7 @@ #include #define mbedtls_printf printf #define mbedtls_fprintf fprintf +#define mbedtls_time_t time_t #endif #if !defined(MBEDTLS_SSL_SRV_C) || !defined(MBEDTLS_SSL_PROTO_DTLS) || \ diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c index 545e2fbf39..363f38f73d 100644 --- a/programs/ssl/ssl_fork_server.c +++ b/programs/ssl/ssl_fork_server.c @@ -31,6 +31,7 @@ #include #define mbedtls_fprintf fprintf #define mbedtls_printf printf +#define mbedtls_time_t time_t #endif #if !defined(MBEDTLS_BIGNUM_C) || !defined(MBEDTLS_CERTS_C) || \ diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt index bd6ef01381..a08742c83b 100644 --- a/scripts/data_files/error.fmt +++ b/scripts/data_files/error.fmt @@ -34,6 +34,7 @@ #include "mbedtls/platform.h" #else #define mbedtls_snprintf snprintf +#define mbedtls_time_t time_t #endif #if defined(MBEDTLS_ERROR_C)