yuzu/mbedtls
1
0
Fork 0
mirror of https://github.com/yuzu-emu/mbedtls.git synced 2025-05-30 18:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/pr/2319' into mbedtls-2.16

Browse source
This commit is contained in:
Jaeden Amero 2019-01-30 16:09:56 +00:00
parent f0f8c09178 5c0b5b53a3
commit 5788314d63
4 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -21,6 +21,8 @@ Bugfix
* Reduce stack usage of `mpi_write_hlp()` by eliminating recursion. * Reduce stack usage of `mpi_write_hlp()` by eliminating recursion.
Fixes #2190. Fixes #2190.
* Remove a duplicate #include in a sample program. Fixed by Masashi Honma #2326. * Remove a duplicate #include in a sample program. Fixed by Masashi Honma #2326.
* Remove the mbedtls namespacing from the header file, to fix a "file not found"
build error. Fixed by Haijun Gu #2319.
Changes Changes
* Include configuration file in all header files that use configuration, * Include configuration file in all header files that use configuration,

2
include/mbedtls/cipher.h
View file

@ -36,7 +36,7 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#include "mbedtls/platform_util.h" #include "platform_util.h"
#if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C) #if defined(MBEDTLS_GCM_C) || defined(MBEDTLS_CCM_C) || defined(MBEDTLS_CHACHAPOLY_C)
#define MBEDTLS_CIPHER_MODE_AEAD #define MBEDTLS_CIPHER_MODE_AEAD

4
include/mbedtls/platform_util.h
View file

@ -26,14 +26,14 @@
#define MBEDTLS_PLATFORM_UTIL_H #define MBEDTLS_PLATFORM_UTIL_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif
#include <stddef.h> #include <stddef.h>
#if defined(MBEDTLS_HAVE_TIME_DATE) #if defined(MBEDTLS_HAVE_TIME_DATE)
#include "mbedtls/platform_time.h" #include "platform_time.h"
#include <time.h> #include <time.h>
#endif /* MBEDTLS_HAVE_TIME_DATE */ #endif /* MBEDTLS_HAVE_TIME_DATE */

2
include/mbedtls/poly1305.h
View file

@ -34,7 +34,7 @@
#define MBEDTLS_POLY1305_H #define MBEDTLS_POLY1305_H
#if !defined(MBEDTLS_CONFIG_FILE) #if !defined(MBEDTLS_CONFIG_FILE)
#include "mbedtls/config.h" #include "config.h"
#else #else
#include MBEDTLS_CONFIG_FILE #include MBEDTLS_CONFIG_FILE
#endif #endif