github/RRG-Proxmark3
1
0
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-08-21 05:43:48 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'mbedtls_2.26.0'

Browse source 
* mbedtls_2.26.0:
  mbedtls: disable timing, unused and needs tuning on ProxSpace
  mbedtls: remove inline on mpi fcts to avoid warning:
  mbedtls: stack warning fix, cf 17bce5fb5a
  mbedtls: memset, cf 996ed197fb
  mbedtls: add secp128r1, cf 996ed197fb
  mbedtls: port previous config
  mbedtls: make style
  mbedtls 2.26.0
This commit is contained in:
Philippe Teuwen 2021-05-18 23:52:55 +02:00
commit 76adb58feb
188 changed files with 91460 additions and 9329 deletions
Download patch file Download diff file Expand all files Collapse all files

2
client/deps/mbedtls.cmake
View file

@ -8,7 +8,6 @@ add_library(pm3rrg_rdv4_mbedtls STATIC
../../common/mbedtls/entropy_poll.c
../../common/mbedtls/entropy.c
../../common/mbedtls/error.c
../../common/mbedtls/timing.c
../../common/mbedtls/ecp.c
../../common/mbedtls/ecp_curves.c
../../common/mbedtls/certs.c
@ -20,7 +19,6 @@ add_library(pm3rrg_rdv4_mbedtls STATIC
../../common/mbedtls/des.c
../../common/mbedtls/ecdsa.c
../../common/mbedtls/md.c
../../common/mbedtls/md_wrap.c
../../common/mbedtls/md5.c
../../common/mbedtls/oid.c
../../common/mbedtls/pem.c

4
client/src/emv/test/cryptotest.c
View file

@ -23,7 +23,7 @@
#include "base64.h"
#include "ctr_drbg.h"
#include "entropy.h"
#include "timing.h"
//#include "timing.h" // Beware it requires adjustments for ProxSpace
#include "crypto_test.h"
#include "sda_test.h"
#include "dda_test.h"
@ -56,6 +56,7 @@ int ExecuteCryptoTests(bool verbose, bool ignore_time, bool include_slow_tests)
res = mbedtls_entropy_self_test(verbose);
if (res && !ignore_time) TestFail = true;
/*
// retry for CI (when resources too low)
for (int i = 0; i < 3; i++) {
res = mbedtls_timing_self_test(verbose);
@ -64,6 +65,7 @@ int ExecuteCryptoTests(bool verbose, bool ignore_time, bool include_slow_tests)
PrintAndLogEx(WARNING, "Repeat timing test " _RED_("%d"), i + 1);
}
if (res && !ignore_time) TestFail = true;
*/
res = mbedtls_ctr_drbg_self_test(verbose);
if (res) TestFail = true;