yuzu-emu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2024-11-22 11:45:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Split HAVE_TIME into HAVE_TIME + HAVE_TIME_DATE

Browse Source 
First one means we have time() but it may not return the actual wall clock
time, second means it does.
This commit is contained in:
Manuel Pégourié-Gonnard 2015-06-18 20:52:58 +02:00
parent 6195767554
commit 60c793bdc9
4 changed files with 24 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -87,6 +87,8 @@ API Changes
(Thanks to Mansour Moufid for helping with the replacement.) (Thanks to Mansour Moufid for helping with the replacement.)
* Change SSL_DISABLE_RENEGOTIATION config.h flag to SSL_RENEGOTIATION * Change SSL_DISABLE_RENEGOTIATION config.h flag to SSL_RENEGOTIATION
(support for renegotiation now needs explicit enabling in config.h). (support for renegotiation now needs explicit enabling in config.h).
* Split MBEDTLS_HAVE_TIME into MBEDTLS_HAVE_TIME and MBEDTLS_HAVE_TIME_DATE
in config.h
* net_connect() and net_bind() have a new 'proto' argument to choose * net_connect() and net_bind() have a new 'proto' argument to choose
between TCP and UDP, using the macros NET_PROTO_TCP or NET_PROTO_UDP. between TCP and UDP, using the macros NET_PROTO_TCP or NET_PROTO_UDP.
* Some constness fixes * Some constness fixes

4
include/mbedtls/check_config.h
View File

@ -44,6 +44,10 @@
#error "MBEDTLS_DEPRECATED_WARNING only works with GCC and Clang" #error "MBEDTLS_DEPRECATED_WARNING only works with GCC and Clang"
#endif #endif
#if defined(MBEDTLS_HAVE_TIME_DATE) && !defined(MBEDTLS_HAVE_TIME)
#error "MBEDTLS_HAVE_TIME_DATE without MBEDTLS_HAVE_TIME does not make sense"
#endif
#if defined(MBEDTLS_AESNI_C) && !defined(MBEDTLS_HAVE_ASM) #if defined(MBEDTLS_AESNI_C) && !defined(MBEDTLS_HAVE_ASM)
#error "MBEDTLS_AESNI_C defined, but not all prerequisites" #error "MBEDTLS_AESNI_C defined, but not all prerequisites"
#endif #endif

16
include/mbedtls/config.h
View File

@ -67,12 +67,26 @@
/** /**
* \def MBEDTLS_HAVE_TIME * \def MBEDTLS_HAVE_TIME
* *
* System has time.h and time() / localtime() / gettimeofday(). * System has time.h and time().
* The time does not need to be correct, only time differences are used,
* by contrast with MBEDTLS_HAVE_TIME_DATE
* *
* Comment if your system does not support time functions * Comment if your system does not support time functions
*/ */
#define MBEDTLS_HAVE_TIME #define MBEDTLS_HAVE_TIME
/**
* \def MBEDTLS_HAVE_TIME_DATE
*
* System has time.h and time(), gmtime() and the clock is correct.
* The time needs to be correct (not necesarily very accurate, but at least
* the date should be correct). This is used to verify the validity period of
* X.509 certificates.
*
* Comment if your system does not have a correct clock.
*/
#define MBEDTLS_HAVE_TIME_DATE
/** /**
* \def MBEDTLS_PLATFORM_MEMORY * \def MBEDTLS_PLATFORM_MEMORY
* *

10
library/x509.c
View File

@ -874,11 +874,7 @@ int mbedtls_x509_key_size_helper( char *buf, size_t buf_size, const char *name )
return( 0 ); return( 0 );
} }
/* #if defined(MBEDTLS_HAVE_TIME_DATE)
* Return 0 if the mbedtls_x509_time is still valid, or 1 otherwise.
*/
#if defined(MBEDTLS_HAVE_TIME)
static int x509_get_current_time( mbedtls_x509_time *now ) static int x509_get_current_time( mbedtls_x509_time *now )
{ {
#if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32)
@ -982,7 +978,7 @@ int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
return( x509_check_time( from, &now ) ); return( x509_check_time( from, &now ) );
} }
#else /* MBEDTLS_HAVE_TIME */ #else /* MBEDTLS_HAVE_TIME_DATE */
int mbedtls_x509_time_is_past( const mbedtls_x509_time *to ) int mbedtls_x509_time_is_past( const mbedtls_x509_time *to )
{ {
@ -995,7 +991,7 @@ int mbedtls_x509_time_is_future( const mbedtls_x509_time *from )
((void) from); ((void) from);
return( 0 ); return( 0 );
} }
#endif /* MBEDTLS_HAVE_TIME */ #endif /* MBEDTLS_HAVE_TIME_DATE */
#if defined(MBEDTLS_SELF_TEST) #if defined(MBEDTLS_SELF_TEST)