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

Merge remote-tracking branch 'origin/pr/2699' into development

Browse source 
* origin/pr/2699:
  Update crypto submodule to a revision with the HAVEGE header changes
  Fix misuse of signed ints in the HAVEGE module
This commit is contained in:
Jaeden Amero 2019-07-05 15:41:39 +01:00
parent 66b7edb108 06e752b2c2
commit 482a479ef0
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ChangeLog
View file

@ -74,6 +74,7 @@ Bugfix
irwir. irwir.
* Enable Suite B with subset of ECP curves. Make sure the code compiles even * Enable Suite B with subset of ECP curves. Make sure the code compiles even
if some curves are not defined. Fixes #1591 reported by dbedev. if some curves are not defined. Fixes #1591 reported by dbedev.
* Fix misuse of signed arithmetic in the HAVEGE module. #2598
API Changes API Changes
* Extend the MBEDTLS_SSL_EXPORT_KEYS to export the handshake randbytes, * Extend the MBEDTLS_SSL_EXPORT_KEYS to export the handshake randbytes,
@ -82,6 +83,7 @@ API Changes
* Add DER-encoded test CRTs to library/certs.c, allowing * Add DER-encoded test CRTs to library/certs.c, allowing
the example programs ssl_server2 and ssl_client2 to be run the example programs ssl_server2 and ssl_client2 to be run
if MBEDTLS_FS_IO and MBEDTLS_PEM_PARSE_C are unset. Fixes #2254. if MBEDTLS_FS_IO and MBEDTLS_PEM_PARSE_C are unset. Fixes #2254.
* The HAVEGE state type now uses uint32_t elements instead of int.
Changes Changes
* Server's RSA certificate in certs.c was SHA-1 signed. In the default * Server's RSA certificate in certs.c was SHA-1 signed. In the default

2
crypto

@ -1 +1 @@
Subproject commit 86268e1d302355ad8fd8e5ca5f1a7c7af8640678 Subproject commit b6229e304e69e672dec653700467c696d32d19ae

7
include/mbedtls/havege.h
View file

@ -31,6 +31,7 @@
#endif #endif
#include <stddef.h> #include <stddef.h>
#include <stdint.h>
#define MBEDTLS_HAVEGE_COLLECT_SIZE 1024 #define MBEDTLS_HAVEGE_COLLECT_SIZE 1024
@ -43,9 +44,9 @@ extern "C" {
*/ */
typedef struct mbedtls_havege_state typedef struct mbedtls_havege_state
{ {
int PT1, PT2, offset[2]; uint32_t PT1, PT2, offset[2];
int pool[MBEDTLS_HAVEGE_COLLECT_SIZE]; uint32_t pool[MBEDTLS_HAVEGE_COLLECT_SIZE];
int WALK[8192]; uint32_t WALK[8192];
} }
mbedtls_havege_state; mbedtls_havege_state;