diff --git a/CMakeLists.txt b/CMakeLists.txt index fa119b91a..e10c22821 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,10 +9,12 @@ option(USE_PKCS11_HELPER_LIBRARY "Build mbed TLS with the pkcs11-helper library. option(ENABLE_ZLIB_SUPPORT "Build mbed TLS with zlib library." OFF) option(ENABLE_PROGRAMS "Build mbed TLS programs." ON) -option(USE_CRYPTO_SUBMODULE "Build and use libmbedcrypto from the crypto submodule." OFF) option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF) +# export the submodule flag so that crypto knows it's being built as a submodule +set( USE_CRYPTO_SUBMODULE ON ) + string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}") string(REGEX MATCH "GNU" CMAKE_COMPILER_IS_GNU "${CMAKE_C_COMPILER_ID}") string(REGEX MATCH "IAR" CMAKE_COMPILER_IS_IAR "${CMAKE_C_COMPILER_ID}") @@ -184,10 +186,8 @@ endif(ENABLE_ZLIB_SUPPORT) add_subdirectory(library) add_subdirectory(include) -if(USE_CRYPTO_SUBMODULE) - add_subdirectory(crypto/library) - add_subdirectory(crypto/include) -endif() +add_subdirectory(crypto/library) +add_subdirectory(crypto/include) if(ENABLE_PROGRAMS) add_subdirectory(programs) @@ -201,9 +201,7 @@ if(ENABLE_TESTING) enable_testing() add_subdirectory(tests) - if(USE_CRYPTO_SUBMODULE) - add_subdirectory(crypto/tests) - endif() + add_subdirectory(crypto/tests) # additional convenience targets for Unix only if(UNIX) diff --git a/Makefile b/Makefile index 38331851e..e898975db 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,5 @@ - +# export the submodule flag so that crypto knows it's being built as a submodule +export USE_CRYPTO_SUBMODULE=1 DESTDIR=/usr/local PREFIX=mbedtls_ @@ -19,9 +20,7 @@ lib: tests: lib $(MAKE) -C tests -ifdef USE_CRYPTO_SUBMODULE $(MAKE) CRYPTO_INCLUDES:="-I../../include -I../include" -C crypto/tests -endif ifndef WINDOWS install: no_test @@ -31,13 +30,10 @@ install: no_test mkdir -p $(DESTDIR)/lib cp -RP library/libmbedtls.* $(DESTDIR)/lib cp -RP library/libmbedx509.* $(DESTDIR)/lib -ifdef USE_CRYPTO_SUBMODULE + mkdir -p $(DESTDIR)/include/psa cp -rp crypto/include/psa $(DESTDIR)/include cp -RP crypto/library/libmbedcrypto.* $(DESTDIR)/lib -else - cp -RP library/libmbedcrypto.* $(DESTDIR)/lib -endif mkdir -p $(DESTDIR)/bin for p in programs/*/* ; do \ @@ -53,9 +49,8 @@ uninstall: rm -f $(DESTDIR)/lib/libmbedtls.* rm -f $(DESTDIR)/lib/libmbedx509.* rm -f $(DESTDIR)/lib/libmbedcrypto.* -ifdef USE_CRYPTO_SUBMODULE $(MAKE) -C crypto uninstall -endif + for p in programs/*/* ; do \ if [ -x $$p ] && [ ! -d $$p ] ; \ @@ -97,18 +92,14 @@ clean: $(MAKE) -C library clean $(MAKE) -C programs clean $(MAKE) -C tests clean -ifdef USE_CRYPTO_SUBMODULE $(MAKE) -C crypto clean -endif ifndef WINDOWS find . \( -name \*.gcno -o -name \*.gcda -o -name \*.info \) -exec rm {} + endif check: lib tests $(MAKE) -C tests check -ifdef USE_CRYPTO_SUBMODULE $(MAKE) CRYPTO_INCLUDES:="-I../../include -I../include" -C crypto/tests check -endif test: check diff --git a/README.md b/README.md index 91ccf8d78..5b0160351 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,23 @@ The main systems used for development are CMake and GNU Make. Those systems are The Make and CMake build systems create three libraries: libmbedcrypto, libmbedx509, and libmbedtls. Note that libmbedtls depends on libmbedx509 and libmbedcrypto, and libmbedx509 depends on libmbedcrypto. As a result, some linkers will expect flags to be in a specific order, for example the GNU linker wants `-lmbedtls -lmbedx509 -lmbedcrypto`. Also, when loading shared libraries using dlopen(), you'll need to load libmbedcrypto first, then libmbedx509, before you can load libmbedtls. +### Getting files form git: the Crypto submodule + +The Mbed Crypto library now has its own git repository, which the Mbed TLS build systems are using as a git submodule in order to build libmbedcrypto as a subproject of Mbed TLS. When cloning the Mbed TLS repository, you need to make sure you're getting the submodule as well: + + git clone --recursive https://github.com/ARMmbed/mbedtls.git + +Alternatively, if you already have an existing clone of the Mbed TLS +repository, you can initialise and update the submodule with: + + git submodule update --init crypto + +After these steps, your clone is now ready for building the libraries as detailed in the following sections. + +Note that building libmbedcrypto as a subproject of Mbed TLS does not enable the PSA-specific tests and utility programs. To use these programs, build Mbed Crypto as a standalone project. + +Please note that for now, Mbed TLS can only use versions of libmbedcrypto that were built as a subproject of Mbed TLS, not versions that were built standalone from the Mbed Crypto repository. This restriction will be removed in the future. + ### Make We require GNU Make. To build the library and the sample programs, GNU Make and a C compiler are sufficient. Some of the more advanced build targets require some Unix/Linux tools. @@ -158,42 +175,6 @@ Configurations We provide some non-standard configurations focused on specific use cases in the `configs/` directory. You can read more about those in `configs/README.txt` -Using Mbed Crypto as a submodule --------------------------------- - -As an experimental feature, you can use Mbed Crypto as the source of the cryptography implementation, with Mbed TLS providing the X.509 and TLS parts of the library. Mbed Crypto is currently provided for evaluation only and should not be used in production. At this point, you should only use this option if you want to try out the experimental PSA Crypto API. - -To enable the use of Mbed Crypto as a submodule: - -1. Check out the `crypto` submodule and update it. - - git submodule init crypto - git submodule update crypto - -2. (Optional) TO enable the PSA Crypto API, set the build configuration option `MBEDTLS_PSA_CRYPTO_C`. You can either edit `include/mbedtls/config.h` directly or use the configuration script: - - scripts/config.pl set MBEDTLS_PSA_CRYPTO_C - -3. Activate the build option `USE_CRYPTO_SUBMODULE`. With GNU make, set `USE_CRYPTO_SUBMODULE=1` on each make invocation: - - make USE_CRYPTO_SUBMODULE=1 - make USE_CRYPTO_SUBMODULE=1 test - tests/ssl-opt.sh -f Default - - Note that you need to pass `USE_CRYPTO_SUBMODULE=1` even to `make clean`. For example, if you change `config.h`, run this before rebuilding: - - make USE_CRYPTO_SUBMODULE=1 clean - - With CMake, create a build directory (recommended) and pass `-DUSE_CRYPTO_SUBMODULE=1` to `cmake`: - - mkdir build - cd build - cmake -DUSE_CRYPTO_SUBMODULE=1 .. - make - make test - tests/ssl-opt.sh -f Default - -Note that this does not enable the PSA-specific tests and utility programs. To use these programs, use Mbed Crypto as a standalone project. Porting Mbed TLS ---------------- diff --git a/crypto b/crypto index 461fd58fb..8907b019e 160000 --- a/crypto +++ b/crypto @@ -1 +1 @@ -Subproject commit 461fd58fb2f5f04d4beb894355fb14642e8a0724 +Subproject commit 8907b019e756d2f02f21a1a32f072d20de13965e diff --git a/include/mbedtls/config.h b/include/mbedtls/config.h index fd91d7074..cc3fa14b1 100644 --- a/include/mbedtls/config.h +++ b/include/mbedtls/config.h @@ -1726,18 +1726,27 @@ /** * \def MBEDTLS_USE_PSA_CRYPTO * - * Make the X.509 and TLS library use PSA for cryptographic operations, see - * #MBEDTLS_PSA_CRYPTO_C. + * Make the X.509 and TLS library use PSA for cryptographic operations, and + * enable new APIs for using keys handled by PSA Crypto. * - * Note: this option is still in progress, the full X.509 and TLS modules are - * not covered yet, but parts that are not ported to PSA yet will still work - * as usual, so enabling this option should not break backwards compatibility. + * \note Development of this option is currently in progress, and parts + * of the X.509 and TLS modules are not ported to PSA yet. However, these parts + * will still continue to work as usual, so enabling this option should not + * break backwards compatibility. * - * \warning Support for PSA is still an experimental feature. - * Any public API that depends on this option may change - * at any time until this warning is removed. + * \warning The PSA Crypto API is in beta stage. While you're welcome to + * experiment using it, incompatible API changes are still possible, and some + * parts may not have reached the same quality as the rest of Mbed TLS yet. + * + * \warning This option enables new Mbed TLS APIs that are dependent on the + * PSA Crypto API, so can't come with the same stability guarantees as the + * rest of the Mbed TLS APIs. You're welcome to experiment with them, but for + * now, access to these APIs is opt-in (via enabling the present option), in + * order to clearly differentiate them from the stable Mbed TLS APIs. * * Requires: MBEDTLS_PSA_CRYPTO_C. + * + * Uncomment this to enable internal use of PSA Crypto and new associated APIs. */ //#define MBEDTLS_USE_PSA_CRYPTO @@ -2773,19 +2782,16 @@ * * Enable the Platform Security Architecture cryptography API. * - * \note This option only has an effect when the build option - * USE_CRYPTO_SUBMODULE is also in use. - * - * \warning This feature is experimental and available on an opt-in basis only. - * PSA APIs are subject to change at any time. The implementation comes with - * less assurance and support than the rest of Mbed TLS. + * \warning The PSA Crypto API is still beta status. While you're welcome to + * experiment using it, incompatible API changes are still possible, and some + * parts may not have reached the same quality as the rest of Mbed TLS yet. * * Module: crypto/library/psa_crypto.c * * Requires: MBEDTLS_CTR_DRBG_C, MBEDTLS_ENTROPY_C * */ -//#define MBEDTLS_PSA_CRYPTO_C +#define MBEDTLS_PSA_CRYPTO_C /** * \def MBEDTLS_PSA_CRYPTO_STORAGE_C diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index fb43fd0a7..1004cb30b 100644 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -146,12 +146,6 @@ elseif(USE_STATIC_MBEDTLS_LIBRARY) endif() if(USE_STATIC_MBEDTLS_LIBRARY) - if(NOT USE_CRYPTO_SUBMODULE) - add_library(${mbedcrypto_static_target} STATIC ${src_crypto}) - set_target_properties(${mbedcrypto_static_target} PROPERTIES OUTPUT_NAME mbedcrypto) - target_link_libraries(${mbedcrypto_static_target} ${libs}) - target_include_directories(${mbedcrypto_static_target} PUBLIC ${CMAKE_SOURCE_DIR}/include/) - endif() add_library(${mbedx509_static_target} STATIC ${src_x509}) set_target_properties(${mbedx509_static_target} PROPERTIES OUTPUT_NAME mbedx509) @@ -168,24 +162,14 @@ if(USE_STATIC_MBEDTLS_LIBRARY) PUBLIC ${CMAKE_SOURCE_DIR}/crypto/include/ ) - if(USE_CRYPTO_SUBMODULE) - install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} - DESTINATION ${LIB_INSTALL_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} ${mbedcrypto_static_target} - DESTINATION ${LIB_INSTALL_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() + + install(TARGETS ${mbedtls_static_target} ${mbedx509_static_target} + DESTINATION ${LIB_INSTALL_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + endif(USE_STATIC_MBEDTLS_LIBRARY) if(USE_SHARED_MBEDTLS_LIBRARY) - if(NOT USE_CRYPTO_SUBMODULE) - add_library(mbedcrypto SHARED ${src_crypto}) - set_target_properties(mbedcrypto PROPERTIES VERSION 2.17.0 SOVERSION 3) - target_link_libraries(mbedcrypto ${libs}) - target_include_directories(mbedcrypto PUBLIC ${CMAKE_SOURCE_DIR}/include/) - endif() add_library(mbedx509 SHARED ${src_x509}) set_target_properties(mbedx509 PROPERTIES VERSION 2.17.0 SOVERSION 0) @@ -201,25 +185,13 @@ if(USE_SHARED_MBEDTLS_LIBRARY) PUBLIC ${CMAKE_SOURCE_DIR}/include/ PUBLIC ${CMAKE_SOURCE_DIR}/crypto/include/) - if(USE_CRYPTO_SUBMODULE) - install(TARGETS mbedtls mbedx509 - DESTINATION ${LIB_INSTALL_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - else() - install(TARGETS mbedtls mbedx509 mbedcrypto - DESTINATION ${LIB_INSTALL_DIR} - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) - endif() + install(TARGETS mbedtls mbedx509 + DESTINATION ${LIB_INSTALL_DIR} + PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) + endif(USE_SHARED_MBEDTLS_LIBRARY) -if(USE_CRYPTO_SUBMODULE) - add_custom_target(lib DEPENDS mbedx509 mbedtls) - if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY) - add_dependencies(lib mbedx509_static mbedtls_static) - endif() -else() - add_custom_target(lib DEPENDS mbedcrypto mbedx509 mbedtls) - if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY) - add_dependencies(lib mbedcrypto_static mbedx509_static mbedtls_static) - endif() +add_custom_target(lib DEPENDS mbedx509 mbedtls) +if(USE_STATIC_MBEDTLS_LIBRARY AND USE_SHARED_MBEDTLS_LIBRARY) + add_dependencies(lib mbedx509_static mbedtls_static) endif() diff --git a/library/Makefile b/library/Makefile index d10fc41f4..60f3ae0d3 100644 --- a/library/Makefile +++ b/library/Makefile @@ -64,36 +64,11 @@ endif endif -ifdef USE_CRYPTO_SUBMODULE + # Look in crypto for libmbedcrypto. LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ -else -OBJS_CRYPTO= aes.o aesni.o arc4.o \ - aria.o asn1parse.o asn1write.o \ - base64.o bignum.o blowfish.o \ - camellia.o ccm.o chacha20.o \ - chachapoly.o cipher.o cipher_wrap.o \ - cmac.o ctr_drbg.o des.o \ - dhm.o ecdh.o ecdsa.o \ - ecjpake.o ecp.o \ - ecp_curves.o entropy.o entropy_poll.o \ - error.o gcm.o havege.o \ - hkdf.o \ - hmac_drbg.o md.o md2.o \ - md4.o md5.o md_wrap.o \ - memory_buffer_alloc.o nist_kw.o \ - oid.o padlock.o pem.o \ - pk.o pk_wrap.o pkcs12.o \ - pkcs5.o pkparse.o pkwrite.o \ - platform.o platform_util.o poly1305.o \ - ripemd160.o rsa_internal.o rsa.o \ - sha1.o sha256.o sha512.o \ - threading.o timing.o version.o \ - version_features.o xtea.o -CRYPTO := -endif OBJS_X509= certs.o pkcs11.o x509.o \ x509_create.o x509_crl.o x509_crt.o \ @@ -173,37 +148,8 @@ libmbedx509.dll: $(OBJS_X509) libmbedcrypto.dll echo " LD $@" $(CC) -shared -Wl,-soname,$@ -Wl,--out-implib,$@.a -o $@ $(OBJS_X509) -lws2_32 -lwinmm -lgdi32 -L. -lmbedcrypto -static-libgcc $(LOCAL_LDFLAGS) $(LDFLAGS) -# crypto -ifdef USE_CRYPTO_SUBMODULE libmbedcrypto.%: $(MAKE) CRYPTO_INCLUDES:="-I../../include -I../include" -C ../crypto/library $@ -else -libmbedcrypto.a: $(OBJS_CRYPTO) - echo " AR $@" - $(AR) $(ARFLAGS) $@ $(OBJS_CRYPTO) -ifdef APPLE_BUILD -ifneq ($(APPLE_BUILD),0) - echo " RL $@" - $(RL) $(RLFLAGS) $@ -endif -endif - -libmbedcrypto.$(SOEXT_CRYPTO): $(OBJS_CRYPTO) - echo " LD $@" - $(CC) -shared -Wl,-soname,$@ $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_CRYPTO) - -libmbedcrypto.so: libmbedcrypto.$(SOEXT_CRYPTO) - echo " LN $@ -> $<" - ln -sf $< $@ - -libmbedcrypto.dylib: $(OBJS_CRYPTO) - echo " LD $@" - $(CC) -dynamiclib $(LOCAL_LDFLAGS) $(LDFLAGS) -o $@ $(OBJS_CRYPTO) - -libmbedcrypto.dll: $(OBJS_CRYPTO) - echo " LD $@" - $(CC) -shared -Wl,-soname,$@ -Wl,--out-implib,$@.a -o $@ $(OBJS_CRYPTO) -lws2_32 -lwinmm -lgdi32 -static-libgcc $(LOCAL_LDFLAGS) $(LDFLAGS) -endif .c.o: echo " CC $<" diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 78059054a..aabf4d485 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -3171,7 +3171,7 @@ static int ssl_write_client_key_exchange( mbedtls_ssl_context *ssl ) } /* Copy ECPoint structure to outgoing message buffer. */ - ssl->out_msg[header_len] = own_pubkey_ecpoint_len; + ssl->out_msg[header_len] = (unsigned char) own_pubkey_ecpoint_len; memcpy( ssl->out_msg + header_len + 1, own_pubkey_ecpoint, own_pubkey_ecpoint_len ); content_len = own_pubkey_ecpoint_len + 1; diff --git a/library/ssl_tls.c b/library/ssl_tls.c index d25dffd07..cd2845631 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -729,7 +729,7 @@ static void ssl_calc_finished_tls_sha384( mbedtls_ssl_context *, unsigned char * #endif #endif /* MBEDTLS_SSL_PROTO_TLS1_2 */ -#if defined(MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED) && \ +#if defined(MBEDTLS_KEY_EXCHANGE_PSK_ENABLED) && \ defined(MBEDTLS_USE_PSA_CRYPTO) static int ssl_use_opaque_psk( mbedtls_ssl_context const *ssl ) { @@ -749,7 +749,7 @@ static int ssl_use_opaque_psk( mbedtls_ssl_context const *ssl ) return( 0 ); } #endif /* MBEDTLS_USE_PSA_CRYPTO && - MBEDTLS_KEY_EXCHANGE__SOME__PSK_ENABLED */ + MBEDTLS_KEY_EXCHANGE_PSK_ENABLED */ #if defined(MBEDTLS_SSL_EXPORT_KEYS) static mbedtls_tls_prf_types tls_prf_get_type( mbedtls_ssl_tls_prf_cb *tls_prf ) diff --git a/programs/Makefile b/programs/Makefile index c17238566..14ba54393 100644 --- a/programs/Makefile +++ b/programs/Makefile @@ -14,11 +14,9 @@ LOCAL_LDFLAGS = -L../library \ -lmbedx509$(SHARED_SUFFIX) \ -lmbedcrypto$(SHARED_SUFFIX) -ifdef USE_CRYPTO_SUBMODULE LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include LOCAL_CXXFLAGS += -I../crypto/include -endif ifndef SHARED DEP=../library/libmbedcrypto.a ../library/libmbedx509.a ../library/libmbedtls.a diff --git a/scripts/config.pl b/scripts/config.pl index 6300362fa..5b13fc9e8 100755 --- a/scripts/config.pl +++ b/scripts/config.pl @@ -28,7 +28,6 @@ # MBEDTLS_ECP_DP_M511_ENABLED # MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES # MBEDTLS_NO_PLATFORM_ENTROPY -# MBEDTLS_PSA_CRYPTO_C # MBEDTLS_REMOVE_ARC4_CIPHERSUITES # MBEDTLS_REMOVE_3DES_CIPHERSUITES # MBEDTLS_SSL_HW_RECORD_ACCEL @@ -38,12 +37,9 @@ # - this could be enabled if the respective tests were adapted # MBEDTLS_ZLIB_SUPPORT # MBEDTLS_PKCS11_C -# MBEDTLS_USE_PSA_CRYPTO -# - experimental, and more an alternative implementation than a feature -# MBEDTLS_PSA_CRYPTO_STORAGE_C -# MBEDTLS_PSA_ITS_FILE_C # MBEDTLS_PSA_CRYPTO_SPM # MBEDTLS_PSA_INJECT_ENTROPY +# MBEDTLS_ECP_RESTARTABLE # and any symbol beginning _ALT # @@ -95,7 +91,6 @@ MBEDTLS_ECP_DP_M383_ENABLED MBEDTLS_ECP_DP_M511_ENABLED MBEDTLS_NO_DEFAULT_ENTROPY_SOURCES MBEDTLS_NO_PLATFORM_ENTROPY -MBEDTLS_PSA_CRYPTO_C MBEDTLS_RSA_NO_CRT MBEDTLS_REMOVE_ARC4_CIPHERSUITES MBEDTLS_REMOVE_3DES_CIPHERSUITES @@ -106,11 +101,9 @@ MBEDTLS_ZLIB_SUPPORT MBEDTLS_PKCS11_C MBEDTLS_NO_UDBL_DIVISION MBEDTLS_NO_64BIT_MULTIPLICATION -MBEDTLS_USE_PSA_CRYPTO -MBEDTLS_PSA_CRYPTO_STORAGE_C -MBEDTLS_PSA_ITS_FILE_C MBEDTLS_PSA_CRYPTO_SPM MBEDTLS_PSA_INJECT_ENTROPY +MBEDTLS_ECP_RESTARTABLE _ALT\s*$ ); @@ -130,6 +123,8 @@ MBEDTLS_MEMORY_BACKTRACE MBEDTLS_MEMORY_BUFFER_ALLOC_C MBEDTLS_PLATFORM_TIME_ALT MBEDTLS_PLATFORM_FPRINTF_ALT +MBEDTLS_PSA_ITS_FILE_C +MBEDTLS_PSA_CRYPTO_STORAGE_C ); # Things that should be enabled in "full" even if they match @excluded diff --git a/scripts/data_files/vs2010-app-template.vcxproj b/scripts/data_files/vs2010-app-template.vcxproj index fac9812e6..1b454d9a3 100644 --- a/scripts/data_files/vs2010-app-template.vcxproj +++ b/scripts/data_files/vs2010-app-template.vcxproj @@ -94,7 +94,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + Console @@ -114,7 +116,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + Console @@ -136,7 +140,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + Console @@ -156,7 +162,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + Console diff --git a/scripts/data_files/vs2010-main-template.vcxproj b/scripts/data_files/vs2010-main-template.vcxproj index 773b58a33..bfc2400f6 100644 --- a/scripts/data_files/vs2010-main-template.vcxproj +++ b/scripts/data_files/vs2010-main-template.vcxproj @@ -86,7 +86,9 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + CompileAsC @@ -101,7 +103,9 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + CompileAsC @@ -118,7 +122,9 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + Windows @@ -136,7 +142,9 @@ true true WIN64;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +INCLUDE_DIRECTORIES + Windows diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index e6545bc3a..5cfefe1af 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -5,7 +5,7 @@ # # Must be run from mbedTLS root or scripts directory. # Takes "include_crypto" as an argument that can be either 0 (don't include) or -# 1 (include). Off by default. +# 1 (include). On by default. use warnings; use strict; @@ -19,7 +19,7 @@ my $vsx_main_file = "$vsx_dir/mbedTLS.$vsx_ext"; my $vsx_sln_tpl_file = "scripts/data_files/vs2010-sln-template.sln"; my $vsx_sln_file = "$vsx_dir/mbedTLS.sln"; -my $include_crypto = 0; +my $include_crypto = 1; if( @ARGV ) { die "Invalid number of arguments" if scalar @ARGV != 1; ($include_crypto) = @ARGV; @@ -27,10 +27,21 @@ if( @ARGV ) { my $programs_dir = 'programs'; my $header_dir = 'include/mbedtls'; +my $crypto_headers_dir = 'include/psa'; my $source_dir = 'library'; my $crypto_dir = 'crypto'; # Need windows line endings! +my $include_directories = <\r EOT @@ -63,7 +74,9 @@ sub check_dirs { return -d $vsx_dir && -d $header_dir && -d $source_dir - && -d $programs_dir; + && -d $programs_dir + && -d $crypto_dir + && -d "$crypto_dir/$crypto_headers_dir"; } sub slurp_file { @@ -111,6 +124,7 @@ sub gen_app { $content =~ s//$srcs/g; $content =~ s//$appname/g; $content =~ s//$guid/g; + $content =~ s/INCLUDE_DIRECTORIES\r\n/$include_directories/g; content_to_file( $content, "$dir/$appname.$ext" ); } @@ -153,6 +167,7 @@ sub gen_main_file { my $out = slurp_file( $main_tpl ); $out =~ s/SOURCE_ENTRIES\r\n/$source_entries/m; $out =~ s/HEADER_ENTRIES\r\n/$header_entries/m; + $out =~ s/INCLUDE_DIRECTORIES\r\n/$include_directories/g; content_to_file( $out, $main_out ); } @@ -210,6 +225,7 @@ sub main { my $basename = $file; $basename =~ s!.*/!!; push @sources, $file unless -e "$crypto_dir/$source_dir/$basename"; } + push @headers, <$crypto_dir/$crypto_headers_dir/*.h>; } else { @sources = <$source_dir/*.c>; } diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 06b8997c5..ecf6f34b2 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -60,77 +60,6 @@ if(MSVC) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX-") endif(MSVC) -if(NOT USE_CRYPTO_SUBMODULE) - add_test_suite(aes aes.ecb) - add_test_suite(aes aes.cbc) - add_test_suite(aes aes.cfb) - add_test_suite(aes aes.ofb) - add_test_suite(aes aes.rest) - add_test_suite(aes aes.xts) - add_test_suite(arc4) - add_test_suite(aria) - add_test_suite(asn1write) - add_test_suite(base64) - add_test_suite(blowfish) - add_test_suite(camellia) - add_test_suite(ccm) - add_test_suite(chacha20) - add_test_suite(chachapoly) - add_test_suite(cipher cipher.aes) - add_test_suite(cipher cipher.arc4) - add_test_suite(cipher cipher.blowfish) - add_test_suite(cipher cipher.camellia) - add_test_suite(cipher cipher.ccm) - add_test_suite(cipher cipher.chacha20) - add_test_suite(cipher cipher.chachapoly) - add_test_suite(cipher cipher.des) - add_test_suite(cipher cipher.gcm) - add_test_suite(cipher cipher.misc) - add_test_suite(cipher cipher.null) - add_test_suite(cipher cipher.padding) - add_test_suite(cipher cipher.nist_kw) - add_test_suite(cmac) - add_test_suite(ctr_drbg) - add_test_suite(des) - add_test_suite(dhm) - add_test_suite(ecdh) - add_test_suite(ecdsa) - add_test_suite(ecjpake) - add_test_suite(ecp) - add_test_suite(entropy) - add_test_suite(error) - add_test_suite(gcm gcm.aes128_en) - add_test_suite(gcm gcm.aes192_en) - add_test_suite(gcm gcm.aes256_en) - add_test_suite(gcm gcm.aes128_de) - add_test_suite(gcm gcm.aes192_de) - add_test_suite(gcm gcm.aes256_de) - add_test_suite(gcm gcm.camellia) - add_test_suite(gcm gcm.misc) - add_test_suite(hkdf) - add_test_suite(hmac_drbg hmac_drbg.misc) - add_test_suite(hmac_drbg hmac_drbg.no_reseed) - add_test_suite(hmac_drbg hmac_drbg.nopr) - add_test_suite(hmac_drbg hmac_drbg.pr) - add_test_suite(md) - add_test_suite(mdx) - add_test_suite(memory_buffer_alloc) - add_test_suite(mpi) - add_test_suite(nist_kw) - add_test_suite(oid) - add_test_suite(pem) - add_test_suite(pkcs1_v15) - add_test_suite(pkcs1_v21) - add_test_suite(pkcs5) - add_test_suite(pk) - add_test_suite(pkparse) - add_test_suite(pkwrite) - add_test_suite(poly1305) - add_test_suite(shax) - add_test_suite(timing) - add_test_suite(rsa) - add_test_suite(xtea) -endif() add_test_suite(debug) add_test_suite(ssl) add_test_suite(version) @@ -140,6 +69,9 @@ add_test_suite(x509write) # Make scripts and data files needed for testing available in an # out-of-source build. if (NOT ${CMAKE_CURRENT_BINARY_DIR} STREQUAL ${CMAKE_CURRENT_SOURCE_DIR}) + if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/seedfile") + link_to_source(seedfile) + endif() link_to_source(compat.sh) link_to_source(data_files) link_to_source(scripts) diff --git a/tests/Makefile b/tests/Makefile index f5cc40974..c263e644a 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -12,13 +12,9 @@ LOCAL_LDFLAGS = -L../library \ -lmbedx509$(SHARED_SUFFIX) \ -lmbedcrypto$(SHARED_SUFFIX) -ifdef USE_CRYPTO_SUBMODULE LOCAL_LDFLAGS += -L../crypto/library LOCAL_CFLAGS += -I../crypto/include CRYPTO := ../crypto/library/ -else -CRYPTO := ../library/ -endif # Enable definition of various functions used throughout the testsuite # (gethostname, strdup, fileno...) even when compiling with -std=c99. Harmless @@ -66,7 +62,6 @@ endif # constructed by stripping path 'suites/' and extension .data. APPS = $(basename $(subst suites/,,$(wildcard suites/test_suite_*.data))) -ifdef USE_CRYPTO_SUBMODULE APPS := $(filter-out \ test_suite_aes.% \ test_suite_arc4 \ @@ -111,7 +106,6 @@ APPS := $(filter-out \ test_suite_timing \ test_suite_xtea \ ,$(APPS)) -endif # Construct executable name by adding OS specific suffix $(EXEXT). BINARIES := $(addsuffix $(EXEXT),$(APPS)) diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index c234ea268..86c0ce5cf 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -769,7 +769,6 @@ component_build_deprecated () { make CC=clang CFLAGS='-O -Werror -Wall -Wextra -Wno-unused-function' tests } - component_test_depends_curves () { msg "test/build: curves.pl (gcc)" # ~ 4 min record_status tests/scripts/curves.pl @@ -801,93 +800,35 @@ component_build_default_make_gcc_and_cxx () { make TEST_CPP=1 } -component_test_submodule_cmake () { - # USE_CRYPTO_SUBMODULE: check that the build works with CMake - msg "build: cmake, full config + USE_CRYPTO_SUBMODULE, gcc+debug" - scripts/config.pl full # enables md4 and submodule doesn't enable md4 - scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests - CC=gcc cmake -D USE_CRYPTO_SUBMODULE=1 -D CMAKE_BUILD_TYPE=Debug . - make - msg "test: top-level libmbedcrypto wasn't built (USE_CRYPTO_SUBMODULE, cmake)" - if_build_succeeded not test -f library/libmbedcrypto.a - msg "test: libmbedcrypto symbols are from crypto files (USE_CRYPTO_SUBMODULE, cmake)" - if_build_succeeded objdump -g crypto/library/libmbedcrypto.a | grep -E 'crypto/library$' > /dev/null - msg "test: libmbedcrypto uses top-level config (USE_CRYPTO_SUBMODULE, cmake)" - if_build_succeeded objdump -g crypto/library/libmbedcrypto.a | grep 'md4.c' > /dev/null - msg "test: main suites (USE_CRYPTO_SUBMODULE, cmake)" - make test - msg "test: ssl-opt.sh (USE_CRYPTO_SUBMODULE, cmake)" - if_build_succeeded tests/ssl-opt.sh -} - -component_test_submodule_make () { - # USE_CRYPTO_SUBMODULE: check that the build works with make - msg "build: make, full config + USE_CRYPTO_SUBMODULE, gcc+debug" - scripts/config.pl full # enables md4 and submodule doesn't enable md4 - scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests - make CC=gcc CFLAGS='-g' USE_CRYPTO_SUBMODULE=1 - msg "test: top-level libmbedcrypto wasn't built (USE_CRYPTO_SUBMODULE, make)" - if_build_succeeded not test -f library/libmbedcrypto.a - msg "test: libmbedcrypto symbols are from crypto files (USE_CRYPTO_SUBMODULE, make)" - if_build_succeeded objdump -g crypto/library/libmbedcrypto.a | grep -E 'crypto/library$' > /dev/null - msg "test: libmbedcrypto uses top-level config (USE_CRYPTO_SUBMODULE, make)" - if_build_succeeded objdump -g crypto/library/libmbedcrypto.a | grep 'md4.c' > /dev/null - msg "test: main suites (USE_CRYPTO_SUBMODULE, make)" - make CC=gcc USE_CRYPTO_SUBMODULE=1 test - msg "test: ssl-opt.sh (USE_CRYPTO_SUBMODULE, make)" - if_build_succeeded tests/ssl-opt.sh -} - -component_test_not_submodule_make () { - # Don't USE_CRYPTO_SUBMODULE: check that the submodule is not used with make - msg "build: make, full config - USE_CRYPTO_SUBMODULE, gcc+debug" - scripts/config.pl full - make CC=gcc CFLAGS='-g' - msg "test: submodule libmbedcrypto wasn't built (USE_CRYPTO_SUBMODULE, make)" - if_build_succeeded not test -f crypto/library/libmbedcrypto.a - msg "test: libmbedcrypto symbols are from library files (USE_CRYPTO_SUBMODULE, make)" - if_build_succeeded objdump -g library/libmbedcrypto.a | grep -E 'library$' | not grep 'crypto' > /dev/null -} - -component_test_not_submodule_cmake () { - # Don't USE_CRYPTO_SUBMODULE: check that the submodule is not used with CMake - msg "build: cmake, full config - USE_CRYPTO_SUBMODULE, gcc+debug" - scripts/config.pl full - CC=gcc cmake -D CMAKE_BUILD_TYPE=Debug . - make - msg "test: submodule libmbedcrypto wasn't built (USE_CRYPTO_SUBMODULE, cmake)" - if_build_succeeded not test -f crypto/library/libmbedcrypto.a - msg "test: libmbedcrypto symbols are from library files (USE_CRYPTO_SUBMODULE, cmake)" - if_build_succeeded objdump -g library/libmbedcrypto.a | grep -E 'library$' | not grep 'crypto' > /dev/null -} - -component_test_use_psa_crypto_full_cmake_asan() { - # MBEDTLS_USE_PSA_CRYPTO: run the same set of tests as basic-build-test.sh +component_test_no_use_psa_crypto_full_cmake_asan() { + # full minus MBEDTLS_USE_PSA_CRYPTO: run the same set of tests as basic-build-test.sh msg "build: cmake, full config + MBEDTLS_USE_PSA_CRYPTO, ASan" scripts/config.pl full scripts/config.pl unset MBEDTLS_MEMORY_BACKTRACE # too slow for tests scripts/config.pl unset MBEDTLS_ECP_RESTARTABLE # restartable ECC not supported through PSA scripts/config.pl set MBEDTLS_PSA_CRYPTO_C - scripts/config.pl set MBEDTLS_USE_PSA_CRYPTO - CC=gcc cmake -D USE_CRYPTO_SUBMODULE=1 -D CMAKE_BUILD_TYPE:String=Asan . + scripts/config.pl unset MBEDTLS_USE_PSA_CRYPTO + scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C + CC=gcc cmake -D CMAKE_BUILD_TYPE:String=Asan . make - msg "test: main suites (MBEDTLS_USE_PSA_CRYPTO)" + msg "test: main suites (full minus MBEDTLS_USE_PSA_CRYPTO)" make test - msg "test: ssl-opt.sh (MBEDTLS_USE_PSA_CRYPTO)" + msg "test: ssl-opt.sh (full minus MBEDTLS_USE_PSA_CRYPTO)" if_build_succeeded tests/ssl-opt.sh - msg "test: compat.sh default (MBEDTLS_USE_PSA_CRYPTO)" + msg "test: compat.sh default (full minus MBEDTLS_USE_PSA_CRYPTO)" if_build_succeeded tests/compat.sh - msg "test: compat.sh ssl3 (MBEDTLS_USE_PSA_CRYPTO)" + msg "test: compat.sh ssl3 (full minus MBEDTLS_USE_PSA_CRYPTO)" if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" tests/compat.sh -m 'ssl3' - msg "test: compat.sh RC4, DES & NULL (MBEDTLS_USE_PSA_CRYPTO)" + msg "test: compat.sh RC4, DES & NULL (full minus MBEDTLS_USE_PSA_CRYPTO)" if_build_succeeded env OPENSSL_CMD="$OPENSSL_LEGACY" GNUTLS_CLI="$GNUTLS_LEGACY_CLI" GNUTLS_SERV="$GNUTLS_LEGACY_SERV" tests/compat.sh -e '3DES\|DES-CBC3' -f 'NULL\|DES\|RC4\|ARCFOUR' - msg "test: compat.sh ARIA + ChachaPoly (MBEDTLS_USE_PSA_CRYPTO)" + msg "test: compat.sh ARIA + ChachaPoly (full minus MBEDTLS_USE_PSA_CRYPTO)" if_build_succeeded env OPENSSL_CMD="$OPENSSL_NEXT" tests/compat.sh -e '^$' -f 'ARIA\|CHACHA' } @@ -932,6 +873,8 @@ component_test_no_platform () { scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED scripts/config.pl unset MBEDTLS_MEMORY_BUFFER_ALLOC_C scripts/config.pl unset MBEDTLS_FS_IO + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C + scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C # Note, _DEFAULT_SOURCE needs to be defined for platforms using glibc version >2.19, # to re-enable platform integration features otherwise disabled in C99 builds make CC=gcc CFLAGS='-Werror -Wall -Wextra -std=c99 -pedantic -O0 -D_DEFAULT_SOURCE' lib programs @@ -1039,7 +982,7 @@ component_test_platform_calloc_macro () { component_test_make_shared () { msg "build/test: make shared" # ~ 40s - make SHARED=1 all check + make SHARED=1 all check -j1 } component_test_m32_o0 () { @@ -1100,6 +1043,8 @@ component_build_arm_none_eabi_gcc () { scripts/config.pl unset MBEDTLS_FS_IO scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C + scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C # following things are not in the default config scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c scripts/config.pl unset MBEDTLS_THREADING_PTHREAD @@ -1117,6 +1062,8 @@ component_build_arm_none_eabi_gcc_no_udbl_division () { scripts/config.pl unset MBEDTLS_FS_IO scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C + scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C # following things are not in the default config scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c scripts/config.pl unset MBEDTLS_THREADING_PTHREAD @@ -1136,6 +1083,8 @@ component_build_arm_none_eabi_gcc_no_64bit_multiplication () { scripts/config.pl unset MBEDTLS_TIMING_C scripts/config.pl unset MBEDTLS_FS_IO scripts/config.pl unset MBEDTLS_ENTROPY_NV_SEED + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C + scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY # following things are not in the default config scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c @@ -1159,6 +1108,8 @@ component_build_armcc () { scripts/config.pl unset MBEDTLS_HAVE_TIME scripts/config.pl unset MBEDTLS_HAVE_TIME_DATE scripts/config.pl set MBEDTLS_NO_PLATFORM_ENTROPY + scripts/config.pl unset MBEDTLS_PSA_CRYPTO_STORAGE_C + scripts/config.pl unset MBEDTLS_PSA_ITS_FILE_C # following things are not in the default config scripts/config.pl unset MBEDTLS_DEPRECATED_WARNING scripts/config.pl unset MBEDTLS_HAVEGE_C # depends on timing.c @@ -1198,15 +1149,15 @@ component_test_allow_sha1 () { component_build_mingw () { msg "build: Windows cross build - mingw64, make (Link Library)" # ~ 30s - make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 lib programs + make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 lib programs -j1 # note Make tests only builds the tests, but doesn't run them - make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror' WINDOWS_BUILD=1 tests + make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror' WINDOWS_BUILD=1 tests -j1 make WINDOWS_BUILD=1 clean msg "build: Windows cross build - mingw64, make (DLL)" # ~ 30s - make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 SHARED=1 lib programs - make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 SHARED=1 tests + make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 SHARED=1 lib programs -j1 + make CC=i686-w64-mingw32-gcc AR=i686-w64-mingw32-ar LD=i686-w64-minggw32-ld CFLAGS='-Werror -Wall -Wextra' WINDOWS_BUILD=1 SHARED=1 tests -j1 make WINDOWS_BUILD=1 clean } support_build_mingw() { diff --git a/tests/scripts/basic-build-test.sh b/tests/scripts/basic-build-test.sh index ab95e2290..2c9deb9ba 100755 --- a/tests/scripts/basic-build-test.sh +++ b/tests/scripts/basic-build-test.sh @@ -74,6 +74,9 @@ make -j # Step 2 - Execute the tests TEST_OUTPUT=out_${PPID} cd tests +if [ ! -f "seedfile" ]; then + dd if=/dev/urandom of="seedfile" bs=32 count=1 +fi # Step 2a - Unit Tests perl scripts/run-test-suites.pl -v 2 |tee unit-test-$TEST_OUTPUT diff --git a/tests/scripts/curves.pl b/tests/scripts/curves.pl index ddc90c580..4791d5521 100755 --- a/tests/scripts/curves.pl +++ b/tests/scripts/curves.pl @@ -57,7 +57,7 @@ for my $curve (@curves) { system( "CFLAGS='-Werror -Wall -Wextra' make lib" ) and abort "Failed to build lib: $curve\n"; - system( "cd tests && make" ) and abort "Failed to build tests: $curve\n"; + system( "make" ) and abort "Failed to build tests: $curve\n"; system( "make test" ) and abort "Failed test suite: $curve\n"; } diff --git a/visualc/VS2010/aescrypt2.vcxproj b/visualc/VS2010/aescrypt2.vcxproj index db387f979..398c0a94c 100644 --- a/visualc/VS2010/aescrypt2.vcxproj +++ b/visualc/VS2010/aescrypt2.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/benchmark.vcxproj b/visualc/VS2010/benchmark.vcxproj index 934c84438..75bfb2e27 100644 --- a/visualc/VS2010/benchmark.vcxproj +++ b/visualc/VS2010/benchmark.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/cert_app.vcxproj b/visualc/VS2010/cert_app.vcxproj index fef0efe6d..b689b366c 100644 --- a/visualc/VS2010/cert_app.vcxproj +++ b/visualc/VS2010/cert_app.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/cert_req.vcxproj b/visualc/VS2010/cert_req.vcxproj index 7d8694bfe..c5017e3f5 100644 --- a/visualc/VS2010/cert_req.vcxproj +++ b/visualc/VS2010/cert_req.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/cert_write.vcxproj b/visualc/VS2010/cert_write.vcxproj index 8891d8aef..302c04d4c 100644 --- a/visualc/VS2010/cert_write.vcxproj +++ b/visualc/VS2010/cert_write.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/crl_app.vcxproj b/visualc/VS2010/crl_app.vcxproj index c51caef54..7cb1bb040 100644 --- a/visualc/VS2010/crl_app.vcxproj +++ b/visualc/VS2010/crl_app.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/crypt_and_hash.vcxproj b/visualc/VS2010/crypt_and_hash.vcxproj index 99199d965..043cb5b5f 100644 --- a/visualc/VS2010/crypt_and_hash.vcxproj +++ b/visualc/VS2010/crypt_and_hash.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/dh_client.vcxproj b/visualc/VS2010/dh_client.vcxproj index b2fae8093..08c1880bf 100644 --- a/visualc/VS2010/dh_client.vcxproj +++ b/visualc/VS2010/dh_client.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/dh_genprime.vcxproj b/visualc/VS2010/dh_genprime.vcxproj index d9c19009a..5435312c9 100644 --- a/visualc/VS2010/dh_genprime.vcxproj +++ b/visualc/VS2010/dh_genprime.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/dh_server.vcxproj b/visualc/VS2010/dh_server.vcxproj index 6f87cb8b0..0b739ccdc 100644 --- a/visualc/VS2010/dh_server.vcxproj +++ b/visualc/VS2010/dh_server.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/dtls_client.vcxproj b/visualc/VS2010/dtls_client.vcxproj index 60715fe29..5d5966ec1 100644 --- a/visualc/VS2010/dtls_client.vcxproj +++ b/visualc/VS2010/dtls_client.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/dtls_server.vcxproj b/visualc/VS2010/dtls_server.vcxproj index 8789d7fea..367c502fe 100644 --- a/visualc/VS2010/dtls_server.vcxproj +++ b/visualc/VS2010/dtls_server.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ecdh_curve25519.vcxproj b/visualc/VS2010/ecdh_curve25519.vcxproj index 1120111f1..9401154bf 100644 --- a/visualc/VS2010/ecdh_curve25519.vcxproj +++ b/visualc/VS2010/ecdh_curve25519.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ecdsa.vcxproj b/visualc/VS2010/ecdsa.vcxproj index 3718c9f27..01566440b 100644 --- a/visualc/VS2010/ecdsa.vcxproj +++ b/visualc/VS2010/ecdsa.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/gen_entropy.vcxproj b/visualc/VS2010/gen_entropy.vcxproj index 4c57655b2..2cab3834e 100644 --- a/visualc/VS2010/gen_entropy.vcxproj +++ b/visualc/VS2010/gen_entropy.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/gen_key.vcxproj b/visualc/VS2010/gen_key.vcxproj index a07e1aacc..345880a0d 100644 --- a/visualc/VS2010/gen_key.vcxproj +++ b/visualc/VS2010/gen_key.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/gen_random_ctr_drbg.vcxproj b/visualc/VS2010/gen_random_ctr_drbg.vcxproj index 11740c448..d0e20b9bb 100644 --- a/visualc/VS2010/gen_random_ctr_drbg.vcxproj +++ b/visualc/VS2010/gen_random_ctr_drbg.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/gen_random_havege.vcxproj b/visualc/VS2010/gen_random_havege.vcxproj index 01253ceef..46fe004a2 100644 --- a/visualc/VS2010/gen_random_havege.vcxproj +++ b/visualc/VS2010/gen_random_havege.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/generic_sum.vcxproj b/visualc/VS2010/generic_sum.vcxproj index 0f2ecb43c..4df9bfedd 100644 --- a/visualc/VS2010/generic_sum.vcxproj +++ b/visualc/VS2010/generic_sum.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/hello.vcxproj b/visualc/VS2010/hello.vcxproj index c986b07be..9c4614fb6 100644 --- a/visualc/VS2010/hello.vcxproj +++ b/visualc/VS2010/hello.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/key_app.vcxproj b/visualc/VS2010/key_app.vcxproj index f96a0b052..8f4909ae0 100644 --- a/visualc/VS2010/key_app.vcxproj +++ b/visualc/VS2010/key_app.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/key_app_writer.vcxproj b/visualc/VS2010/key_app_writer.vcxproj index 0e4af3a58..e885955db 100644 --- a/visualc/VS2010/key_app_writer.vcxproj +++ b/visualc/VS2010/key_app_writer.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj index 133fd065b..404a5c123 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj @@ -86,7 +86,9 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + CompileAsC @@ -101,7 +103,9 @@ Level3 Disabled WIN32;_DEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + CompileAsC @@ -118,7 +122,9 @@ true true WIN32;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Windows @@ -136,7 +142,9 @@ true true WIN64;NDEBUG;_WINDOWS;_USRDLL;MBEDTLS_EXPORTS;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Windows @@ -225,68 +233,88 @@ + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -294,10 +322,6 @@ - - - - @@ -305,7 +329,6 @@ - diff --git a/visualc/VS2010/mini_client.vcxproj b/visualc/VS2010/mini_client.vcxproj index b5567bdfe..819584f4c 100644 --- a/visualc/VS2010/mini_client.vcxproj +++ b/visualc/VS2010/mini_client.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/mpi_demo.vcxproj b/visualc/VS2010/mpi_demo.vcxproj index d68bc75b3..8a2a28ea3 100644 --- a/visualc/VS2010/mpi_demo.vcxproj +++ b/visualc/VS2010/mpi_demo.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/pem2der.vcxproj b/visualc/VS2010/pem2der.vcxproj index 507c79a4d..6a364b577 100644 --- a/visualc/VS2010/pem2der.vcxproj +++ b/visualc/VS2010/pem2der.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/pk_decrypt.vcxproj b/visualc/VS2010/pk_decrypt.vcxproj index 5ccaf4f1e..c24ae9979 100644 --- a/visualc/VS2010/pk_decrypt.vcxproj +++ b/visualc/VS2010/pk_decrypt.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/pk_encrypt.vcxproj b/visualc/VS2010/pk_encrypt.vcxproj index d5ef208d8..d5fc64529 100644 --- a/visualc/VS2010/pk_encrypt.vcxproj +++ b/visualc/VS2010/pk_encrypt.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/pk_sign.vcxproj b/visualc/VS2010/pk_sign.vcxproj index d21f17a41..174a7dbc0 100644 --- a/visualc/VS2010/pk_sign.vcxproj +++ b/visualc/VS2010/pk_sign.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/pk_verify.vcxproj b/visualc/VS2010/pk_verify.vcxproj index 637ddd6f5..2c286a294 100644 --- a/visualc/VS2010/pk_verify.vcxproj +++ b/visualc/VS2010/pk_verify.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/query_compile_time_config.vcxproj b/visualc/VS2010/query_compile_time_config.vcxproj index 83a29f067..dbf5845d0 100644 --- a/visualc/VS2010/query_compile_time_config.vcxproj +++ b/visualc/VS2010/query_compile_time_config.vcxproj @@ -96,7 +96,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -116,7 +118,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -138,7 +142,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -158,7 +164,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/req_app.vcxproj b/visualc/VS2010/req_app.vcxproj index 3ffcea594..895f8457c 100644 --- a/visualc/VS2010/req_app.vcxproj +++ b/visualc/VS2010/req_app.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_decrypt.vcxproj b/visualc/VS2010/rsa_decrypt.vcxproj index 9e1d0a20e..df7f9b770 100644 --- a/visualc/VS2010/rsa_decrypt.vcxproj +++ b/visualc/VS2010/rsa_decrypt.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_encrypt.vcxproj b/visualc/VS2010/rsa_encrypt.vcxproj index c3b03716c..b1cc878f5 100644 --- a/visualc/VS2010/rsa_encrypt.vcxproj +++ b/visualc/VS2010/rsa_encrypt.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_genkey.vcxproj b/visualc/VS2010/rsa_genkey.vcxproj index e6b506000..ac1c10e64 100644 --- a/visualc/VS2010/rsa_genkey.vcxproj +++ b/visualc/VS2010/rsa_genkey.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_sign.vcxproj b/visualc/VS2010/rsa_sign.vcxproj index c1147c3c2..a276d37d8 100644 --- a/visualc/VS2010/rsa_sign.vcxproj +++ b/visualc/VS2010/rsa_sign.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_sign_pss.vcxproj b/visualc/VS2010/rsa_sign_pss.vcxproj index adfee6d9c..dce75ff74 100644 --- a/visualc/VS2010/rsa_sign_pss.vcxproj +++ b/visualc/VS2010/rsa_sign_pss.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_verify.vcxproj b/visualc/VS2010/rsa_verify.vcxproj index bb44b4f9d..7ef5b3f43 100644 --- a/visualc/VS2010/rsa_verify.vcxproj +++ b/visualc/VS2010/rsa_verify.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/rsa_verify_pss.vcxproj b/visualc/VS2010/rsa_verify_pss.vcxproj index 7781aa51a..83db60cbd 100644 --- a/visualc/VS2010/rsa_verify_pss.vcxproj +++ b/visualc/VS2010/rsa_verify_pss.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/selftest.vcxproj b/visualc/VS2010/selftest.vcxproj index 12ff76d70..684f77d95 100644 --- a/visualc/VS2010/selftest.vcxproj +++ b/visualc/VS2010/selftest.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ssl_client1.vcxproj b/visualc/VS2010/ssl_client1.vcxproj index 4ac158224..48e95a2a3 100644 --- a/visualc/VS2010/ssl_client1.vcxproj +++ b/visualc/VS2010/ssl_client1.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ssl_client2.vcxproj b/visualc/VS2010/ssl_client2.vcxproj index a960facf0..5f662686f 100644 --- a/visualc/VS2010/ssl_client2.vcxproj +++ b/visualc/VS2010/ssl_client2.vcxproj @@ -96,7 +96,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -116,7 +118,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -138,7 +142,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -158,7 +164,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ssl_fork_server.vcxproj b/visualc/VS2010/ssl_fork_server.vcxproj index 922a9953e..3c067eab6 100644 --- a/visualc/VS2010/ssl_fork_server.vcxproj +++ b/visualc/VS2010/ssl_fork_server.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ssl_mail_client.vcxproj b/visualc/VS2010/ssl_mail_client.vcxproj index a9b01d0d5..20deeb407 100644 --- a/visualc/VS2010/ssl_mail_client.vcxproj +++ b/visualc/VS2010/ssl_mail_client.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ssl_server.vcxproj b/visualc/VS2010/ssl_server.vcxproj index ae28e1839..e53b7a4a7 100644 --- a/visualc/VS2010/ssl_server.vcxproj +++ b/visualc/VS2010/ssl_server.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/ssl_server2.vcxproj b/visualc/VS2010/ssl_server2.vcxproj index 06a91cb49..60e30a826 100644 --- a/visualc/VS2010/ssl_server2.vcxproj +++ b/visualc/VS2010/ssl_server2.vcxproj @@ -96,7 +96,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -116,7 +118,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -138,7 +142,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -158,7 +164,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/strerror.vcxproj b/visualc/VS2010/strerror.vcxproj index d7ec570d6..21186a82b 100644 --- a/visualc/VS2010/strerror.vcxproj +++ b/visualc/VS2010/strerror.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/udp_proxy.vcxproj b/visualc/VS2010/udp_proxy.vcxproj index 30ae55e99..de5adf7ed 100644 --- a/visualc/VS2010/udp_proxy.vcxproj +++ b/visualc/VS2010/udp_proxy.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console diff --git a/visualc/VS2010/zeroize.vcxproj b/visualc/VS2010/zeroize.vcxproj index 9d311c721..0c7379977 100644 --- a/visualc/VS2010/zeroize.vcxproj +++ b/visualc/VS2010/zeroize.vcxproj @@ -95,7 +95,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -115,7 +117,9 @@ Level3 Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -137,7 +141,9 @@ true true WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console @@ -157,7 +163,9 @@ true true WIN64;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - ../../include + +../../include;../../crypto/include + Console