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

Merge branch 'mbedtls-1.3'

Browse Source
This commit is contained in:
Simon Butcher 2017-02-03 16:54:49 +00:00
commit 98c96fe7c6
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -11,6 +11,9 @@ Bugfix
cause buffer bound checks to be bypassed. Found by Eyal Itkin. cause buffer bound checks to be bypassed. Found by Eyal Itkin.
* Fixed potential arithmetic overflow in mbedtls_base64_decode() that could * Fixed potential arithmetic overflow in mbedtls_base64_decode() that could
cause buffer bound checks to be bypassed. Found by Eyal Itkin. cause buffer bound checks to be bypassed. Found by Eyal Itkin.
* Fix unused variable/function compilation warnings in pem.c and x509_csr.c
that are reported when building mbed TLS with a config.h that does not
define POLARSSL_PEM_PARSE_C. Found by omnium21. #562
= mbed TLS 1.3.18 branch 2016-10-17 = mbed TLS 1.3.18 branch 2016-10-17

2
library/pem.c
View File

@ -45,12 +45,12 @@
#define polarssl_free free #define polarssl_free free
#endif #endif
#if defined(POLARSSL_PEM_PARSE_C)
/* Implementation that should never be optimized out by the compiler */ /* Implementation that should never be optimized out by the compiler */
static void polarssl_zeroize( void *v, size_t n ) { static void polarssl_zeroize( void *v, size_t n ) {
volatile unsigned char *p = v; while( n-- ) *p++ = 0; volatile unsigned char *p = v; while( n-- ) *p++ = 0;
} }
#if defined(POLARSSL_PEM_PARSE_C)
void pem_init( pem_context *ctx ) void pem_init( pem_context *ctx )
{ {
memset( ctx, 0, sizeof( pem_context ) ); memset( ctx, 0, sizeof( pem_context ) );

2
library/x509_csr.c
View File

@ -260,8 +260,8 @@ int x509_csr_parse_der( x509_csr *csr,
*/ */
int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen ) int x509_csr_parse( x509_csr *csr, const unsigned char *buf, size_t buflen )
{ {
int ret;
#if defined(POLARSSL_PEM_PARSE_C) #if defined(POLARSSL_PEM_PARSE_C)
int ret;
size_t use_len; size_t use_len;
pem_context pem; pem_context pem;
#endif #endif