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

Merge remote-tracking branch 'upstream-public/pr/1435' into development-proposed

Browse source
This commit is contained in:
Jaeden Amero 2018-03-26 18:25:58 +01:00
parent fba16f782c d49ab3ee60
commit b604960572
2 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

@ -16,6 +16,8 @@ Bugfix
* Add missing dependencies in test suites that led to build failures * Add missing dependencies in test suites that led to build failures
in configurations that omit certain hashes or public-key algorithms. in configurations that omit certain hashes or public-key algorithms.
Fixes #1040. Fixes #1040.
* Fix C89 incompatibility in benchmark.c. Contributed by Brendan Shanks.
#1353
Changes Changes
* Remove some redundant code in bignum.c. Contributed by Alexey Skalozub. * Remove some redundant code in bignum.c. Contributed by Alexey Skalozub.

8
programs/test/benchmark.c
View file

@ -658,13 +658,13 @@ int main( int argc, char *argv[] )
if( todo.dhm ) if( todo.dhm )
{ {
int dhm_sizes[] = { 2048, 3072 }; int dhm_sizes[] = { 2048, 3072 };
const unsigned char dhm_P_2048[] = static const unsigned char dhm_P_2048[] =
MBEDTLS_DHM_RFC3526_MODP_2048_P_BIN; MBEDTLS_DHM_RFC3526_MODP_2048_P_BIN;
const unsigned char dhm_P_3072[] = static const unsigned char dhm_P_3072[] =
MBEDTLS_DHM_RFC3526_MODP_3072_P_BIN; MBEDTLS_DHM_RFC3526_MODP_3072_P_BIN;
const unsigned char dhm_G_2048[] = static const unsigned char dhm_G_2048[] =
MBEDTLS_DHM_RFC3526_MODP_2048_G_BIN; MBEDTLS_DHM_RFC3526_MODP_2048_G_BIN;
const unsigned char dhm_G_3072[] = static const unsigned char dhm_G_3072[] =
MBEDTLS_DHM_RFC3526_MODP_3072_G_BIN; MBEDTLS_DHM_RFC3526_MODP_3072_G_BIN;
const unsigned char *dhm_P[] = { dhm_P_2048, dhm_P_3072 }; const unsigned char *dhm_P[] = { dhm_P_2048, dhm_P_3072 };