yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update dependencies & includes for session tickets

Browse source
This commit is contained in:
Manuel Pégourié-Gonnard 2015-05-20 09:55:50 +02:00
parent d59675d92c
commit 0c0f11f4b3
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/mbedtls/check_config.h
View file

@ -425,10 +425,10 @@
#error "MBEDTLS_SSL_EXTENDED_MASTER_SECRET defined, but not all prerequsites" #error "MBEDTLS_SSL_EXTENDED_MASTER_SECRET defined, but not all prerequsites"
#endif #endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS) && defined(MBEDTLS_SSL_TLS_C) && \ #if defined(MBEDTLS_SSL_TICKET_C) && \
( !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_SHA256_C) || \ ( !defined(MBEDTLS_AES_C) || !defined(MBEDTLS_SHA256_C) || \
!defined(MBEDTLS_CIPHER_MODE_CBC) ) !defined(MBEDTLS_CIPHER_MODE_CBC) )
#error "MBEDTLS_SSL_SESSION_TICKETS defined, but not all prerequisites" #error "MBEDTLS_SSL_TICKET_C defined, but not all prerequisites"
#endif #endif
#if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) && \ #if defined(MBEDTLS_SSL_CBC_RECORD_SPLITTING) && \

13
include/mbedtls/config.h
View file

@ -1109,10 +1109,11 @@
* \def MBEDTLS_SSL_SESSION_TICKETS * \def MBEDTLS_SSL_SESSION_TICKETS
* *
* Enable support for RFC 5077 session tickets in SSL. * Enable support for RFC 5077 session tickets in SSL.
* * Client-side, provides full support for session tickets (maintainance of a
* Requires: MBEDTLS_AES_C * session store remains the responsibility of the application, though).
* MBEDTLS_SHA256_C * Server-side, you also need to provide callbacks for writing and parsing
* MBEDTLS_CIPHER_MODE_CBC * tickets, including authenticated encryption and key management. Example
* callbacks are provided by MBEDTLS_SSL_TICKET_C.
* *
* Comment this macro to disable support for SSL session tickets * Comment this macro to disable support for SSL session tickets
*/ */
@ -2096,6 +2097,10 @@
* *
* Module: library/ssl_ticket.c * Module: library/ssl_ticket.c
* Caller: * Caller:
*
* Requires: MBEDTLS_AES_C
* MBEDTLS_SHA256_C
* MBEDTLS_CIPHER_MODE_CBC
*/ */
#define MBEDTLS_SSL_TICKET_C #define MBEDTLS_SSL_TICKET_C

5
include/mbedtls/ssl.h
View file

@ -51,11 +51,6 @@
#include "sha512.h" #include "sha512.h"
#endif #endif
// for session tickets
#if defined(MBEDTLS_AES_C)
#include "aes.h"
#endif
#if defined(MBEDTLS_X509_CRT_PARSE_C) #if defined(MBEDTLS_X509_CRT_PARSE_C)
#include "x509_crt.h" #include "x509_crt.h"
#include "x509_crl.h" #include "x509_crl.h"

1
include/mbedtls/ssl_ticket.h
View file

@ -25,6 +25,7 @@
#define MBEDTLS_SSL_TICKET_H #define MBEDTLS_SSL_TICKET_H
#include "ssl.h" #include "ssl.h"
#include "aes.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {

2
library/ssl_srv.c
View file

@ -50,8 +50,6 @@
#endif #endif
#if defined(MBEDTLS_SSL_SESSION_TICKETS) #if defined(MBEDTLS_SSL_SESSION_TICKETS)
#include "mbedtls/ssl_ticket.h"
/* Implementation that should never be optimized out by the compiler */ /* Implementation that should never be optimized out by the compiler */
static void mbedtls_zeroize( void *v, size_t n ) { static void mbedtls_zeroize( void *v, size_t n ) {
volatile unsigned char *p = v; while( n-- ) *p++ = 0; volatile unsigned char *p = v; while( n-- ) *p++ = 0;