From 02b80488461f13c35fa258e33d0cbff9b6717329 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 25 Oct 2018 12:41:04 +0100 Subject: [PATCH 01/42] ECDH: Add Everest Curve25519 config.h option --- include/mbedtls/config.h | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 877d52e3f9..5443dd2958 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -3576,6 +3576,17 @@ */ //#define MBEDTLS_PLATFORM_GMTIME_R_ALT +/* + * \def MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED + * + * Enable the verified implementations of crypto primitives + * from Project Everest (currently only Curve25519). + * This feature breaks ECDH backward compatibility (see also + * MBEDTLS_ECDH_LEGACY_CONTEXT). + * + */ +#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED + /* \} name SECTION: Customisation configuration options */ /* Target and application specific configurations From 977d89ab294f2d125653481713d6ca03b0e0aa81 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 25 Oct 2018 12:47:03 +0100 Subject: [PATCH 02/42] ECDH: Include Everest Curve25519 in build scripts --- CMakeLists.txt | 2 ++ include/CMakeLists.txt | 3 ++- library/CMakeLists.txt | 10 ++++++++++ library/Makefile | 17 ++++++++++++++--- programs/Makefile | 2 ++ tests/Makefile | 3 ++- 6 files changed, 32 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67ec7ccee5..9ab1f3f9c5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,6 +181,8 @@ else() set(LIB_INSTALL_DIR lib) endif() +include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/) + if(ENABLE_ZLIB_SUPPORT) find_package(ZLIB) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index c2f2bd4e6f..ef33fe8286 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -3,8 +3,9 @@ option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON) if(INSTALL_MBEDTLS_HEADERS) file(GLOB headers "mbedtls/*.h") + file(GLOB headers_everest "../3rdparty/everest/include/*.h") - install(FILES ${headers} + install(FILES ${headers} ${headers_everest} DESTINATION include/mbedtls PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index c82784ee19..d1cf26fef7 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -66,6 +66,16 @@ set(src_crypto xtea.c ) +set(src_everest + ../3rdparty/everest/library/everest.c + ../3rdparty/everest/library/Hacl_Curve25519.c + ../3rdparty/everest/library/x25519.c + ../3rdparty/everest/library/kremlib/fstar_uint128.c + ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c +) + +set(src_crypto ${src_crypto} ${src_everest}) + set(src_x509 certs.c pkcs11.c diff --git a/library/Makefile b/library/Makefile index af472ad936..a757752288 100644 --- a/library/Makefile +++ b/library/Makefile @@ -18,6 +18,9 @@ endif # To compile on Plan9: # CFLAGS += -D_BSD_EXTENSION +# Include directories for Everest code +CFLAGS+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib + # if were running on Windows build for Windows ifdef WINDOWS WINDOWS_BUILD=1 @@ -70,6 +73,13 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ +OBJS_CRYPTO+= \ + ../3rdparty/everest/library/everest.o \ + ../3rdparty/everest/library/Hacl_Curve25519.o \ + ../3rdparty/everest/library/x25519.o \ + ../3rdparty/everest/library/kremlib/fstar_uint128.o \ + ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o + OBJS_X509= certs.o pkcs11.o x509.o \ x509_create.o x509_crl.o x509_crt.o \ x509_csr.o x509write_crt.o x509write_csr.o @@ -153,11 +163,12 @@ libmbedcrypto.%: .c.o: echo " CC $<" - $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -c $< + $(CC) $(LOCAL_CFLAGS) $(CFLAGS) -o $@ -c $< clean: ifndef WINDOWS - rm -f *.o libmbed* + rm -f *.o libmbed* $(OBJS_CRYPTO) else - del /Q /F *.o libmbed* + del /Q /F *.o libmbed* $(OBJS_CRYPTO) endif + diff --git a/programs/Makefile b/programs/Makefile index 857be7837d..f094877126 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -18,6 +18,8 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include LOCAL_CXXFLAGS += -I../crypto/include +LOCAL_CFLAGS+=-I../3rdparty/everest/include + ifndef SHARED DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a else diff --git a/tests/Makefile b/tests/Makefile index 1679ee40b9..d1c265e528 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -16,6 +16,8 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ +LOCAL_CFLAGS+=-I../3rdparty/everest/include + # Enable definition of various functions used throughout the testsuite # (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless # on non-POSIX platforms. @@ -185,4 +187,3 @@ $(EMBEDDED_TESTS): embedded_%: suites/$$(firstword $$(subst ., ,$$*)).function s -o ./TESTS/mbedtls/$* generate-target-tests: $(EMBEDDED_TESTS) - From 0bc9c693ce9ae774927b5fc0089d439c5101100c Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 25 Oct 2018 12:47:18 +0100 Subject: [PATCH 03/42] ECDH: Add new (non-legacy) ECDH benchmark --- programs/test/benchmark.c | 47 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 2b86566925..4282276f5c 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -97,7 +97,7 @@ int main( void ) /* * Size to use for the alloc buffer if MEMORY_BUFFER_ALLOC_C is defined. */ -#define HEAP_SIZE (1u << 16) // 64k +#define HEAP_SIZE (1u << 16) /* 64k */ #define BUFSIZE 1024 #define HEADER_FORMAT " %-24s : " @@ -988,6 +988,51 @@ int main( int argc, char *argv[] ) } #endif +#if defined(MBEDTLS_ECDH_C) && !defined(MBEDTLS_ECDH_LEGACY_CONTEXT) + if( todo.ecdh ) + { + mbedtls_ecdh_context ecdh_srv, ecdh_cli; + unsigned char buf_srv[BUFSIZE], buf_cli[BUFSIZE]; + const mbedtls_ecp_curve_info * curve_list = mbedtls_ecp_curve_list(); + const mbedtls_ecp_curve_info *curve_info; + size_t olen; + + for( curve_info = curve_list; + curve_info->grp_id != MBEDTLS_ECP_DP_NONE; + curve_info++ ) + { + mbedtls_ecdh_init( &ecdh_srv ); + mbedtls_ecdh_init( &ecdh_cli ); + mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ); + mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ); + + if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 && ( + mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id ) != 0 || + mbedtls_ecdh_gen_public( &ecdh_srv.ctx.mbed_ecdh.grp, + &ecdh_srv.ctx.mbed_ecdh.d, + &ecdh_srv.ctx.mbed_ecdh.Q, myrand, NULL ) != 0 )) + mbedtls_exit( 1 ); + + mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); + TIME_PUBLIC( title, "handshake", + const unsigned char * p_srv = buf_srv; + ret |= mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ); + + ret |= mbedtls_ecdh_read_params( &ecdh_cli, &p_srv, p_srv + olen ); + ret |= mbedtls_ecdh_make_public( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ); + + ret |= mbedtls_ecdh_read_public( &ecdh_srv, buf_cli, olen ); + ret |= mbedtls_ecdh_calc_secret( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ); + + ret |= mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ); + ); + + mbedtls_ecdh_free( &ecdh_srv ); + mbedtls_ecdh_free( &ecdh_cli ); + } + } +#endif + mbedtls_printf( "\n" ); #if defined(MBEDTLS_MEMORY_BUFFER_ALLOC_C) From e0e8eb311473b22479d5faa6d0a462152ca5ce32 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 25 Oct 2018 13:12:05 +0100 Subject: [PATCH 04/42] ECDH: Add #ifdef filter to tests/scripts/list-enum-consts.pl This allows the use of #ifdef ... #endif in enum definitions (e.g., mbedtls_ecdh_variant in ecdh.h). --- tests/scripts/list-enum-consts.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/list-enum-consts.pl b/tests/scripts/list-enum-consts.pl index cfef300a65..65cec3f153 100755 --- a/tests/scripts/list-enum-consts.pl +++ b/tests/scripts/list-enum-consts.pl @@ -22,7 +22,7 @@ while (<>) $state = 'in'; } elsif( $state eq 'in' and /}/ ) { $state = 'out'; - } elsif( $state eq 'in' ) { + } elsif( $state eq 'in' and not (/^#if/ or /#endif/)) { s/=.*//; s!/\*.*!!; s/,.*//; s/\s+//g; chomp; push @consts, $_ if $_; } From 0b9310241557f0ea2c54fb79ffcd49e95f349640 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 6 Dec 2018 17:15:12 +0000 Subject: [PATCH 05/42] ECDH: Rename full handshake benchmark --- programs/test/benchmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 programs/test/benchmark.c diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100644 new mode 100755 index 4282276f5c..a7a01074cf --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -1014,7 +1014,7 @@ int main( int argc, char *argv[] ) mbedtls_exit( 1 ); mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); - TIME_PUBLIC( title, "handshake", + TIME_PUBLIC( title, "full handshake", const unsigned char * p_srv = buf_srv; ret |= mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ); From b4e63a14d9e7af3e865f01769a39240f18e00e63 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 7 Dec 2018 13:32:59 +0000 Subject: [PATCH 06/42] ECDH: Improve ECDH full handshake benchmark --- programs/test/benchmark.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index a7a01074cf..ba2c9370a5 100755 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -988,7 +988,7 @@ int main( int argc, char *argv[] ) } #endif -#if defined(MBEDTLS_ECDH_C) && !defined(MBEDTLS_ECDH_LEGACY_CONTEXT) +#if defined(MBEDTLS_ECDH_C) if( todo.ecdh ) { mbedtls_ecdh_context ecdh_srv, ecdh_cli; @@ -1006,11 +1006,18 @@ int main( int argc, char *argv[] ) mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ); mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ); +#if defined(MBEDTLS_ECDH_LEGACY_CONTEXT) + if (mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id) != 0 || + mbedtls_ecdh_gen_public(&ecdh_srv.grp, + &ecdh_srv.d, + &ecdh_srv.Q, myrand, NULL) != 0) +#else if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 && ( mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id ) != 0 || mbedtls_ecdh_gen_public( &ecdh_srv.ctx.mbed_ecdh.grp, &ecdh_srv.ctx.mbed_ecdh.d, &ecdh_srv.ctx.mbed_ecdh.Q, myrand, NULL ) != 0 )) +#endif mbedtls_exit( 1 ); mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); From c14dd845ad00cc2494cdd72bb1d46d45031a245c Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 6 Dec 2018 18:59:19 +0000 Subject: [PATCH 07/42] ECDH: Add Everest Curve25519 to VS project files This being the first 3rdparty-contribution, we may want to consider the structure of the project file generation scripts. Perhaps add small, constribution-specific scripts to each directory in 3rdparty instead of adding all constraints to generate_visualc_files.pl? --- scripts/generate_visualc_files.pl | 2 +- visualc/VS2010/aescrypt2.vcxproj | 8 ++++---- visualc/VS2010/benchmark.vcxproj | 8 ++++---- visualc/VS2010/cert_app.vcxproj | 8 ++++---- visualc/VS2010/cert_req.vcxproj | 8 ++++---- visualc/VS2010/cert_write.vcxproj | 8 ++++---- visualc/VS2010/crl_app.vcxproj | 8 ++++---- visualc/VS2010/crypt_and_hash.vcxproj | 8 ++++---- visualc/VS2010/dh_client.vcxproj | 8 ++++---- visualc/VS2010/dh_genprime.vcxproj | 8 ++++---- visualc/VS2010/dh_server.vcxproj | 8 ++++---- visualc/VS2010/dtls_client.vcxproj | 8 ++++---- visualc/VS2010/dtls_server.vcxproj | 8 ++++---- visualc/VS2010/ecdh_curve25519.vcxproj | 8 ++++---- visualc/VS2010/ecdsa.vcxproj | 8 ++++---- visualc/VS2010/gen_entropy.vcxproj | 8 ++++---- visualc/VS2010/gen_key.vcxproj | 8 ++++---- visualc/VS2010/gen_random_ctr_drbg.vcxproj | 8 ++++---- visualc/VS2010/gen_random_havege.vcxproj | 8 ++++---- visualc/VS2010/generic_sum.vcxproj | 8 ++++---- visualc/VS2010/hello.vcxproj | 8 ++++---- visualc/VS2010/key_app.vcxproj | 8 ++++---- visualc/VS2010/key_app_writer.vcxproj | 8 ++++---- visualc/VS2010/mbedTLS.vcxproj | 8 ++++---- visualc/VS2010/mini_client.vcxproj | 8 ++++---- visualc/VS2010/mpi_demo.vcxproj | 8 ++++---- visualc/VS2010/pem2der.vcxproj | 8 ++++---- visualc/VS2010/pk_decrypt.vcxproj | 8 ++++---- visualc/VS2010/pk_encrypt.vcxproj | 8 ++++---- visualc/VS2010/pk_sign.vcxproj | 8 ++++---- visualc/VS2010/pk_verify.vcxproj | 8 ++++---- visualc/VS2010/query_compile_time_config.vcxproj | 8 ++++---- visualc/VS2010/req_app.vcxproj | 8 ++++---- visualc/VS2010/rsa_decrypt.vcxproj | 8 ++++---- visualc/VS2010/rsa_encrypt.vcxproj | 8 ++++---- visualc/VS2010/rsa_genkey.vcxproj | 8 ++++---- visualc/VS2010/rsa_sign.vcxproj | 8 ++++---- visualc/VS2010/rsa_sign_pss.vcxproj | 8 ++++---- visualc/VS2010/rsa_verify.vcxproj | 8 ++++---- visualc/VS2010/rsa_verify_pss.vcxproj | 8 ++++---- visualc/VS2010/selftest.vcxproj | 8 ++++---- visualc/VS2010/ssl_client1.vcxproj | 8 ++++---- visualc/VS2010/ssl_client2.vcxproj | 8 ++++---- visualc/VS2010/ssl_fork_server.vcxproj | 8 ++++---- visualc/VS2010/ssl_mail_client.vcxproj | 8 ++++---- visualc/VS2010/ssl_server.vcxproj | 8 ++++---- visualc/VS2010/ssl_server2.vcxproj | 8 ++++---- visualc/VS2010/strerror.vcxproj | 8 ++++---- visualc/VS2010/udp_proxy.vcxproj | 8 ++++---- visualc/VS2010/zeroize.vcxproj | 8 ++++---- 50 files changed, 197 insertions(+), 197 deletions(-) diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index 5cfefe1af8..90ab609d76 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -38,7 +38,7 @@ EOT if ($include_crypto) { $include_directories = <Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/benchmark.vcxproj b/visualc/VS2010/benchmark.vcxproj index 789c4d28f3..6191d01a09 100644 --- a/visualc/VS2010/benchmark.vcxproj +++ b/visualc/VS2010/benchmark.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/cert_app.vcxproj b/visualc/VS2010/cert_app.vcxproj index f37351702a..f09876c9e1 100644 --- a/visualc/VS2010/cert_app.vcxproj +++ b/visualc/VS2010/cert_app.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/cert_req.vcxproj b/visualc/VS2010/cert_req.vcxproj index 244dd44f8b..efec8de898 100644 --- a/visualc/VS2010/cert_req.vcxproj +++ b/visualc/VS2010/cert_req.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/cert_write.vcxproj b/visualc/VS2010/cert_write.vcxproj index 8fa76482b0..feca5a3d78 100644 --- a/visualc/VS2010/cert_write.vcxproj +++ b/visualc/VS2010/cert_write.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/crl_app.vcxproj b/visualc/VS2010/crl_app.vcxproj index cf337598f0..05836cd621 100644 --- a/visualc/VS2010/crl_app.vcxproj +++ b/visualc/VS2010/crl_app.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/crypt_and_hash.vcxproj b/visualc/VS2010/crypt_and_hash.vcxproj index 521877e5d2..946d9dd98c 100644 --- a/visualc/VS2010/crypt_and_hash.vcxproj +++ b/visualc/VS2010/crypt_and_hash.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/dh_client.vcxproj b/visualc/VS2010/dh_client.vcxproj index 1e360e4269..61381c793f 100644 --- a/visualc/VS2010/dh_client.vcxproj +++ b/visualc/VS2010/dh_client.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/dh_genprime.vcxproj b/visualc/VS2010/dh_genprime.vcxproj index d893ff3b18..90578adfd1 100644 --- a/visualc/VS2010/dh_genprime.vcxproj +++ b/visualc/VS2010/dh_genprime.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/dh_server.vcxproj b/visualc/VS2010/dh_server.vcxproj index ee24e05465..ca2bbb136f 100644 --- a/visualc/VS2010/dh_server.vcxproj +++ b/visualc/VS2010/dh_server.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/dtls_client.vcxproj b/visualc/VS2010/dtls_client.vcxproj index 2e33bf6924..5398015a5c 100644 --- a/visualc/VS2010/dtls_client.vcxproj +++ b/visualc/VS2010/dtls_client.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/dtls_server.vcxproj b/visualc/VS2010/dtls_server.vcxproj index 4c1e9eea42..2bb9d305d6 100644 --- a/visualc/VS2010/dtls_server.vcxproj +++ b/visualc/VS2010/dtls_server.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ecdh_curve25519.vcxproj b/visualc/VS2010/ecdh_curve25519.vcxproj index d082610baa..7440dbfb72 100644 --- a/visualc/VS2010/ecdh_curve25519.vcxproj +++ b/visualc/VS2010/ecdh_curve25519.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ecdsa.vcxproj b/visualc/VS2010/ecdsa.vcxproj index b9e8ca8719..e3b478b28b 100644 --- a/visualc/VS2010/ecdsa.vcxproj +++ b/visualc/VS2010/ecdsa.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/gen_entropy.vcxproj b/visualc/VS2010/gen_entropy.vcxproj index 5d50ce0be4..7135c7cc39 100644 --- a/visualc/VS2010/gen_entropy.vcxproj +++ b/visualc/VS2010/gen_entropy.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/gen_key.vcxproj b/visualc/VS2010/gen_key.vcxproj index d9b1bcc49b..321974d31b 100644 --- a/visualc/VS2010/gen_key.vcxproj +++ b/visualc/VS2010/gen_key.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/gen_random_ctr_drbg.vcxproj b/visualc/VS2010/gen_random_ctr_drbg.vcxproj index 123f57f36a..ee1991a832 100644 --- a/visualc/VS2010/gen_random_ctr_drbg.vcxproj +++ b/visualc/VS2010/gen_random_ctr_drbg.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/gen_random_havege.vcxproj b/visualc/VS2010/gen_random_havege.vcxproj index 26b4f53fdf..0911add87e 100644 --- a/visualc/VS2010/gen_random_havege.vcxproj +++ b/visualc/VS2010/gen_random_havege.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/generic_sum.vcxproj b/visualc/VS2010/generic_sum.vcxproj index 59152010d4..7e26a9f91f 100644 --- a/visualc/VS2010/generic_sum.vcxproj +++ b/visualc/VS2010/generic_sum.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/hello.vcxproj b/visualc/VS2010/hello.vcxproj index 9959b54ac4..d3c8381a92 100644 --- a/visualc/VS2010/hello.vcxproj +++ b/visualc/VS2010/hello.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/key_app.vcxproj b/visualc/VS2010/key_app.vcxproj index 6bd10ec3b4..6ba3dc9d9d 100644 --- a/visualc/VS2010/key_app.vcxproj +++ b/visualc/VS2010/key_app.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/key_app_writer.vcxproj b/visualc/VS2010/key_app_writer.vcxproj index f53be18d6d..9887ba5e0c 100644 --- a/visualc/VS2010/key_app_writer.vcxproj +++ b/visualc/VS2010/key_app_writer.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj index 8f4f0895ae..41906f5881 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj @@ -87,7 +87,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib CompileAsC @@ -104,7 +104,7 @@ Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib CompileAsC @@ -123,7 +123,7 @@ true WIN32;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -143,7 +143,7 @@ true WIN64;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/mini_client.vcxproj b/visualc/VS2010/mini_client.vcxproj index 46faa54883..fc055bf40b 100644 --- a/visualc/VS2010/mini_client.vcxproj +++ b/visualc/VS2010/mini_client.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/mpi_demo.vcxproj b/visualc/VS2010/mpi_demo.vcxproj index 5264cb43e8..13e1bb3770 100644 --- a/visualc/VS2010/mpi_demo.vcxproj +++ b/visualc/VS2010/mpi_demo.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/pem2der.vcxproj b/visualc/VS2010/pem2der.vcxproj index 1903b1e2e7..d0e9a13a4b 100644 --- a/visualc/VS2010/pem2der.vcxproj +++ b/visualc/VS2010/pem2der.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/pk_decrypt.vcxproj b/visualc/VS2010/pk_decrypt.vcxproj index c4512f91c4..5ef9201f1f 100644 --- a/visualc/VS2010/pk_decrypt.vcxproj +++ b/visualc/VS2010/pk_decrypt.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/pk_encrypt.vcxproj b/visualc/VS2010/pk_encrypt.vcxproj index 2c2b06a203..26a408857b 100644 --- a/visualc/VS2010/pk_encrypt.vcxproj +++ b/visualc/VS2010/pk_encrypt.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/pk_sign.vcxproj b/visualc/VS2010/pk_sign.vcxproj index a200c4404a..825c3337ff 100644 --- a/visualc/VS2010/pk_sign.vcxproj +++ b/visualc/VS2010/pk_sign.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/pk_verify.vcxproj b/visualc/VS2010/pk_verify.vcxproj index 832fcd005f..622b030fc6 100644 --- a/visualc/VS2010/pk_verify.vcxproj +++ b/visualc/VS2010/pk_verify.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/query_compile_time_config.vcxproj b/visualc/VS2010/query_compile_time_config.vcxproj index fbc1278d77..bb2f7ad19b 100644 --- a/visualc/VS2010/query_compile_time_config.vcxproj +++ b/visualc/VS2010/query_compile_time_config.vcxproj @@ -96,7 +96,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -118,7 +118,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -142,7 +142,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -164,7 +164,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/req_app.vcxproj b/visualc/VS2010/req_app.vcxproj index 647bc510d9..cf999512b4 100644 --- a/visualc/VS2010/req_app.vcxproj +++ b/visualc/VS2010/req_app.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_decrypt.vcxproj b/visualc/VS2010/rsa_decrypt.vcxproj index 81cbc96a29..ee431e6cfe 100644 --- a/visualc/VS2010/rsa_decrypt.vcxproj +++ b/visualc/VS2010/rsa_decrypt.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_encrypt.vcxproj b/visualc/VS2010/rsa_encrypt.vcxproj index b404cd112d..b02467ec70 100644 --- a/visualc/VS2010/rsa_encrypt.vcxproj +++ b/visualc/VS2010/rsa_encrypt.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_genkey.vcxproj b/visualc/VS2010/rsa_genkey.vcxproj index c37a3b8861..18c5d5b719 100644 --- a/visualc/VS2010/rsa_genkey.vcxproj +++ b/visualc/VS2010/rsa_genkey.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_sign.vcxproj b/visualc/VS2010/rsa_sign.vcxproj index c4c7b3973b..4dc181dfb8 100644 --- a/visualc/VS2010/rsa_sign.vcxproj +++ b/visualc/VS2010/rsa_sign.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_sign_pss.vcxproj b/visualc/VS2010/rsa_sign_pss.vcxproj index 7538d4d600..8f5868404e 100644 --- a/visualc/VS2010/rsa_sign_pss.vcxproj +++ b/visualc/VS2010/rsa_sign_pss.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_verify.vcxproj b/visualc/VS2010/rsa_verify.vcxproj index 807df85ee1..7e45480114 100644 --- a/visualc/VS2010/rsa_verify.vcxproj +++ b/visualc/VS2010/rsa_verify.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/rsa_verify_pss.vcxproj b/visualc/VS2010/rsa_verify_pss.vcxproj index a50c2b436d..856b3d0b93 100644 --- a/visualc/VS2010/rsa_verify_pss.vcxproj +++ b/visualc/VS2010/rsa_verify_pss.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/selftest.vcxproj b/visualc/VS2010/selftest.vcxproj index 10ac8fcb11..17d1343b2e 100644 --- a/visualc/VS2010/selftest.vcxproj +++ b/visualc/VS2010/selftest.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ssl_client1.vcxproj b/visualc/VS2010/ssl_client1.vcxproj index 5fecb55590..9831372919 100644 --- a/visualc/VS2010/ssl_client1.vcxproj +++ b/visualc/VS2010/ssl_client1.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ssl_client2.vcxproj b/visualc/VS2010/ssl_client2.vcxproj index b181fecc9c..dd922c047b 100644 --- a/visualc/VS2010/ssl_client2.vcxproj +++ b/visualc/VS2010/ssl_client2.vcxproj @@ -96,7 +96,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -118,7 +118,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -142,7 +142,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -164,7 +164,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ssl_fork_server.vcxproj b/visualc/VS2010/ssl_fork_server.vcxproj index 608e9895e2..29e3995630 100644 --- a/visualc/VS2010/ssl_fork_server.vcxproj +++ b/visualc/VS2010/ssl_fork_server.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ssl_mail_client.vcxproj b/visualc/VS2010/ssl_mail_client.vcxproj index 1738d253e8..6bb93e9838 100644 --- a/visualc/VS2010/ssl_mail_client.vcxproj +++ b/visualc/VS2010/ssl_mail_client.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ssl_server.vcxproj b/visualc/VS2010/ssl_server.vcxproj index 136199f807..53de5cc928 100644 --- a/visualc/VS2010/ssl_server.vcxproj +++ b/visualc/VS2010/ssl_server.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/ssl_server2.vcxproj b/visualc/VS2010/ssl_server2.vcxproj index 04e55d837d..d4629bd414 100644 --- a/visualc/VS2010/ssl_server2.vcxproj +++ b/visualc/VS2010/ssl_server2.vcxproj @@ -96,7 +96,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -118,7 +118,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -142,7 +142,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -164,7 +164,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/strerror.vcxproj b/visualc/VS2010/strerror.vcxproj index 5560361b5c..72fa639992 100644 --- a/visualc/VS2010/strerror.vcxproj +++ b/visualc/VS2010/strerror.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/udp_proxy.vcxproj b/visualc/VS2010/udp_proxy.vcxproj index 47d31b2039..79cecd237a 100644 --- a/visualc/VS2010/udp_proxy.vcxproj +++ b/visualc/VS2010/udp_proxy.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib diff --git a/visualc/VS2010/zeroize.vcxproj b/visualc/VS2010/zeroize.vcxproj index 730fcb0318..774f7f5368 100644 --- a/visualc/VS2010/zeroize.vcxproj +++ b/visualc/VS2010/zeroize.vcxproj @@ -95,7 +95,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -117,7 +117,7 @@ Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -141,7 +141,7 @@ true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib @@ -163,7 +163,7 @@ true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) -../../include;../../crypto/include +../../include;../../crypto/include;../../crypto/3rdparty/everest/include/;../../crypto/3rdparty/everest/include/everest;../../crypto/3rdparty/everest/include/everest/vs2010;../../crypto/3rdparty/everest/include/everest/kremlib From e50b9704d0fdd6208c22eeac42a3e64610455c86 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 11:03:02 +0000 Subject: [PATCH 08/42] ECDH: Fix whitespace and doxygen comment --- include/mbedtls/config.h | 2 +- programs/test/benchmark.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) mode change 100755 => 100644 programs/test/benchmark.c diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 5443dd2958..1e289329aa 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -3576,7 +3576,7 @@ */ //#define MBEDTLS_PLATFORM_GMTIME_R_ALT -/* +/** * \def MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED * * Enable the verified implementations of crypto primitives diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100755 new mode 100644 index ba2c9370a5..a808a84b6a --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -988,7 +988,7 @@ int main( int argc, char *argv[] ) } #endif -#if defined(MBEDTLS_ECDH_C) +#if defined(MBEDTLS_ECDH_C) if( todo.ecdh ) { mbedtls_ecdh_context ecdh_srv, ecdh_cli; From f4bee2fbf7a4cfbbaac3be84649823805522213f Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 11:46:43 +0000 Subject: [PATCH 09/42] ECDH: Use LOCAL_CFLAGS instead of CFLAGS --- library/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index a757752288..359d510df8 100644 --- a/library/Makefile +++ b/library/Makefile @@ -19,7 +19,7 @@ endif # CFLAGS += -D_BSD_EXTENSION # Include directories for Everest code -CFLAGS+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib +LOCAL_CFLAGS+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib # if were running on Windows build for Windows ifdef WINDOWS From 3dca1a405a65ef8159efc004be89de321eb0f726 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 11:54:59 +0000 Subject: [PATCH 10/42] ECDH: Fix error checks in benchmark.c --- programs/test/benchmark.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) mode change 100644 => 100755 programs/test/benchmark.c diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100644 new mode 100755 index a808a84b6a..0d4837f604 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -225,6 +225,14 @@ static int myrand( void *rng_state, unsigned char *output, size_t len ) return( 0 ); } +#if defined(MBEDTLS_ECDH_C) +static void check( int r ) +{ + if( r != 0 ) + mbedtls_exit( 1 ); +} +#endif + /* * Clear some memory that was used to prepare the context */ @@ -1003,8 +1011,8 @@ int main( int argc, char *argv[] ) { mbedtls_ecdh_init( &ecdh_srv ); mbedtls_ecdh_init( &ecdh_cli ); - mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ); - mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ); + check( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); + check( mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ) ); #if defined(MBEDTLS_ECDH_LEGACY_CONTEXT) if (mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id) != 0 || @@ -1023,15 +1031,15 @@ int main( int argc, char *argv[] ) mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "full handshake", const unsigned char * p_srv = buf_srv; - ret |= mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ); + check( mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); - ret |= mbedtls_ecdh_read_params( &ecdh_cli, &p_srv, p_srv + olen ); - ret |= mbedtls_ecdh_make_public( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ); + check( mbedtls_ecdh_read_params( &ecdh_cli, &p_srv, p_srv + olen ) ); + check( mbedtls_ecdh_make_public( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); - ret |= mbedtls_ecdh_read_public( &ecdh_srv, buf_cli, olen ); - ret |= mbedtls_ecdh_calc_secret( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ); + check( mbedtls_ecdh_read_public( &ecdh_srv, buf_cli, olen ) ); + check( mbedtls_ecdh_calc_secret( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); - ret |= mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ); + check( mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); ); mbedtls_ecdh_free( &ecdh_srv ); From e14c779615c5690179beedd289a86fc2c4f01bb9 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 12:36:10 +0000 Subject: [PATCH 11/42] ECDH: Everest: Remove unnecessary file --- library/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index 359d510df8..72091b06db 100644 --- a/library/Makefile +++ b/library/Makefile @@ -77,7 +77,6 @@ OBJS_CRYPTO+= \ ../3rdparty/everest/library/everest.o \ ../3rdparty/everest/library/Hacl_Curve25519.o \ ../3rdparty/everest/library/x25519.o \ - ../3rdparty/everest/library/kremlib/fstar_uint128.o \ ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o OBJS_X509= certs.o pkcs11.o x509.o \ From 89f36aeb2a06c528bb247ee284d3120c717583f1 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 13:07:50 +0000 Subject: [PATCH 12/42] Add new 3rdparty build scripts --- CMakeLists.txt | 1 + library/CMakeLists.txt | 11 +---------- library/Makefile | 14 ++++---------- 3 files changed, 6 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9ab1f3f9c5..b9d2d81470 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,7 @@ if(ENABLE_ZLIB_SUPPORT) endif(ZLIB_FOUND) endif(ENABLE_ZLIB_SUPPORT) +add_subdirectory(3rdparty) add_subdirectory(library) add_subdirectory(include) add_subdirectory(crypto/library) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index d1cf26fef7..afabdf7d52 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -64,18 +64,9 @@ set(src_crypto version.c version_features.c xtea.c + ${src_thirdparty} ) -set(src_everest - ../3rdparty/everest/library/everest.c - ../3rdparty/everest/library/Hacl_Curve25519.c - ../3rdparty/everest/library/x25519.c - ../3rdparty/everest/library/kremlib/fstar_uint128.c - ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.c -) - -set(src_crypto ${src_crypto} ${src_everest}) - set(src_x509 certs.c pkcs11.c diff --git a/library/Makefile b/library/Makefile index 72091b06db..4a2479c363 100644 --- a/library/Makefile +++ b/library/Makefile @@ -18,9 +18,6 @@ endif # To compile on Plan9: # CFLAGS += -D_BSD_EXTENSION -# Include directories for Everest code -LOCAL_CFLAGS+=-I../3rdparty/everest/include -I../3rdparty/everest/include/everest -I../3rdparty/everest/include/everest/kremlib - # if were running on Windows build for Windows ifdef WINDOWS WINDOWS_BUILD=1 @@ -73,12 +70,6 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ -OBJS_CRYPTO+= \ - ../3rdparty/everest/library/everest.o \ - ../3rdparty/everest/library/Hacl_Curve25519.o \ - ../3rdparty/everest/library/x25519.o \ - ../3rdparty/everest/library/kremlib/FStar_UInt64_FStar_UInt32_FStar_UInt16_FStar_UInt8.o - OBJS_X509= certs.o pkcs11.o x509.o \ x509_create.o x509_crl.o x509_crt.o \ x509_csr.o x509write_crt.o x509write_csr.o @@ -89,6 +80,10 @@ OBJS_TLS= debug.o net_sockets.o \ ssl_srv.o ssl_ticket.o \ ssl_tls.o +include ../3rdparty/Makefile.inc +LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) +OBJS_CRYPTO+=$(THIRDPARTY_OBJECTS) + .SILENT: .PHONY: all static shared clean @@ -170,4 +165,3 @@ ifndef WINDOWS else del /Q /F *.o libmbed* $(OBJS_CRYPTO) endif - From 346932a099661517444a28db06500cd8eb3b6d64 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 13:18:52 +0000 Subject: [PATCH 13/42] Fix preprocessor directive recognition in list-enum-consts.pl --- tests/scripts/list-enum-consts.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/list-enum-consts.pl b/tests/scripts/list-enum-consts.pl index 65cec3f153..fe2f512c90 100755 --- a/tests/scripts/list-enum-consts.pl +++ b/tests/scripts/list-enum-consts.pl @@ -22,7 +22,7 @@ while (<>) $state = 'in'; } elsif( $state eq 'in' and /}/ ) { $state = 'out'; - } elsif( $state eq 'in' and not (/^#if/ or /#endif/)) { + } elsif( $state eq 'in' and not /^#/) { s/=.*//; s!/\*.*!!; s/,.*//; s/\s+//g; chomp; push @consts, $_ if $_; } From 9b33e7d7d7426e3d7f27cd7d206765ae33e3e61f Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 14 Dec 2018 13:34:06 +0000 Subject: [PATCH 14/42] ECDH: Exclude FStar and Hacl* from exported symbol checks --- tests/scripts/list-symbols.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/scripts/list-symbols.sh b/tests/scripts/list-symbols.sh index 930722c1bb..6ecc199bf8 100755 --- a/tests/scripts/list-symbols.sh +++ b/tests/scripts/list-symbols.sh @@ -30,9 +30,9 @@ if [ -n "$make_ret" ]; then fi if uname | grep -F Darwin >/dev/null; then - nm -gUj library/libmbed*.a 2>/dev/null | sed -n -e 's/^_//p' + nm -gUj library/libmbed*.a 2>/dev/null | sed -n -e 's/^_//p' | grep -v -e ^FStar -e ^Hacl elif uname | grep -F Linux >/dev/null; then - nm -og library/libmbed*.a | grep -v '^[^ ]*: *U \|^$\|^[^ ]*:$' | sed 's/^[^ ]* . //' + nm -og library/libmbed*.a | grep -v '^[^ ]*: *U \|^$\|^[^ ]*:$' | sed 's/^[^ ]* . //' | grep -v -e ^FStar -e ^Hacl fi | sort > exported-symbols make clean From 6a1a9e468d642a63689d4818546dc1be1bad8aec Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Mon, 7 Jan 2019 13:47:30 +0000 Subject: [PATCH 15/42] ECDSA: Add mbedtls_ecdsa_can_do --- programs/test/benchmark.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 0d4837f604..a53851acbf 100755 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -835,6 +835,9 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { + if( mbedtls_ecdsa_can_do( curve_info->grp_id ) == 0 ) + continue; + mbedtls_ecdsa_init( &ecdsa ); if( mbedtls_ecdsa_genkey( &ecdsa, curve_info->grp_id, myrand, NULL ) != 0 ) @@ -854,6 +857,9 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { + if( mbedtls_ecdsa_can_do( curve_info->grp_id ) == 0 ) + continue; + mbedtls_ecdsa_init( &ecdsa ); if( mbedtls_ecdsa_genkey( &ecdsa, curve_info->grp_id, myrand, NULL ) != 0 || From b33e811f2d274629e75745fd71601320e6a68268 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Mon, 7 Jan 2019 14:12:25 +0000 Subject: [PATCH 16/42] ECDH: Fix file permission problem --- programs/test/benchmark.c | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 programs/test/benchmark.c diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100755 new mode 100644 From 6cddd30beb527eff948a2bc4a32710db2aea2ea9 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 17 Jan 2019 12:17:54 +0000 Subject: [PATCH 17/42] ECDH: Disable Everest by default --- include/mbedtls/config.h | 2 +- scripts/config.pl | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index 1e289329aa..b14a32441d 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -3585,7 +3585,7 @@ * MBEDTLS_ECDH_LEGACY_CONTEXT). * */ -#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED +//#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED /* \} name SECTION: Customisation configuration options */ diff --git a/scripts/config.pl b/scripts/config.pl index 5b13fc9e84..394258465b 100755 --- a/scripts/config.pl +++ b/scripts/config.pl @@ -104,6 +104,7 @@ MBEDTLS_NO_64BIT_MULTIPLICATION MBEDTLS_PSA_CRYPTO_SPM MBEDTLS_PSA_INJECT_ENTROPY MBEDTLS_ECP_RESTARTABLE +MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED _ALT\s*$ ); From 181f284e39a66b07e39b78a9bf6f120ea0c4db13 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Thu, 17 Jan 2019 13:40:58 +0000 Subject: [PATCH 18/42] config.h: Silence missing documentation warning --- include/mbedtls/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index b14a32441d..5fd50edb8a 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -3577,8 +3577,6 @@ //#define MBEDTLS_PLATFORM_GMTIME_R_ALT /** - * \def MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED - * * Enable the verified implementations of crypto primitives * from Project Everest (currently only Curve25519). * This feature breaks ECDH backward compatibility (see also From 655ddababa5ca68eb00fb0229b7ce580182d1af2 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Mon, 21 Jan 2019 17:26:19 +0000 Subject: [PATCH 19/42] 3rdparty: Add additional build facilities for 3rd-party code --- CMakeLists.txt | 6 +++++- include/CMakeLists.txt | 3 +-- library/CMakeLists.txt | 3 ++- programs/Makefile | 3 ++- tests/Makefile | 3 ++- 5 files changed, 12 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b9d2d81470..57b4b3acdf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,7 +181,7 @@ else() set(LIB_INSTALL_DIR lib) endif() -include_directories(include/ 3rdparty/everest/include/ 3rdparty/everest/include/everest/ 3rdparty/everest/include/everest/kremlin/ 3rdparty/everest/include/everest/kremlib/) +include_directories(include/) if(ENABLE_ZLIB_SUPPORT) find_package(ZLIB) @@ -192,6 +192,10 @@ if(ENABLE_ZLIB_SUPPORT) endif(ENABLE_ZLIB_SUPPORT) add_subdirectory(3rdparty) +include_directories(${thirdparty_inc}) +list(APPEND libs ${thirdparty_lib}) +add_definitions(${thirdparty_def}) + add_subdirectory(library) add_subdirectory(include) add_subdirectory(crypto/library) diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index ef33fe8286..c2f2bd4e6f 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -3,9 +3,8 @@ option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON) if(INSTALL_MBEDTLS_HEADERS) file(GLOB headers "mbedtls/*.h") - file(GLOB headers_everest "../3rdparty/everest/include/*.h") - install(FILES ${headers} ${headers_everest} + install(FILES ${headers} DESTINATION include/mbedtls PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index afabdf7d52..2afbfd730c 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -64,9 +64,10 @@ set(src_crypto version.c version_features.c xtea.c - ${src_thirdparty} ) +list(APPEND src_crypto ${thirdparty_src}) + set(src_x509 certs.c pkcs11.c diff --git a/programs/Makefile b/programs/Makefile index f094877126..0e4f7d628c 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -18,7 +18,8 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include LOCAL_CXXFLAGS += -I../crypto/include -LOCAL_CFLAGS+=-I../3rdparty/everest/include +include ../3rdparty/Makefile.inc +LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) ifndef SHARED DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a diff --git a/tests/Makefile b/tests/Makefile index d1c265e528..3857778e7c 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -16,7 +16,8 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ -LOCAL_CFLAGS+=-I../3rdparty/everest/include +include ../3rdparty/Makefile.inc +LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) # Enable definition of various functions used throughout the testsuite # (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless From 21411d2b79ee25988ade21f4088795dc5cfc0276 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Wed, 6 Feb 2019 18:06:15 +0000 Subject: [PATCH 20/42] ECDH: Make benchmarks check MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED --- programs/test/benchmark.c | 127 +++++++++++++++++++------------------- 1 file changed, 62 insertions(+), 65 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index a53851acbf..e90ef2de7a 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -190,7 +190,12 @@ do { \ CODE; \ } \ \ - if( ret != 0 ) \ + if( ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED ) \ + { \ + mbedtls_printf( "Feature Not Supported. Skipping.\n" ); \ + ret = 0; \ + } \ + else if( ret != 0 ) \ { \ PRINT_ERROR; \ } \ @@ -225,13 +230,17 @@ static int myrand( void *rng_state, unsigned char *output, size_t len ) return( 0 ); } -#if defined(MBEDTLS_ECDH_C) -static void check( int r ) -{ - if( r != 0 ) - mbedtls_exit( 1 ); -} -#endif +#define CHECK_AND_CONTINUE( R ) \ + { \ + int ret = ( R ); \ + if( ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED ) { \ + mbedtls_printf( "Feature not supported. Skipping.\n" ); \ + continue; \ + } \ + else if( ret != 0 ) { \ + mbedtls_exit( 1 ); \ + } \ + } /* * Clear some memory that was used to prepare the context @@ -904,22 +913,19 @@ int main( int argc, char *argv[] ) { mbedtls_ecdh_init( &ecdh ); - if( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) != 0 || - mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), - myrand, NULL ) != 0 || - mbedtls_ecp_copy( &ecdh.Qp, &ecdh.Q ) != 0 ) - { - mbedtls_exit( 1 ); - } + CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), + myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecp_copy( &ecdh.Qp, &ecdh.Q ) ); ecp_clear_precomputed( &ecdh.grp ); mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "handshake", - ret |= mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), - myrand, NULL ); - ret |= mbedtls_ecdh_calc_secret( &ecdh, &olen, buf, sizeof( buf ), + CHECK_AND_CONTINUE( mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh, &olen, buf, sizeof( buf ), + myrand, NULL ) ) ); mbedtls_ecdh_free( &ecdh ); } @@ -931,19 +937,16 @@ int main( int argc, char *argv[] ) mbedtls_ecdh_init( &ecdh ); mbedtls_mpi_init( &z ); - if( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) != 0 || - mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Qp, myrand, NULL ) != 0 ) - { - mbedtls_exit( 1 ); - } + CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Qp, myrand, NULL ) ); mbedtls_snprintf( title, sizeof(title), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "handshake", - ret |= mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Q, - myrand, NULL ); - ret |= mbedtls_ecdh_compute_shared( &ecdh.grp, &z, &ecdh.Qp, &ecdh.d, - myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Q, + myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_compute_shared( &ecdh.grp, &z, &ecdh.Qp, &ecdh.d, + myrand, NULL ) ) ); mbedtls_ecdh_free( &ecdh ); mbedtls_mpi_free( &z ); @@ -955,22 +958,19 @@ int main( int argc, char *argv[] ) { mbedtls_ecdh_init( &ecdh ); - if( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) != 0 || - mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), - myrand, NULL ) != 0 || - mbedtls_ecp_copy( &ecdh.Qp, &ecdh.Q ) != 0 || - mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), - myrand, NULL ) != 0 ) - { - mbedtls_exit( 1 ); - } + CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), + myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecp_copy( &ecdh.Qp, &ecdh.Q ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_make_public( &ecdh, &olen, buf, sizeof( buf), + myrand, NULL ) ); ecp_clear_precomputed( &ecdh.grp ); mbedtls_snprintf( title, sizeof( title ), "ECDH-%s", curve_info->name ); TIME_PUBLIC( title, "handshake", - ret |= mbedtls_ecdh_calc_secret( &ecdh, &olen, buf, sizeof( buf ), - myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh, &olen, buf, sizeof( buf ), + myrand, NULL ) ) ); mbedtls_ecdh_free( &ecdh ); } @@ -982,19 +982,16 @@ int main( int argc, char *argv[] ) mbedtls_ecdh_init( &ecdh ); mbedtls_mpi_init( &z ); - if( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) != 0 || - mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Qp, - myrand, NULL ) != 0 || - mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Q, myrand, NULL ) != 0 ) - { - mbedtls_exit( 1 ); - } + CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Qp, + myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh.grp, &ecdh.d, &ecdh.Q, myrand, NULL ) ); mbedtls_snprintf( title, sizeof(title), "ECDH-%s", curve_info->name ); TIME_PUBLIC( title, "handshake", - ret |= mbedtls_ecdh_compute_shared( &ecdh.grp, &z, &ecdh.Qp, &ecdh.d, - myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_compute_shared( &ecdh.grp, &z, &ecdh.Qp, &ecdh.d, + myrand, NULL ) ) ); mbedtls_ecdh_free( &ecdh ); mbedtls_mpi_free( &z ); @@ -1017,35 +1014,35 @@ int main( int argc, char *argv[] ) { mbedtls_ecdh_init( &ecdh_srv ); mbedtls_ecdh_init( &ecdh_cli ); - check( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); - check( mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ) ); #if defined(MBEDTLS_ECDH_LEGACY_CONTEXT) - if (mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id) != 0 || - mbedtls_ecdh_gen_public(&ecdh_srv.grp, - &ecdh_srv.d, - &ecdh_srv.Q, myrand, NULL) != 0) + CHECK_AND_CONTINUE( mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id)); + CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public(&ecdh_srv.grp, + &ecdh_srv.d, + &ecdh_srv.Q, myrand, NULL)); #else - if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 && ( - mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id ) != 0 || - mbedtls_ecdh_gen_public( &ecdh_srv.ctx.mbed_ecdh.grp, - &ecdh_srv.ctx.mbed_ecdh.d, - &ecdh_srv.ctx.mbed_ecdh.Q, myrand, NULL ) != 0 )) + if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 ) { + CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id )); + CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh_srv.ctx.mbed_ecdh.grp, + &ecdh_srv.ctx.mbed_ecdh.d, + &ecdh_srv.ctx.mbed_ecdh.Q, myrand, NULL )); + } #endif - mbedtls_exit( 1 ); mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "full handshake", const unsigned char * p_srv = buf_srv; - check( mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); - check( mbedtls_ecdh_read_params( &ecdh_cli, &p_srv, p_srv + olen ) ); - check( mbedtls_ecdh_make_public( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_read_params( &ecdh_cli, &p_srv, p_srv + olen ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_make_public( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); - check( mbedtls_ecdh_read_public( &ecdh_srv, buf_cli, olen ) ); - check( mbedtls_ecdh_calc_secret( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_read_public( &ecdh_srv, buf_cli, olen ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); - check( mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); + CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); ); mbedtls_ecdh_free( &ecdh_srv ); From b14c4a533da1a433e2f354753b3e7429ef475d61 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 11 Feb 2019 18:23:42 +0100 Subject: [PATCH 21/42] Fix build with gcc -Wshadow --- programs/test/benchmark.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index e90ef2de7a..7524f5cb45 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -232,12 +232,12 @@ static int myrand( void *rng_state, unsigned char *output, size_t len ) #define CHECK_AND_CONTINUE( R ) \ { \ - int ret = ( R ); \ - if( ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED ) { \ + int CHECK_AND_CONTINUE_ret = ( R ); \ + if( CHECK_AND_CONTINUE_ret == MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED ) { \ mbedtls_printf( "Feature not supported. Skipping.\n" ); \ continue; \ } \ - else if( ret != 0 ) { \ + else if( CHECK_AND_CONTINUE_ret != 0 ) { \ mbedtls_exit( 1 ); \ } \ } From c6c7c49fd6a5daea203ef8e86a91bb59eeef663b Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 11 Feb 2019 18:41:27 +0100 Subject: [PATCH 22/42] Add mbedtls_ecdh_can_do All curves can currently do ECDH, but to make the API symmetric and future-proof, add mbedtls_ecdh_can_do() to go with mbedtls_ecdsa_can_do(). --- programs/test/benchmark.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 7524f5cb45..502b15d9ab 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -911,6 +911,9 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { + if( ! mbedtls_ecdh_can_do( curve_info->grp_id ) ) + continue; + mbedtls_ecdh_init( &ecdh ); CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) ); @@ -956,6 +959,9 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { + if( ! mbedtls_ecdh_can_do( curve_info->grp_id ) ) + continue; + mbedtls_ecdh_init( &ecdh ); CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh.grp, curve_info->grp_id ) ); @@ -1012,6 +1018,9 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { + if( ! mbedtls_ecdh_can_do( curve_info->grp_id ) ) + continue; + mbedtls_ecdh_init( &ecdh_srv ); mbedtls_ecdh_init( &ecdh_cli ); CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); From 7e65c05bb036c510c4e3df49c67e98116d3858e2 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 11 Feb 2019 18:43:55 +0100 Subject: [PATCH 23/42] Document that curve lists can include partially-supported curves Document that a curve returned by mbedtls_ecp_curve_list() or mbedtls_ecp_grp_id_list() may lack support for ECDH or ECDSA. Add a corresponding changelog entry, under "API Changes" because we have changed the behavior: formerly, these functions skipped ECDH-only curves, although this was not documented. --- ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ChangeLog b/ChangeLog index 77d9d81cde..b1ed23dbee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -286,6 +286,11 @@ API Changes that it is now optional with the MBEDTLS_CHECK_PARAMS flag which by default is off. That means that checks which were previously present by default will no longer be. + * The functions mbedtls_ecp_curve_list() and mbedtls_ecp_grp_id_list() now + list all curves for which at least one of ECDH or ECDSA is supported, not + just curves for which both are supported. Call mbedtls_ecdsa_can_do() or + mbedtls_ecdh_can_do() on each result to check whether each algorithm is + supported. New deprecations * Deprecate mbedtls_ctr_drbg_update and mbedtls_hmac_drbg_update From 0a92cc1f5c4410fa6320a179526d6421cdcf2a89 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Mon, 11 Feb 2019 18:45:49 +0100 Subject: [PATCH 24/42] Add a changelog entry for Everest ECDH (X25519) --- ChangeLog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/ChangeLog b/ChangeLog index b1ed23dbee..7b032da3e3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -118,6 +118,13 @@ Features changed its IP or port. The feature is enabled at compile-time by setting MBEDTLS_SSL_DTLS_CONNECTION_ID (disabled by default), and at run-time through the new APIs mbedtls_ssl_conf_cid() and mbedtls_ssl_set_cid(). + * New implementation of X25519 (ECDH using Curve25519) from Project Everest + (https://project-everest.github.io/). It can be enabled at compile time + with MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED. This implementation is formally + verified and significantly faster, but is only supported on x86 platforms + (32-bit and 64-bit) using GCC, Clang or Visual Studio. Contributed by + Christoph Wintersteiger from Microsoft Research. + API Changes * Extend the MBEDTLS_SSL_EXPORT_KEYS to export the handshake randbytes, From 8cd4fba7777d01020b8c1c90815e4d823304890e Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 12:34:40 +0000 Subject: [PATCH 25/42] ECDSA: Refactor return value checks for mbedtls_ecdsa_can_do --- programs/test/benchmark.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) mode change 100644 => 100755 programs/test/benchmark.c diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100644 new mode 100755 index 502b15d9ab..7cdff10b1c --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -844,7 +844,7 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { - if( mbedtls_ecdsa_can_do( curve_info->grp_id ) == 0 ) + if( ! mbedtls_ecdsa_can_do( curve_info->grp_id ) ) continue; mbedtls_ecdsa_init( &ecdsa ); @@ -866,7 +866,7 @@ int main( int argc, char *argv[] ) curve_info->grp_id != MBEDTLS_ECP_DP_NONE; curve_info++ ) { - if( mbedtls_ecdsa_can_do( curve_info->grp_id ) == 0 ) + if( ! mbedtls_ecdsa_can_do( curve_info->grp_id ) ) continue; mbedtls_ecdsa_init( &ecdsa ); From 37eb90617ad8ce498d50aa4e05e045fa1c55041c Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 12:39:21 +0000 Subject: [PATCH 26/42] 3rdparty: Fix Makefile coding conventions --- tests/scripts/check-files.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/scripts/check-files.py b/tests/scripts/check-files.py index 255bed8b93..6e35f52241 100755 --- a/tests/scripts/check-files.py +++ b/tests/scripts/check-files.py @@ -144,6 +144,7 @@ class TabIssueTracker(LineIssueTracker): heading = "Tabs present:" files_exemptions = frozenset([ "Makefile", + "Makefile.inc", "generate_visualc_files.pl", ]) @@ -181,7 +182,7 @@ class IntegrityChecker(object): self.setup_logger(log_file) self.files_to_check = ( ".c", ".h", ".sh", ".pl", ".py", ".md", ".function", ".data", - "Makefile", "CMakeLists.txt", "ChangeLog" + "Makefile", "Makefile.inc", "CMakeLists.txt", "ChangeLog" ) self.excluded_directories = ['.git', 'mbed-os'] self.excluded_paths = list(map(os.path.normpath, [ From 50d9f095ec0e5beebfa9cf6b796dec17505a4e13 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 12:49:27 +0000 Subject: [PATCH 27/42] 3rdparty: Update description of MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED --- include/mbedtls/config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) mode change 100644 => 100755 include/mbedtls/config.h diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h old mode 100644 new mode 100755 index 5fd50edb8a..6348735229 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -3577,11 +3577,11 @@ //#define MBEDTLS_PLATFORM_GMTIME_R_ALT /** - * Enable the verified implementations of crypto primitives - * from Project Everest (currently only Curve25519). - * This feature breaks ECDH backward compatibility (see also - * MBEDTLS_ECDH_LEGACY_CONTEXT). - * + * Enable the verified implementations of ECDH primitives from Project Everest + * (currently only Curve25519). This feature changes the layout of ECDH + * contexts and therefore is a compatibility break for applications that access + * fields of a mbedtls_ecdh_context structure directly. See also + * MBEDTLS_ECDH_LEGACY_CONTEXT in include/mbedtls/ecdh.h. */ //#define MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED From 54d09ad0dfde5ccff61e541bb29670aeba9ad548 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 13:35:04 +0000 Subject: [PATCH 28/42] 3rdparty: Rename THIRDPARTY_OBJECTS --- library/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/Makefile b/library/Makefile index 4a2479c363..152909341f 100644 --- a/library/Makefile +++ b/library/Makefile @@ -82,7 +82,7 @@ OBJS_TLS= debug.o net_sockets.o \ include ../3rdparty/Makefile.inc LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) -OBJS_CRYPTO+=$(THIRDPARTY_OBJECTS) +OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS) .SILENT: From e1dfc9884a24909872f2bcda27e0d886b2503c55 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 13:46:31 +0000 Subject: [PATCH 29/42] Fix file permissions --- include/mbedtls/config.h | 0 programs/test/benchmark.c | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 include/mbedtls/config.h mode change 100755 => 100644 programs/test/benchmark.c diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h old mode 100755 new mode 100644 diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c old mode 100755 new mode 100644 From ed5f3f063fd415012173b01e6922479a34d830e8 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 17:21:04 +0000 Subject: [PATCH 30/42] ECDH: Fix Everest x25519 make_public --- programs/test/benchmark.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 7cdff10b1c..244174ddf4 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -1028,16 +1028,9 @@ int main( int argc, char *argv[] ) #if defined(MBEDTLS_ECDH_LEGACY_CONTEXT) CHECK_AND_CONTINUE( mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id)); - CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public(&ecdh_srv.grp, - &ecdh_srv.d, - &ecdh_srv.Q, myrand, NULL)); #else - if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 ) { + if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 ) CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id )); - CHECK_AND_CONTINUE( mbedtls_ecdh_gen_public( &ecdh_srv.ctx.mbed_ecdh.grp, - &ecdh_srv.ctx.mbed_ecdh.d, - &ecdh_srv.ctx.mbed_ecdh.Q, myrand, NULL )); - } #endif mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); From 1a2d9f7f4149b37c9586a9a9f4a303f16f102b6e Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 15 Feb 2019 19:04:26 +0000 Subject: [PATCH 31/42] ECDH: Removed unnecessary calls to mbedtls_ecp_group_load in ECDH benchmark --- programs/test/benchmark.c | 7 ------- 1 file changed, 7 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 244174ddf4..e05470a8ae 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -1026,13 +1026,6 @@ int main( int argc, char *argv[] ) CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ) ); -#if defined(MBEDTLS_ECDH_LEGACY_CONTEXT) - CHECK_AND_CONTINUE( mbedtls_ecp_group_load(&ecdh_srv.grp, curve_info->grp_id)); -#else - if( ecdh_srv.var == MBEDTLS_ECDH_VARIANT_MBEDTLS_2_0 ) - CHECK_AND_CONTINUE( mbedtls_ecp_group_load( &ecdh_srv.ctx.mbed_ecdh.grp, curve_info->grp_id )); -#endif - mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "full handshake", const unsigned char * p_srv = buf_srv; From 5d536cd814d60e061e1d791a675b87e754d52f02 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Wed, 20 Feb 2019 17:26:42 +0000 Subject: [PATCH 32/42] ECDH: Fix use of ECDH API in full handshake benchmark --- programs/test/benchmark.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index e05470a8ae..ada42df996 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -1022,13 +1022,13 @@ int main( int argc, char *argv[] ) continue; mbedtls_ecdh_init( &ecdh_srv ); - mbedtls_ecdh_init( &ecdh_cli ); - CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); - CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_cli, curve_info->grp_id ) ); + mbedtls_ecdh_init( &ecdh_cli ); mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "full handshake", const unsigned char * p_srv = buf_srv; + + CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); CHECK_AND_CONTINUE( mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); CHECK_AND_CONTINUE( mbedtls_ecdh_read_params( &ecdh_cli, &p_srv, p_srv + olen ) ); @@ -1038,10 +1038,11 @@ int main( int argc, char *argv[] ) CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); + mbedtls_ecdh_free( &ecdh_cli ); + + mbedtls_ecdh_free( &ecdh_srv ); ); - mbedtls_ecdh_free( &ecdh_srv ); - mbedtls_ecdh_free( &ecdh_cli ); } } #endif From cc91fe2667f5c550ebb40a1a9ab0d92f5e8636ac Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Wed, 20 Feb 2019 18:06:00 +0000 Subject: [PATCH 33/42] ECDH: Fix inclusion of platform.h for proper use of MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED --- programs/test/benchmark.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index ada42df996..fc84f5756e 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -25,9 +25,8 @@ #include MBEDTLS_CONFIG_FILE #endif -#if defined(MBEDTLS_PLATFORM_C) #include "mbedtls/platform.h" -#else +#if !defined(MBEDTLS_PLATFORM_C) #include #include #define mbedtls_exit exit From 12f359f7daa4307840d05d34b206cbf31c12d869 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Tue, 26 Feb 2019 12:26:04 +0000 Subject: [PATCH 34/42] Fix trailing whitespace --- programs/test/benchmark.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index fc84f5756e..74fcaa6736 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -1021,12 +1021,12 @@ int main( int argc, char *argv[] ) continue; mbedtls_ecdh_init( &ecdh_srv ); - mbedtls_ecdh_init( &ecdh_cli ); + mbedtls_ecdh_init( &ecdh_cli ); mbedtls_snprintf( title, sizeof( title ), "ECDHE-%s", curve_info->name ); TIME_PUBLIC( title, "full handshake", const unsigned char * p_srv = buf_srv; - + CHECK_AND_CONTINUE( mbedtls_ecdh_setup( &ecdh_srv, curve_info->grp_id ) ); CHECK_AND_CONTINUE( mbedtls_ecdh_make_params( &ecdh_srv, &olen, buf_srv, sizeof( buf_srv ), myrand, NULL ) ); @@ -1038,7 +1038,7 @@ int main( int argc, char *argv[] ) CHECK_AND_CONTINUE( mbedtls_ecdh_calc_secret( &ecdh_cli, &olen, buf_cli, sizeof( buf_cli ), myrand, NULL ) ); mbedtls_ecdh_free( &ecdh_cli ); - + mbedtls_ecdh_free( &ecdh_srv ); ); From 015f55b5580690229085b54f863eb55b0243a24e Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Mon, 8 Apr 2019 17:00:34 +0100 Subject: [PATCH 35/42] 3rdparty: Fix inclusion order of CMakeLists.txt This is so that third-party modules pick up the INSTALL_MBEDTLS_HEADERS variable. --- CMakeLists.txt | 2 -- 1 file changed, 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 57b4b3acdf..6292c52769 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -181,8 +181,6 @@ else() set(LIB_INSTALL_DIR lib) endif() -include_directories(include/) - if(ENABLE_ZLIB_SUPPORT) find_package(ZLIB) From 3669c80a9011af8dc514ed18936eccdc86401971 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Fri, 12 Apr 2019 18:01:08 +0100 Subject: [PATCH 36/42] Update generated files --- programs/ssl/query_config.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/programs/ssl/query_config.c b/programs/ssl/query_config.c index 361ec00004..71693c7879 100644 --- a/programs/ssl/query_config.c +++ b/programs/ssl/query_config.c @@ -2650,6 +2650,14 @@ int query_config( const char *config ) } #endif /* MBEDTLS_PLATFORM_GMTIME_R_ALT */ +#if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) + if( strcmp( "MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED", config ) == 0 ) + { + MACRO_EXPANSION_TO_STR( MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED ); + return( 0 ); + } +#endif /* MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED */ + /* If the symbol is not found, return an error */ return( 1 ); } From 9e8076ffdc9aa4ebcefc6865224cf4cb0d589d79 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Mon, 15 Apr 2019 11:09:00 +0100 Subject: [PATCH 37/42] Fix macros in benchmark.c #2124 may suffer from the same problem. --- programs/test/benchmark.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 74fcaa6736..b005c203af 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -31,11 +31,7 @@ #include #define mbedtls_exit exit #define mbedtls_printf printf -#define mbedtls_snprintf snprintf #define mbedtls_free free -#define mbedtls_exit exit -#define MBEDTLS_EXIT_SUCCESS EXIT_SUCCESS -#define MBEDTLS_EXIT_FAILURE EXIT_FAILURE #endif #if !defined(MBEDTLS_TIMING_C) From 9c1b56b43a7a44431e69c26599b57ada86f049a3 Mon Sep 17 00:00:00 2001 From: "Christoph M. Wintersteiger" Date: Mon, 15 Apr 2019 11:09:33 +0100 Subject: [PATCH 38/42] 3rdparty: Add config checks for Everest --- include/mbedtls/check_config.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/mbedtls/check_config.h b/include/mbedtls/check_config.h index 04c8eba26c..1bf4229f03 100644 --- a/include/mbedtls/check_config.h +++ b/include/mbedtls/check_config.h @@ -130,6 +130,11 @@ #error "MBEDTLS_ECP_RESTARTABLE defined, but not MBEDTLS_ECDH_LEGACY_CONTEXT" #endif +#if defined(MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED) && \ + defined(MBEDTLS_ECDH_LEGACY_CONTEXT) +#error "MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED defined, but MBEDTLS_ECDH_LEGACY_CONTEXT not disabled" +#endif + #if defined(MBEDTLS_ECDSA_DETERMINISTIC) && !defined(MBEDTLS_HMAC_DRBG_C) #error "MBEDTLS_ECDSA_DETERMINISTIC defined, but not all prerequisites" #endif From 0c6b79979c7d55dd96cdab2e304142467a424ec1 Mon Sep 17 00:00:00 2001 From: Gilles Peskine Date: Fri, 12 Apr 2019 20:29:48 +0200 Subject: [PATCH 39/42] Add Everest components to all.sh Test a native build and a 32-bit build. For variety, the native build is with CMake and clang, and the 32-bit build is with GNU make and gcc. --- tests/scripts/all.sh | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index 903739421c..abfef490bb 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -709,6 +709,24 @@ component_test_rsa_no_crt () { if_build_succeeded tests/compat.sh -t RSA } +component_test_everest () { + msg "build: Everest ECDH context (ASan build)" # ~ 6 min + scripts/config.pl unset MBEDTLS_ECDH_LEGACY_CONTEXT + scripts/config.pl set MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED + CC=clang cmake -D CMAKE_BUILD_TYPE:String=Asan . + make + + msg "test: Everest ECDH context - main suites (inc. selftests) (ASan build)" # ~ 50s + make test + + msg "test: Everest ECDH context - ECDH-related part of ssl-opt.sh (ASan build)" # ~ 5s + if_build_succeeded tests/ssl-opt.sh -f ECDH + + msg "test: Everest ECDH context - compat.sh with some ECDH ciphersuites (ASan build)" # ~ 3 min + # Exclude some symmetric ciphers that are redundant here to gain time. + if_build_succeeded tests/compat.sh -f ECDH -V NO -e 'ARCFOUR\|ARIA\|CAMELLIA\|CHACHA\|DES\|RC4' +} + component_test_small_ssl_out_content_len () { msg "build: small SSL_OUT_CONTENT_LEN (ASan build)" scripts/config.pl set MBEDTLS_SSL_IN_CONTENT_LEN 16384 @@ -1087,6 +1105,26 @@ support_test_m32_o1 () { support_test_m32_o0 "$@" } +component_test_m32_everest () { + msg "build: i386, Everest ECDH context (ASan build)" # ~ 6 min + scripts/config.pl unset MBEDTLS_ECDH_LEGACY_CONTEXT + scripts/config.pl set MBEDTLS_ECDH_VARIANT_EVEREST_ENABLED + make CC=gcc CFLAGS='-O2 -Werror -Wall -Wextra -m32 -fsanitize=address' LDFLAGS='-m32 -fsanitize=address' + + msg "test: i386, Everest ECDH context - main suites (inc. selftests) (ASan build)" # ~ 50s + make test + + msg "test: i386, Everest ECDH context - ECDH-related part of ssl-opt.sh (ASan build)" # ~ 5s + if_build_succeeded tests/ssl-opt.sh -f ECDH + + msg "test: i386, Everest ECDH context - compat.sh with some ECDH ciphersuites (ASan build)" # ~ 3 min + # Exclude some symmetric ciphers that are redundant here to gain time. + if_build_succeeded tests/compat.sh -f ECDH -V NO -e 'ARCFOUR\|ARIA\|CAMELLIA\|CHACHA\|DES\|RC4' +} +support_test_m32_everest () { + support_test_m32_o0 "$@" +} + component_test_mx32 () { msg "build: 64-bit ILP32, make, gcc" # ~ 30s scripts/config.pl full From 4f055f4ca2a3619268bcc6e6601e4ced2a418fae Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Tue, 20 Aug 2019 15:12:54 +0100 Subject: [PATCH 40/42] Use 3rdparty headers from the submodule --- CMakeLists.txt | 2 +- library/Makefile | 8 +++++--- programs/Makefile | 8 +++++--- programs/fuzz/Makefile | 1 + tests/Makefile | 5 +++-- 5 files changed, 15 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6292c52769..fb1de8174e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -189,7 +189,7 @@ if(ENABLE_ZLIB_SUPPORT) endif(ZLIB_FOUND) endif(ENABLE_ZLIB_SUPPORT) -add_subdirectory(3rdparty) +add_subdirectory(crypto/3rdparty) include_directories(${thirdparty_inc}) list(APPEND libs ${thirdparty_lib}) add_definitions(${thirdparty_def}) diff --git a/library/Makefile b/library/Makefile index 152909341f..1764b05334 100644 --- a/library/Makefile +++ b/library/Makefile @@ -80,9 +80,11 @@ OBJS_TLS= debug.o net_sockets.o \ ssl_srv.o ssl_ticket.o \ ssl_tls.o -include ../3rdparty/Makefile.inc -LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) -OBJS_CRYPTO+=$(THIRDPARTY_CRYPTO_OBJECTS) +INCLUDING_FROM_MBEDTLS:=1 +include ../crypto/3rdparty/Makefile.inc +LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) +OBJS_CRYPTO += $(patsubst ../3rdparty/%, ../crypto/3rdparty/%, $(THIRDPARTY_CRYPTO_OBJECTS)) + .SILENT: diff --git a/programs/Makefile b/programs/Makefile index 0e4f7d628c..589b1b5e83 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -18,8 +18,10 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include LOCAL_CXXFLAGS += -I../crypto/include -include ../3rdparty/Makefile.inc -LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) +INCLUDING_FROM_MBEDTLS:=1 +include ../crypto/3rdparty/Makefile.inc +LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) +LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) ifndef SHARED DEP=../crypto/library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a @@ -104,7 +106,7 @@ all: fuzz endif fuzz: - $(MAKE) -C fuzz + $(MAKE) -C fuzz THIRDPARTY_INCLUDES=$(THIRDPARTY_INCLUDES) $(DEP): $(MAKE) -C ../library diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile index f2195d1298..83059aa665 100644 --- a/programs/fuzz/Makefile +++ b/programs/fuzz/Makefile @@ -8,6 +8,7 @@ LOCAL_LDFLAGS = -L../../library \ LOCAL_LDFLAGS += -L../../crypto/library LOCAL_CFLAGS += -I../../crypto/include CRYPTO := ../../crypto/library/ +LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) ifndef SHARED DEP=$(CRYPTO)libmbedcrypto.a ../../library/libmbedx509.a ../../library/libmbedtls.a diff --git a/tests/Makefile b/tests/Makefile index 3857778e7c..1c7efe04aa 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -16,8 +16,9 @@ LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ -include ../3rdparty/Makefile.inc -LOCAL_CFLAGS+=$(THIRDPARTY_INCLUDES) +INCLUDING_FROM_MBEDTLS:=1 +include ../crypto/3rdparty/Makefile.inc +LOCAL_CFLAGS += $(patsubst -I../3rdparty/%, -I../crypto/3rdparty/%, $(THIRDPARTY_INCLUDES)) # Enable definition of various functions used throughout the testsuite # (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless From 31465c6c1f51ac3b2b8edc2704924e4c453d11bc Mon Sep 17 00:00:00 2001 From: Janos Follath Date: Tue, 20 Aug 2019 16:03:46 +0100 Subject: [PATCH 41/42] Update submodule --- crypto | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crypto b/crypto index 21db2a94a4..f0716542c4 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit 21db2a94a482689e4e4f4e5473d4b5723c5394e4 +Subproject commit f0716542c458a53106ae97788321b97a7910baef From 9b9a790be66a5ff397cb7c6dab53051f5a1d9470 Mon Sep 17 00:00:00 2001 From: Darryl Green Date: Fri, 30 Aug 2019 14:51:55 +0100 Subject: [PATCH 42/42] Handle deleting non-existant files on Windows If we try to delete a non-existant file using del on Windows, as can happen when running make clean, del will throw an error. Make the Makefiles more robust by only deleting files if they exist. --- library/Makefile | 4 +++- programs/Makefile | 3 ++- programs/fuzz/Makefile | 3 ++- tests/Makefile | 4 +++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/library/Makefile b/library/Makefile index 1764b05334..501421fb64 100644 --- a/library/Makefile +++ b/library/Makefile @@ -165,5 +165,7 @@ clean: ifndef WINDOWS rm -f *.o libmbed* $(OBJS_CRYPTO) else - del /Q /F *.o libmbed* $(OBJS_CRYPTO) + if exist *.o del /Q /F *.o + if exist libmbed* del /Q /F libmbed* + if exist $(OBJS_CRYPTO) del /Q /F $(OBJS_CRYPTO) endif diff --git a/programs/Makefile b/programs/Makefile index 589b1b5e83..dce970b967 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -317,7 +317,8 @@ ifndef WINDOWS -rm -f ssl/ssl_pthread_server$(EXEXT) -rm -f test/cpp_dummy_build$(EXEXT) else - del /S /Q /F *.o *.exe + if exist *.o del /Q /F *.o + if exist *.exe del /Q /F *.exe endif $(MAKE) -C fuzz clean diff --git a/programs/fuzz/Makefile b/programs/fuzz/Makefile index 83059aa665..5cde090d8e 100644 --- a/programs/fuzz/Makefile +++ b/programs/fuzz/Makefile @@ -69,5 +69,6 @@ clean: ifndef WINDOWS rm -rf $(BINARIES) *.o else - del /Q /F *.o *.exe + if exist *.o del /Q /F *.o + if exist *.exe del /Q /F *.exe endif diff --git a/tests/Makefile b/tests/Makefile index 1c7efe04aa..0bed6b1913 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -160,7 +160,9 @@ clean: ifndef WINDOWS rm -rf $(BINARIES) *.c *.datax TESTS else - del /Q /F *.c *.exe *.datax + if exist *.c del /Q /F *.c + if exist *.exe del /Q /F *.exe + if exist *.datax del /Q /F *.datax ifneq ($(wildcard TESTS/.*),) rmdir /Q /S TESTS endif