diff options
author | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-09 17:41:21 +0100 |
---|---|---|
committer | David Monniaux <david.monniaux@univ-grenoble-alpes.fr> | 2019-02-09 17:41:21 +0100 |
commit | bc162e5d2be64ea3f552a61155211c2d6a1beb76 (patch) | |
tree | 4c28ac6df8bd483765c761e349f23b4d91845931 /test/monniaux/mbedtls/mbedtls_Kalray.patch | |
parent | e54de6e2fe604d6dfb86eecb6cfd9edff5fc6ac3 (diff) | |
download | compcert-kvx-bc162e5d2be64ea3f552a61155211c2d6a1beb76.tar.gz compcert-kvx-bc162e5d2be64ea3f552a61155211c2d6a1beb76.zip |
for mbedtls
Diffstat (limited to 'test/monniaux/mbedtls/mbedtls_Kalray.patch')
-rw-r--r-- | test/monniaux/mbedtls/mbedtls_Kalray.patch | 107 |
1 files changed, 107 insertions, 0 deletions
diff --git a/test/monniaux/mbedtls/mbedtls_Kalray.patch b/test/monniaux/mbedtls/mbedtls_Kalray.patch new file mode 100644 index 00000000..8b271130 --- /dev/null +++ b/test/monniaux/mbedtls/mbedtls_Kalray.patch @@ -0,0 +1,107 @@ +diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h +index f89bf9604..9f8a4faeb 100644 +--- a/include/mbedtls/config.h ++++ b/include/mbedtls/config.h +@@ -1076,7 +1076,7 @@ + * + * Enable functions that use the filesystem. + */ +-#define MBEDTLS_FS_IO ++// DMonniaux #define MBEDTLS_FS_IO + + /** + * \def MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES +@@ -1100,7 +1100,8 @@ + * + * Uncomment this macro to disable the built-in platform entropy functions. + */ +-//#define MBEDTLS_NO_PLATFORM_ENTROPY ++//DMonniaux ++#define MBEDTLS_NO_PLATFORM_ENTROPY + + /** + * \def MBEDTLS_ENTROPY_FORCE_SHA256 +@@ -2441,7 +2442,7 @@ + * + * This module provides networking routines. + */ +-#define MBEDTLS_NET_C ++// DMonniaux #define MBEDTLS_NET_C + + /** + * \def MBEDTLS_OID_C +@@ -2838,7 +2839,7 @@ + * + * This module is used by the HAVEGE random number generator. + */ +-#define MBEDTLS_TIMING_C ++// DMonniaux #define MBEDTLS_TIMING_C + + /** + * \def MBEDTLS_VERSION_C +diff --git a/library/bignum.c b/library/bignum.c +index 87015af0c..a2bad7b84 100644 +--- a/library/bignum.c ++++ b/library/bignum.c +@@ -1696,6 +1696,8 @@ cleanup: + return( ret ); + } + ++#define INT_DIV(x,y) (((long)(x)) / (y)) ++ + /* + * Modulo: r = A mod b + */ +@@ -1734,12 +1736,12 @@ int mbedtls_mpi_mod_int( mbedtls_mpi_uint *r, const mbedtls_mpi *A, mbedtls_mpi_ + { + x = A->p[i - 1]; + y = ( y << biH ) | ( x >> biH ); +- z = y / b; ++ z = INT_DIV(y, b); + y -= z * b; + + x <<= biH; + y = ( y << biH ) | ( x >> biH ); +- z = y / b; ++ z = INT_DIV(y, b); + y -= z * b; + } + +diff --git a/library/ssl_tls.c b/library/ssl_tls.c +index 8710a5076..e47c859fe 100644 +--- a/library/ssl_tls.c ++++ b/library/ssl_tls.c +@@ -2482,6 +2482,8 @@ static int ssl_decompress_buf( mbedtls_ssl_context *ssl ) + } + #endif /* MBEDTLS_ZLIB_SUPPORT */ + ++#define INT_DIV(x, y) (((long)(x))/(y)) ++ + #if defined(MBEDTLS_SSL_SRV_C) && defined(MBEDTLS_SSL_RENEGOTIATION) + static int ssl_write_hello_request( mbedtls_ssl_context *ssl ); + +@@ -2492,7 +2494,7 @@ static int ssl_resend_hello_request( mbedtls_ssl_context *ssl ) + * timeout if we were using the usual handshake doubling scheme */ + if( ssl->conf->renego_max_records < 0 ) + { +- uint32_t ratio = ssl->conf->hs_timeout_max / ssl->conf->hs_timeout_min + 1; ++ uint32_t ratio = INT_DIV(ssl->conf->hs_timeout_max, ssl->conf->hs_timeout_min + 1); + unsigned char doublings = 1; + + while( ratio != 0 ) +diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function +index 1255ff4be..103abe9a8 100644 +--- a/tests/suites/helpers.function ++++ b/tests/suites/helpers.function +@@ -40,10 +40,10 @@ typedef UINT32 uint32_t; + #endif + + #include <string.h> ++#include <strings.h> + + #if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__)) + #include <unistd.h> +-#include <strings.h> + #endif + + /* Type for Hex parameters */ |