diff --git a/Makefile b/Makefile index ca190ccc8..e5702710e 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,8 @@ lib: cd library && $(MAKE) all && cd .. install: - mkdir -p $(DESTDIR)/include/polarssl - cp -r include/polarssl $(DESTDIR)/include + mkdir -p $(DESTDIR)/include/mbedtls + cp -r include/mbedtls $(DESTDIR)/include mkdir -p $(DESTDIR)/lib cp library/libmbedtls.* $(DESTDIR)/lib @@ -34,7 +34,7 @@ install: done uninstall: - rm -rf $(DESTDIR)/include/polarssl + rm -rf $(DESTDIR)/include/mbedtls rm -f $(DESTDIR)/lib/libmbedtls.* for p in programs/*/* ; do \ diff --git a/README.rst b/README.rst index 03aec3156..66e823ad2 100644 --- a/README.rst +++ b/README.rst @@ -5,7 +5,7 @@ README for mbed TLS Configuration ============= -mbed TLS should build out of the box on most systems. Some platform specific options are available in the fully-documented configuration file *include/polarssl/config.h*, which is also the place where features can be selected. +mbed TLS should build out of the box on most systems. Some platform specific options are available in the fully-documented configuration file *include/mbedtls/config.h*, which is also the place where features can be selected. This file can be edited manually, or in a more programmatic way using the Perl script *scripts/config.pl* (use *--help* for usage instructions). diff --git a/configs/README.txt b/configs/README.txt index 4a0074cbc..6be64a2b2 100644 --- a/configs/README.txt +++ b/configs/README.txt @@ -7,9 +7,9 @@ this target. They can be used as a basis for custom configurations. These files are complete replacements for the default config.h. To use one of them, you can pick one of the following methods: -1. Replace the default file include/polarssl/config.h with the chosen one. +1. Replace the default file include/mbedtls/config.h with the chosen one. (Depending on your compiler, you may need to ajust the line with - #include "polarssl/check_config.h" then.) + #include "mbedtls/check_config.h" then.) 2. Define POLARSSL_CONFIG_FILE and adjust the include path accordingly. For example, using make: diff --git a/configs/config-ccm-psk-tls1_2.h b/configs/config-ccm-psk-tls1_2.h index 776179d17..3844383b1 100644 --- a/configs/config-ccm-psk-tls1_2.h +++ b/configs/config-ccm-psk-tls1_2.h @@ -57,7 +57,7 @@ /* * Save RAM at the expense of interoperability: do this only if you control - * both ends of the connection! (See comments in "polarssl/ssl.h".) + * both ends of the connection! (See comments in "mbedtls/ssl.h".) * The optimal size here depends on the typical size of records. */ #define SSL_MAX_CONTENT_LEN 512 diff --git a/configs/config-mini-tls1_1.h b/configs/config-mini-tls1_1.h index 3bd1b1f3f..ab0419359 100644 --- a/configs/config-mini-tls1_1.h +++ b/configs/config-mini-tls1_1.h @@ -52,6 +52,6 @@ /* For testing with compat.sh */ #define POLARSSL_FS_IO -#include "polarssl/check_config.h" +#include "mbedtls/check_config.h" #endif /* POLARSSL_CONFIG_H */ diff --git a/configs/config-psk-rc4-tls1_0.h b/configs/config-psk-rc4-tls1_0.h index b8113ea82..bb82f91e0 100644 --- a/configs/config-psk-rc4-tls1_0.h +++ b/configs/config-psk-rc4-tls1_0.h @@ -36,6 +36,6 @@ #define POLARSSL_SSL_SRV_C #define POLARSSL_SSL_TLS_C -#include "polarssl/check_config.h" +#include "mbedtls/check_config.h" #endif /* POLARSSL_CONFIG_H */ diff --git a/configs/config-suite-b.h b/configs/config-suite-b.h index 3e8f15310..5c58f2535 100644 --- a/configs/config-suite-b.h +++ b/configs/config-suite-b.h @@ -85,12 +85,12 @@ /* * Save RAM at the expense of interoperability: do this only if you control - * both ends of the connection! (See coments in "polarssl/ssl.h".) + * both ends of the connection! (See coments in "mbedtls/ssl.h".) * The minimum size here depends on the certificate chain used as well as the * typical size of records. */ #define SSL_MAX_CONTENT_LEN 1024 -#include "polarssl/check_config.h" +#include "mbedtls/check_config.h" #endif /* POLARSSL_CONFIG_H */ diff --git a/include/.gitignore b/include/.gitignore index 53a36d446..bf67d02ed 100644 --- a/include/.gitignore +++ b/include/.gitignore @@ -1,4 +1,4 @@ Makefile *.sln *.vcxproj -polarssl/check_config +mbedtls/check_config diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index 2c568584f..ce0ed6b19 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -2,10 +2,10 @@ option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON) if(INSTALL_MBEDTLS_HEADERS) -file(GLOB headers "polarssl/*.h") +file(GLOB headers "mbedtls/*.h") install(FILES ${headers} - DESTINATION include/polarssl + DESTINATION include/mbedtls PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) endif(INSTALL_MBEDTLS_HEADERS) diff --git a/include/polarssl/aes.h b/include/mbedtls/aes.h similarity index 100% rename from include/polarssl/aes.h rename to include/mbedtls/aes.h diff --git a/include/polarssl/aesni.h b/include/mbedtls/aesni.h similarity index 100% rename from include/polarssl/aesni.h rename to include/mbedtls/aesni.h diff --git a/include/polarssl/arc4.h b/include/mbedtls/arc4.h similarity index 100% rename from include/polarssl/arc4.h rename to include/mbedtls/arc4.h diff --git a/include/polarssl/asn1.h b/include/mbedtls/asn1.h similarity index 100% rename from include/polarssl/asn1.h rename to include/mbedtls/asn1.h diff --git a/include/polarssl/asn1write.h b/include/mbedtls/asn1write.h similarity index 100% rename from include/polarssl/asn1write.h rename to include/mbedtls/asn1write.h diff --git a/include/polarssl/base64.h b/include/mbedtls/base64.h similarity index 100% rename from include/polarssl/base64.h rename to include/mbedtls/base64.h diff --git a/include/polarssl/bignum.h b/include/mbedtls/bignum.h similarity index 100% rename from include/polarssl/bignum.h rename to include/mbedtls/bignum.h diff --git a/include/polarssl/blowfish.h b/include/mbedtls/blowfish.h similarity index 100% rename from include/polarssl/blowfish.h rename to include/mbedtls/blowfish.h diff --git a/include/polarssl/bn_mul.h b/include/mbedtls/bn_mul.h similarity index 100% rename from include/polarssl/bn_mul.h rename to include/mbedtls/bn_mul.h diff --git a/include/polarssl/camellia.h b/include/mbedtls/camellia.h similarity index 100% rename from include/polarssl/camellia.h rename to include/mbedtls/camellia.h diff --git a/include/polarssl/ccm.h b/include/mbedtls/ccm.h similarity index 100% rename from include/polarssl/ccm.h rename to include/mbedtls/ccm.h diff --git a/include/polarssl/certs.h b/include/mbedtls/certs.h similarity index 100% rename from include/polarssl/certs.h rename to include/mbedtls/certs.h diff --git a/include/polarssl/check_config.h b/include/mbedtls/check_config.h similarity index 100% rename from include/polarssl/check_config.h rename to include/mbedtls/check_config.h diff --git a/include/polarssl/cipher.h b/include/mbedtls/cipher.h similarity index 100% rename from include/polarssl/cipher.h rename to include/mbedtls/cipher.h diff --git a/include/polarssl/cipher_wrap.h b/include/mbedtls/cipher_wrap.h similarity index 100% rename from include/polarssl/cipher_wrap.h rename to include/mbedtls/cipher_wrap.h diff --git a/include/polarssl/config.h b/include/mbedtls/config.h similarity index 99% rename from include/polarssl/config.h rename to include/mbedtls/config.h index 33309b538..4cf879eee 100644 --- a/include/polarssl/config.h +++ b/include/mbedtls/config.h @@ -75,7 +75,7 @@ * Used in: * library/timing.c * library/padlock.c - * include/polarssl/bn_mul.h + * include/mbedtls/bn_mul.h * * Comment to disable the use of assembly code. */ diff --git a/include/polarssl/ctr_drbg.h b/include/mbedtls/ctr_drbg.h similarity index 100% rename from include/polarssl/ctr_drbg.h rename to include/mbedtls/ctr_drbg.h diff --git a/include/polarssl/debug.h b/include/mbedtls/debug.h similarity index 100% rename from include/polarssl/debug.h rename to include/mbedtls/debug.h diff --git a/include/polarssl/des.h b/include/mbedtls/des.h similarity index 100% rename from include/polarssl/des.h rename to include/mbedtls/des.h diff --git a/include/polarssl/dhm.h b/include/mbedtls/dhm.h similarity index 100% rename from include/polarssl/dhm.h rename to include/mbedtls/dhm.h diff --git a/include/polarssl/ecdh.h b/include/mbedtls/ecdh.h similarity index 100% rename from include/polarssl/ecdh.h rename to include/mbedtls/ecdh.h diff --git a/include/polarssl/ecdsa.h b/include/mbedtls/ecdsa.h similarity index 100% rename from include/polarssl/ecdsa.h rename to include/mbedtls/ecdsa.h diff --git a/include/polarssl/ecp.h b/include/mbedtls/ecp.h similarity index 100% rename from include/polarssl/ecp.h rename to include/mbedtls/ecp.h diff --git a/include/polarssl/entropy.h b/include/mbedtls/entropy.h similarity index 100% rename from include/polarssl/entropy.h rename to include/mbedtls/entropy.h diff --git a/include/polarssl/entropy_poll.h b/include/mbedtls/entropy_poll.h similarity index 100% rename from include/polarssl/entropy_poll.h rename to include/mbedtls/entropy_poll.h diff --git a/include/polarssl/error.h b/include/mbedtls/error.h similarity index 100% rename from include/polarssl/error.h rename to include/mbedtls/error.h diff --git a/include/polarssl/gcm.h b/include/mbedtls/gcm.h similarity index 100% rename from include/polarssl/gcm.h rename to include/mbedtls/gcm.h diff --git a/include/polarssl/havege.h b/include/mbedtls/havege.h similarity index 100% rename from include/polarssl/havege.h rename to include/mbedtls/havege.h diff --git a/include/polarssl/hmac_drbg.h b/include/mbedtls/hmac_drbg.h similarity index 100% rename from include/polarssl/hmac_drbg.h rename to include/mbedtls/hmac_drbg.h diff --git a/include/polarssl/md.h b/include/mbedtls/md.h similarity index 100% rename from include/polarssl/md.h rename to include/mbedtls/md.h diff --git a/include/polarssl/md2.h b/include/mbedtls/md2.h similarity index 100% rename from include/polarssl/md2.h rename to include/mbedtls/md2.h diff --git a/include/polarssl/md4.h b/include/mbedtls/md4.h similarity index 100% rename from include/polarssl/md4.h rename to include/mbedtls/md4.h diff --git a/include/polarssl/md5.h b/include/mbedtls/md5.h similarity index 100% rename from include/polarssl/md5.h rename to include/mbedtls/md5.h diff --git a/include/polarssl/md_wrap.h b/include/mbedtls/md_wrap.h similarity index 100% rename from include/polarssl/md_wrap.h rename to include/mbedtls/md_wrap.h diff --git a/include/polarssl/memory.h b/include/mbedtls/memory.h similarity index 100% rename from include/polarssl/memory.h rename to include/mbedtls/memory.h diff --git a/include/polarssl/memory_buffer_alloc.h b/include/mbedtls/memory_buffer_alloc.h similarity index 100% rename from include/polarssl/memory_buffer_alloc.h rename to include/mbedtls/memory_buffer_alloc.h diff --git a/include/polarssl/net.h b/include/mbedtls/net.h similarity index 100% rename from include/polarssl/net.h rename to include/mbedtls/net.h diff --git a/include/polarssl/oid.h b/include/mbedtls/oid.h similarity index 100% rename from include/polarssl/oid.h rename to include/mbedtls/oid.h diff --git a/include/polarssl/padlock.h b/include/mbedtls/padlock.h similarity index 100% rename from include/polarssl/padlock.h rename to include/mbedtls/padlock.h diff --git a/include/polarssl/pbkdf2.h b/include/mbedtls/pbkdf2.h similarity index 100% rename from include/polarssl/pbkdf2.h rename to include/mbedtls/pbkdf2.h diff --git a/include/polarssl/pem.h b/include/mbedtls/pem.h similarity index 100% rename from include/polarssl/pem.h rename to include/mbedtls/pem.h diff --git a/include/polarssl/pk.h b/include/mbedtls/pk.h similarity index 100% rename from include/polarssl/pk.h rename to include/mbedtls/pk.h diff --git a/include/polarssl/pk_wrap.h b/include/mbedtls/pk_wrap.h similarity index 100% rename from include/polarssl/pk_wrap.h rename to include/mbedtls/pk_wrap.h diff --git a/include/polarssl/pkcs11.h b/include/mbedtls/pkcs11.h similarity index 100% rename from include/polarssl/pkcs11.h rename to include/mbedtls/pkcs11.h diff --git a/include/polarssl/pkcs12.h b/include/mbedtls/pkcs12.h similarity index 100% rename from include/polarssl/pkcs12.h rename to include/mbedtls/pkcs12.h diff --git a/include/polarssl/pkcs5.h b/include/mbedtls/pkcs5.h similarity index 100% rename from include/polarssl/pkcs5.h rename to include/mbedtls/pkcs5.h diff --git a/include/polarssl/platform.h b/include/mbedtls/platform.h similarity index 100% rename from include/polarssl/platform.h rename to include/mbedtls/platform.h diff --git a/include/polarssl/ripemd160.h b/include/mbedtls/ripemd160.h similarity index 100% rename from include/polarssl/ripemd160.h rename to include/mbedtls/ripemd160.h diff --git a/include/polarssl/rsa.h b/include/mbedtls/rsa.h similarity index 100% rename from include/polarssl/rsa.h rename to include/mbedtls/rsa.h diff --git a/include/polarssl/sha1.h b/include/mbedtls/sha1.h similarity index 100% rename from include/polarssl/sha1.h rename to include/mbedtls/sha1.h diff --git a/include/polarssl/sha256.h b/include/mbedtls/sha256.h similarity index 100% rename from include/polarssl/sha256.h rename to include/mbedtls/sha256.h diff --git a/include/polarssl/sha512.h b/include/mbedtls/sha512.h similarity index 100% rename from include/polarssl/sha512.h rename to include/mbedtls/sha512.h diff --git a/include/polarssl/ssl.h b/include/mbedtls/ssl.h similarity index 100% rename from include/polarssl/ssl.h rename to include/mbedtls/ssl.h diff --git a/include/polarssl/ssl_cache.h b/include/mbedtls/ssl_cache.h similarity index 100% rename from include/polarssl/ssl_cache.h rename to include/mbedtls/ssl_cache.h diff --git a/include/polarssl/ssl_ciphersuites.h b/include/mbedtls/ssl_ciphersuites.h similarity index 100% rename from include/polarssl/ssl_ciphersuites.h rename to include/mbedtls/ssl_ciphersuites.h diff --git a/include/polarssl/ssl_cookie.h b/include/mbedtls/ssl_cookie.h similarity index 100% rename from include/polarssl/ssl_cookie.h rename to include/mbedtls/ssl_cookie.h diff --git a/include/polarssl/threading.h b/include/mbedtls/threading.h similarity index 100% rename from include/polarssl/threading.h rename to include/mbedtls/threading.h diff --git a/include/polarssl/timing.h b/include/mbedtls/timing.h similarity index 100% rename from include/polarssl/timing.h rename to include/mbedtls/timing.h diff --git a/include/polarssl/version.h b/include/mbedtls/version.h similarity index 100% rename from include/polarssl/version.h rename to include/mbedtls/version.h diff --git a/include/polarssl/x509.h b/include/mbedtls/x509.h similarity index 100% rename from include/polarssl/x509.h rename to include/mbedtls/x509.h diff --git a/include/polarssl/x509_crl.h b/include/mbedtls/x509_crl.h similarity index 100% rename from include/polarssl/x509_crl.h rename to include/mbedtls/x509_crl.h diff --git a/include/polarssl/x509_crt.h b/include/mbedtls/x509_crt.h similarity index 100% rename from include/polarssl/x509_crt.h rename to include/mbedtls/x509_crt.h diff --git a/include/polarssl/x509_csr.h b/include/mbedtls/x509_csr.h similarity index 100% rename from include/polarssl/x509_csr.h rename to include/mbedtls/x509_csr.h diff --git a/include/polarssl/xtea.h b/include/mbedtls/xtea.h similarity index 100% rename from include/polarssl/xtea.h rename to include/mbedtls/xtea.h diff --git a/library/Makefile b/library/Makefile index 25e9c4bab..81a164c30 100644 --- a/library/Makefile +++ b/library/Makefile @@ -1,5 +1,5 @@ -# Also see "include/polarssl/config.h" +# Also see "include/mbedtls/config.h" # To compile on MinGW: add "-lws2_32" to LDFLAGS or define WINDOWS in your # environment diff --git a/library/aes.c b/library/aes.c index 9d96064ff..4567534a5 100644 --- a/library/aes.c +++ b/library/aes.c @@ -27,7 +27,7 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif @@ -36,17 +36,17 @@ #include -#include "polarssl/aes.h" +#include "mbedtls/aes.h" #if defined(POLARSSL_PADLOCK_C) -#include "polarssl/padlock.h" +#include "mbedtls/padlock.h" #endif #if defined(POLARSSL_AESNI_C) -#include "polarssl/aesni.h" +#include "mbedtls/aesni.h" #endif #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/aesni.c b/library/aesni.c index 5315aba22..a6897b265 100644 --- a/library/aesni.c +++ b/library/aesni.c @@ -26,14 +26,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_AESNI_C) -#include "polarssl/aesni.h" +#include "mbedtls/aesni.h" #include diff --git a/library/arc4.c b/library/arc4.c index 309d16a85..e790579ab 100644 --- a/library/arc4.c +++ b/library/arc4.c @@ -26,20 +26,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ARC4_C) -#include "polarssl/arc4.h" +#include "mbedtls/arc4.h" #include #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/asn1parse.c b/library/asn1parse.c index e4f46eb0a..202a6ce27 100644 --- a/library/asn1parse.c +++ b/library/asn1parse.c @@ -21,23 +21,23 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ASN1_PARSE_C) -#include "polarssl/asn1.h" +#include "mbedtls/asn1.h" #include #if defined(POLARSSL_BIGNUM_C) -#include "polarssl/bignum.h" +#include "mbedtls/bignum.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/asn1write.c b/library/asn1write.c index df9442ef8..78038675d 100644 --- a/library/asn1write.c +++ b/library/asn1write.c @@ -21,19 +21,19 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ASN1_WRITE_C) -#include "polarssl/asn1write.h" +#include "mbedtls/asn1write.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/base64.c b/library/base64.c index ac922a474..5af79df67 100644 --- a/library/base64.c +++ b/library/base64.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_BASE64_C) -#include "polarssl/base64.h" +#include "mbedtls/base64.h" #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) #include @@ -40,7 +40,7 @@ typedef UINT32 uint32_t; #if defined(POLARSSL_SELF_TEST) #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/bignum.c b/library/bignum.c index da70ae0c7..86376a470 100644 --- a/library/bignum.c +++ b/library/bignum.c @@ -28,20 +28,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_BIGNUM_C) -#include "polarssl/bignum.h" -#include "polarssl/bn_mul.h" +#include "mbedtls/bignum.h" +#include "mbedtls/bn_mul.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #include diff --git a/library/blowfish.c b/library/blowfish.c index 77191e7ea..76ceb865b 100644 --- a/library/blowfish.c +++ b/library/blowfish.c @@ -27,14 +27,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_BLOWFISH_C) -#include "polarssl/blowfish.h" +#include "mbedtls/blowfish.h" #include diff --git a/library/camellia.c b/library/camellia.c index 2a1c0c4d8..1aa65166d 100644 --- a/library/camellia.c +++ b/library/camellia.c @@ -27,20 +27,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_CAMELLIA_C) -#include "polarssl/camellia.h" +#include "mbedtls/camellia.h" #include #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/ccm.c b/library/ccm.c index 87f1886bd..6f3db0191 100644 --- a/library/ccm.c +++ b/library/ccm.c @@ -30,20 +30,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_CCM_C) -#include "polarssl/ccm.h" +#include "mbedtls/ccm.h" #include #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/certs.c b/library/certs.c index 95fc8cc77..bf12f77ca 100644 --- a/library/certs.c +++ b/library/certs.c @@ -21,7 +21,7 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif diff --git a/library/cipher.c b/library/cipher.c index 8c7452b1f..53348516d 100644 --- a/library/cipher.c +++ b/library/cipher.c @@ -25,25 +25,25 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_CIPHER_C) -#include "polarssl/cipher.h" -#include "polarssl/cipher_wrap.h" +#include "mbedtls/cipher.h" +#include "mbedtls/cipher_wrap.h" #include #include #if defined(POLARSSL_GCM_C) -#include "polarssl/gcm.h" +#include "mbedtls/gcm.h" #endif #if defined(POLARSSL_CCM_C) -#include "polarssl/ccm.h" +#include "mbedtls/ccm.h" #endif #if defined(POLARSSL_ARC4_C) || defined(POLARSSL_CIPHER_NULL_CIPHER) diff --git a/library/cipher_wrap.c b/library/cipher_wrap.c index 4c170bc37..4478cc873 100644 --- a/library/cipher_wrap.c +++ b/library/cipher_wrap.c @@ -25,41 +25,41 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_CIPHER_C) -#include "polarssl/cipher_wrap.h" +#include "mbedtls/cipher_wrap.h" #if defined(POLARSSL_AES_C) -#include "polarssl/aes.h" +#include "mbedtls/aes.h" #endif #if defined(POLARSSL_ARC4_C) -#include "polarssl/arc4.h" +#include "mbedtls/arc4.h" #endif #if defined(POLARSSL_CAMELLIA_C) -#include "polarssl/camellia.h" +#include "mbedtls/camellia.h" #endif #if defined(POLARSSL_DES_C) -#include "polarssl/des.h" +#include "mbedtls/des.h" #endif #if defined(POLARSSL_BLOWFISH_C) -#include "polarssl/blowfish.h" +#include "mbedtls/blowfish.h" #endif #if defined(POLARSSL_GCM_C) -#include "polarssl/gcm.h" +#include "mbedtls/gcm.h" #endif #if defined(POLARSSL_CCM_C) -#include "polarssl/ccm.h" +#include "mbedtls/ccm.h" #endif #if defined(POLARSSL_CIPHER_NULL_CIPHER) @@ -67,7 +67,7 @@ #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/ctr_drbg.c b/library/ctr_drbg.c index de4a6e814..2d39c7a1b 100644 --- a/library/ctr_drbg.c +++ b/library/ctr_drbg.c @@ -26,14 +26,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/ctr_drbg.h" +#include "mbedtls/ctr_drbg.h" #include @@ -43,7 +43,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/debug.c b/library/debug.c index 825cc9480..bb497b85c 100644 --- a/library/debug.c +++ b/library/debug.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_DEBUG_C) -#include "polarssl/debug.h" +#include "mbedtls/debug.h" #include #include @@ -45,7 +45,7 @@ #endif /* _MSC_VER */ #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_snprintf snprintf #endif diff --git a/library/des.c b/library/des.c index 080e11392..be7348bb3 100644 --- a/library/des.c +++ b/library/des.c @@ -27,20 +27,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_DES_C) -#include "polarssl/des.h" +#include "mbedtls/des.h" #include #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/dhm.c b/library/dhm.c index 9fb7a218b..b72c7f055 100644 --- a/library/dhm.c +++ b/library/dhm.c @@ -26,27 +26,27 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_DHM_C) -#include "polarssl/dhm.h" +#include "mbedtls/dhm.h" #include #if defined(POLARSSL_PEM_PARSE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_ASN1_PARSE_C) -#include "polarssl/asn1.h" +#include "mbedtls/asn1.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #include @@ -552,7 +552,7 @@ int dhm_parse_dhmfile( dhm_context *dhm, const char *path ) #if defined(POLARSSL_SELF_TEST) -#include "polarssl/certs.h" +#include "mbedtls/certs.h" /* * Checkup routine diff --git a/library/ecdh.c b/library/ecdh.c index 82fff276a..5866c44de 100644 --- a/library/ecdh.c +++ b/library/ecdh.c @@ -28,14 +28,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ECDH_C) -#include "polarssl/ecdh.h" +#include "mbedtls/ecdh.h" #include diff --git a/library/ecdsa.c b/library/ecdsa.c index 3f72d857c..11cf18a1b 100644 --- a/library/ecdsa.c +++ b/library/ecdsa.c @@ -27,20 +27,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ECDSA_C) -#include "polarssl/ecdsa.h" -#include "polarssl/asn1write.h" +#include "mbedtls/ecdsa.h" +#include "mbedtls/asn1write.h" #include #if defined(POLARSSL_ECDSA_DETERMINISTIC) -#include "polarssl/hmac_drbg.h" +#include "mbedtls/hmac_drbg.h" #endif #if defined(POLARSSL_ECDSA_DETERMINISTIC) diff --git a/library/ecp.c b/library/ecp.c index be6b0d5d1..63557ba0b 100644 --- a/library/ecp.c +++ b/library/ecp.c @@ -42,19 +42,19 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #include diff --git a/library/ecp_curves.c b/library/ecp_curves.c index 3786356c3..893bfa92b 100644 --- a/library/ecp_curves.c +++ b/library/ecp_curves.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #include diff --git a/library/entropy.c b/library/entropy.c index c90c7e462..fe271d33b 100644 --- a/library/entropy.c +++ b/library/entropy.c @@ -21,15 +21,15 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ENTROPY_C) -#include "polarssl/entropy.h" -#include "polarssl/entropy_poll.h" +#include "mbedtls/entropy.h" +#include "mbedtls/entropy_poll.h" #include @@ -39,7 +39,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -47,7 +47,7 @@ #endif /* POLARSSL_SELF_TEST */ #if defined(POLARSSL_HAVEGE_C) -#include "polarssl/havege.h" +#include "mbedtls/havege.h" #endif /* Implementation that should never be optimized out by the compiler */ diff --git a/library/entropy_poll.c b/library/entropy_poll.c index 61eb3e78a..e0eff165c 100644 --- a/library/entropy_poll.c +++ b/library/entropy_poll.c @@ -21,22 +21,22 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ENTROPY_C) -#include "polarssl/entropy.h" -#include "polarssl/entropy_poll.h" +#include "mbedtls/entropy.h" +#include "mbedtls/entropy_poll.h" #if defined(POLARSSL_TIMING_C) #include -#include "polarssl/timing.h" +#include "mbedtls/timing.h" #endif #if defined(POLARSSL_HAVEGE_C) -#include "polarssl/havege.h" +#include "mbedtls/havege.h" #endif #if !defined(POLARSSL_NO_PLATFORM_ENTROPY) diff --git a/library/error.c b/library/error.c index cb0324db4..38be87935 100644 --- a/library/error.c +++ b/library/error.c @@ -21,18 +21,18 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY) -#include "polarssl/error.h" +#include "mbedtls/error.h" #include #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_snprintf snprintf #endif @@ -42,143 +42,143 @@ #include #if defined(POLARSSL_AES_C) -#include "polarssl/aes.h" +#include "mbedtls/aes.h" #endif #if defined(POLARSSL_BASE64_C) -#include "polarssl/base64.h" +#include "mbedtls/base64.h" #endif #if defined(POLARSSL_BIGNUM_C) -#include "polarssl/bignum.h" +#include "mbedtls/bignum.h" #endif #if defined(POLARSSL_BLOWFISH_C) -#include "polarssl/blowfish.h" +#include "mbedtls/blowfish.h" #endif #if defined(POLARSSL_CAMELLIA_C) -#include "polarssl/camellia.h" +#include "mbedtls/camellia.h" #endif #if defined(POLARSSL_CCM_C) -#include "polarssl/ccm.h" +#include "mbedtls/ccm.h" #endif #if defined(POLARSSL_CIPHER_C) -#include "polarssl/cipher.h" +#include "mbedtls/cipher.h" #endif #if defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/ctr_drbg.h" +#include "mbedtls/ctr_drbg.h" #endif #if defined(POLARSSL_DES_C) -#include "polarssl/des.h" +#include "mbedtls/des.h" #endif #if defined(POLARSSL_DHM_C) -#include "polarssl/dhm.h" +#include "mbedtls/dhm.h" #endif #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(POLARSSL_ENTROPY_C) -#include "polarssl/entropy.h" +#include "mbedtls/entropy.h" #endif #if defined(POLARSSL_GCM_C) -#include "polarssl/gcm.h" +#include "mbedtls/gcm.h" #endif #if defined(POLARSSL_HMAC_DRBG_C) -#include "polarssl/hmac_drbg.h" +#include "mbedtls/hmac_drbg.h" #endif #if defined(POLARSSL_MD_C) -#include "polarssl/md.h" +#include "mbedtls/md.h" #endif #if defined(POLARSSL_MD2_C) -#include "polarssl/md2.h" +#include "mbedtls/md2.h" #endif #if defined(POLARSSL_MD4_C) -#include "polarssl/md4.h" +#include "mbedtls/md4.h" #endif #if defined(POLARSSL_MD5_C) -#include "polarssl/md5.h" +#include "mbedtls/md5.h" #endif #if defined(POLARSSL_NET_C) -#include "polarssl/net.h" +#include "mbedtls/net.h" #endif #if defined(POLARSSL_OID_C) -#include "polarssl/oid.h" +#include "mbedtls/oid.h" #endif #if defined(POLARSSL_PADLOCK_C) -#include "polarssl/padlock.h" +#include "mbedtls/padlock.h" #endif #if defined(POLARSSL_PBKDF2_C) -#include "polarssl/pbkdf2.h" +#include "mbedtls/pbkdf2.h" #endif #if defined(POLARSSL_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PK_C) -#include "polarssl/pk.h" +#include "mbedtls/pk.h" #endif #if defined(POLARSSL_PKCS12_C) -#include "polarssl/pkcs12.h" +#include "mbedtls/pkcs12.h" #endif #if defined(POLARSSL_PKCS5_C) -#include "polarssl/pkcs5.h" +#include "mbedtls/pkcs5.h" #endif #if defined(POLARSSL_RIPEMD160_C) -#include "polarssl/ripemd160.h" +#include "mbedtls/ripemd160.h" #endif #if defined(POLARSSL_RSA_C) -#include "polarssl/rsa.h" +#include "mbedtls/rsa.h" #endif #if defined(POLARSSL_SHA1_C) -#include "polarssl/sha1.h" +#include "mbedtls/sha1.h" #endif #if defined(POLARSSL_SHA256_C) -#include "polarssl/sha256.h" +#include "mbedtls/sha256.h" #endif #if defined(POLARSSL_SHA512_C) -#include "polarssl/sha512.h" +#include "mbedtls/sha512.h" #endif #if defined(POLARSSL_SSL_TLS_C) -#include "polarssl/ssl.h" +#include "mbedtls/ssl.h" #endif #if defined(POLARSSL_THREADING_C) -#include "polarssl/threading.h" +#include "mbedtls/threading.h" #endif #if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C) -#include "polarssl/x509.h" +#include "mbedtls/x509.h" #endif #if defined(POLARSSL_XTEA_C) -#include "polarssl/xtea.h" +#include "mbedtls/xtea.h" #endif #if defined(_MSC_VER) && !defined snprintf && !defined(EFIX64) && \ diff --git a/library/gcm.c b/library/gcm.c index 4e2735c0d..1a49180ca 100644 --- a/library/gcm.c +++ b/library/gcm.c @@ -31,24 +31,24 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_GCM_C) -#include "polarssl/gcm.h" +#include "mbedtls/gcm.h" #include #if defined(POLARSSL_AESNI_C) -#include "polarssl/aesni.h" +#include "mbedtls/aesni.h" #endif #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/havege.c b/library/havege.c index fe656991c..d07a33475 100644 --- a/library/havege.c +++ b/library/havege.c @@ -28,15 +28,15 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_HAVEGE_C) -#include "polarssl/havege.h" -#include "polarssl/timing.h" +#include "mbedtls/havege.h" +#include "mbedtls/timing.h" #include diff --git a/library/hmac_drbg.c b/library/hmac_drbg.c index f4cac28ae..c3a673cb4 100644 --- a/library/hmac_drbg.c +++ b/library/hmac_drbg.c @@ -27,14 +27,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_HMAC_DRBG_C) -#include "polarssl/hmac_drbg.h" +#include "mbedtls/hmac_drbg.h" #include @@ -44,7 +44,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/md.c b/library/md.c index fbdab9117..4710d7574 100644 --- a/library/md.c +++ b/library/md.c @@ -25,15 +25,15 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_MD_C) -#include "polarssl/md.h" -#include "polarssl/md_wrap.h" +#include "mbedtls/md.h" +#include "mbedtls/md_wrap.h" #include #include diff --git a/library/md2.c b/library/md2.c index 17569c0a8..a8b67f3fa 100644 --- a/library/md2.c +++ b/library/md2.c @@ -27,14 +27,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_MD2_C) -#include "polarssl/md2.h" +#include "mbedtls/md2.h" #include @@ -44,7 +44,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/md4.c b/library/md4.c index d33cc520a..e62a92d05 100644 --- a/library/md4.c +++ b/library/md4.c @@ -27,14 +27,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_MD4_C) -#include "polarssl/md4.h" +#include "mbedtls/md4.h" #include @@ -44,7 +44,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/md5.c b/library/md5.c index a14a9cf7d..4f0c5c1ef 100644 --- a/library/md5.c +++ b/library/md5.c @@ -26,14 +26,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_MD5_C) -#include "polarssl/md5.h" +#include "mbedtls/md5.h" #include @@ -43,7 +43,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/md_wrap.c b/library/md_wrap.c index f554333e7..fcc3102af 100644 --- a/library/md_wrap.c +++ b/library/md_wrap.c @@ -25,45 +25,45 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_MD_C) -#include "polarssl/md_wrap.h" +#include "mbedtls/md_wrap.h" #if defined(POLARSSL_MD2_C) -#include "polarssl/md2.h" +#include "mbedtls/md2.h" #endif #if defined(POLARSSL_MD4_C) -#include "polarssl/md4.h" +#include "mbedtls/md4.h" #endif #if defined(POLARSSL_MD5_C) -#include "polarssl/md5.h" +#include "mbedtls/md5.h" #endif #if defined(POLARSSL_RIPEMD160_C) -#include "polarssl/ripemd160.h" +#include "mbedtls/ripemd160.h" #endif #if defined(POLARSSL_SHA1_C) -#include "polarssl/sha1.h" +#include "mbedtls/sha1.h" #endif #if defined(POLARSSL_SHA256_C) -#include "polarssl/sha256.h" +#include "mbedtls/sha256.h" #endif #if defined(POLARSSL_SHA512_C) -#include "polarssl/sha512.h" +#include "mbedtls/sha512.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/memory_buffer_alloc.c b/library/memory_buffer_alloc.c index 5eb8ab138..1d7750a29 100644 --- a/library/memory_buffer_alloc.c +++ b/library/memory_buffer_alloc.c @@ -21,17 +21,17 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" /* No need for the header guard as POLARSSL_MEMORY_BUFFER_ALLOC_C is dependent upon POLARSSL_PLATFORM_C */ -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #include @@ -40,7 +40,7 @@ #endif #if defined(POLARSSL_THREADING_C) -#include "polarssl/threading.h" +#include "mbedtls/threading.h" #endif /* Implementation that should never be optimized out by the compiler */ diff --git a/library/net.c b/library/net.c index 68c9e5e6b..2d494631f 100644 --- a/library/net.c +++ b/library/net.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_NET_C) -#include "polarssl/net.h" +#include "mbedtls/net.h" #include @@ -130,7 +130,7 @@ typedef UINT32 uint32_t; #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_snprintf snprintf #endif diff --git a/library/oid.c b/library/oid.c index ad45a3d45..2979d6a95 100644 --- a/library/oid.c +++ b/library/oid.c @@ -23,27 +23,27 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_OID_C) -#include "polarssl/oid.h" -#include "polarssl/rsa.h" +#include "mbedtls/oid.h" +#include "mbedtls/rsa.h" #include #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_snprintf snprintf #endif #if defined(POLARSSL_X509_USE_C) || defined(POLARSSL_X509_CREATE_C) -#include "polarssl/x509.h" +#include "mbedtls/x509.h" #endif /* diff --git a/library/padlock.c b/library/padlock.c index f4d95fdf2..eff53654d 100644 --- a/library/padlock.c +++ b/library/padlock.c @@ -27,14 +27,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PADLOCK_C) -#include "polarssl/padlock.h" +#include "mbedtls/padlock.h" #include diff --git a/library/pbkdf2.c b/library/pbkdf2.c index 54494ab4e..863d01693 100644 --- a/library/pbkdf2.c +++ b/library/pbkdf2.c @@ -32,15 +32,15 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PBKDF2_C) -#include "polarssl/pbkdf2.h" -#include "polarssl/pkcs5.h" +#include "mbedtls/pbkdf2.h" +#include "mbedtls/pkcs5.h" int pbkdf2_hmac( md_context_t *ctx, const unsigned char *password, size_t plen, const unsigned char *salt, size_t slen, diff --git a/library/pem.c b/library/pem.c index 68be8fd6d..c72228226 100644 --- a/library/pem.c +++ b/library/pem.c @@ -21,24 +21,24 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PEM_PARSE_C) || defined(POLARSSL_PEM_WRITE_C) -#include "polarssl/pem.h" -#include "polarssl/base64.h" -#include "polarssl/des.h" -#include "polarssl/aes.h" -#include "polarssl/md5.h" -#include "polarssl/cipher.h" +#include "mbedtls/pem.h" +#include "mbedtls/base64.h" +#include "mbedtls/des.h" +#include "mbedtls/aes.h" +#include "mbedtls/md5.h" +#include "mbedtls/cipher.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/pk.c b/library/pk.c index 4d78b5745..7652510c5 100644 --- a/library/pk.c +++ b/library/pk.c @@ -21,23 +21,23 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PK_C) -#include "polarssl/pk.h" -#include "polarssl/pk_wrap.h" +#include "mbedtls/pk.h" +#include "mbedtls/pk_wrap.h" #if defined(POLARSSL_RSA_C) -#include "polarssl/rsa.h" +#include "mbedtls/rsa.h" #endif #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(POLARSSL_ECDSA_C) -#include "polarssl/ecdsa.h" +#include "mbedtls/ecdsa.h" #endif /* Implementation that should never be optimized out by the compiler */ diff --git a/library/pk_wrap.c b/library/pk_wrap.c index 6068605bf..66afa7cb6 100644 --- a/library/pk_wrap.c +++ b/library/pk_wrap.c @@ -21,29 +21,29 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PK_C) -#include "polarssl/pk_wrap.h" +#include "mbedtls/pk_wrap.h" /* Even if RSA not activated, for the sake of RSA-alt */ -#include "polarssl/rsa.h" +#include "mbedtls/rsa.h" #include #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(POLARSSL_ECDSA_C) -#include "polarssl/ecdsa.h" +#include "mbedtls/ecdsa.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/pkcs11.c b/library/pkcs11.c index 14cde315b..394354149 100644 --- a/library/pkcs11.c +++ b/library/pkcs11.c @@ -24,16 +24,16 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "polarssl/pkcs11.h" +#include "mbedtls/pkcs11.h" #if defined(POLARSSL_PKCS11_C) -#include "polarssl/md.h" -#include "polarssl/oid.h" -#include "polarssl/x509_crt.h" +#include "mbedtls/md.h" +#include "mbedtls/oid.h" +#include "mbedtls/x509_crt.h" #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/pkcs12.c b/library/pkcs12.c index f84fd52cd..66b29c163 100644 --- a/library/pkcs12.c +++ b/library/pkcs12.c @@ -27,25 +27,25 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PKCS12_C) -#include "polarssl/pkcs12.h" -#include "polarssl/asn1.h" -#include "polarssl/cipher.h" +#include "mbedtls/pkcs12.h" +#include "mbedtls/asn1.h" +#include "mbedtls/cipher.h" #include #if defined(POLARSSL_ARC4_C) -#include "polarssl/arc4.h" +#include "mbedtls/arc4.h" #endif #if defined(POLARSSL_DES_C) -#include "polarssl/des.h" +#include "mbedtls/des.h" #endif /* Implementation that should never be optimized out by the compiler */ diff --git a/library/pkcs5.c b/library/pkcs5.c index 2e7d816ae..dae5e4142 100644 --- a/library/pkcs5.c +++ b/library/pkcs5.c @@ -31,22 +31,22 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PKCS5_C) -#include "polarssl/pkcs5.h" -#include "polarssl/asn1.h" -#include "polarssl/cipher.h" -#include "polarssl/oid.h" +#include "mbedtls/pkcs5.h" +#include "mbedtls/asn1.h" +#include "mbedtls/cipher.h" +#include "mbedtls/oid.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/pkparse.c b/library/pkparse.c index 06fb2929f..1529a9395 100644 --- a/library/pkparse.c +++ b/library/pkparse.c @@ -21,40 +21,40 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PK_PARSE_C) -#include "polarssl/pk.h" -#include "polarssl/asn1.h" -#include "polarssl/oid.h" +#include "mbedtls/pk.h" +#include "mbedtls/asn1.h" +#include "mbedtls/oid.h" #include #if defined(POLARSSL_RSA_C) -#include "polarssl/rsa.h" +#include "mbedtls/rsa.h" #endif #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(POLARSSL_ECDSA_C) -#include "polarssl/ecdsa.h" +#include "mbedtls/ecdsa.h" #endif #if defined(POLARSSL_PEM_PARSE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PKCS5_C) -#include "polarssl/pkcs5.h" +#include "mbedtls/pkcs5.h" #endif #if defined(POLARSSL_PKCS12_C) -#include "polarssl/pkcs12.h" +#include "mbedtls/pkcs12.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/pkwrite.c b/library/pkwrite.c index 35dbd0b75..2c08b9219 100644 --- a/library/pkwrite.c +++ b/library/pkwrite.c @@ -21,34 +21,34 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PK_WRITE_C) -#include "polarssl/pk.h" -#include "polarssl/asn1write.h" -#include "polarssl/oid.h" +#include "mbedtls/pk.h" +#include "mbedtls/asn1write.h" +#include "mbedtls/oid.h" #include #if defined(POLARSSL_RSA_C) -#include "polarssl/rsa.h" +#include "mbedtls/rsa.h" #endif #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(POLARSSL_ECDSA_C) -#include "polarssl/ecdsa.h" +#include "mbedtls/ecdsa.h" #endif #if defined(POLARSSL_PEM_WRITE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/platform.c b/library/platform.c index a161bc3ea..fb6805f36 100644 --- a/library/platform.c +++ b/library/platform.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #if defined(POLARSSL_PLATFORM_MEMORY) #if !defined(POLARSSL_PLATFORM_STD_MALLOC) diff --git a/library/ripemd160.c b/library/ripemd160.c index 2c196f42b..0ca354ccf 100644 --- a/library/ripemd160.c +++ b/library/ripemd160.c @@ -27,14 +27,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_RIPEMD160_C) -#include "polarssl/ripemd160.h" +#include "mbedtls/ripemd160.h" #include @@ -44,7 +44,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/rsa.c b/library/rsa.c index 0d71ad0c8..e915e4fad 100644 --- a/library/rsa.c +++ b/library/rsa.c @@ -27,20 +27,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_RSA_C) -#include "polarssl/rsa.h" -#include "polarssl/oid.h" +#include "mbedtls/rsa.h" +#include "mbedtls/oid.h" #include #if defined(POLARSSL_PKCS1_V21) -#include "polarssl/md.h" +#include "mbedtls/md.h" #endif #if defined(POLARSSL_PKCS1_V15) && !defined(__OpenBSD__) @@ -48,7 +48,7 @@ #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -1471,7 +1471,7 @@ void rsa_free( rsa_context *ctx ) #if defined(POLARSSL_SELF_TEST) -#include "polarssl/sha1.h" +#include "mbedtls/sha1.h" /* * Example RSA-1024 keypair, for test purposes diff --git a/library/sha1.c b/library/sha1.c index 35e062583..53f5f2642 100644 --- a/library/sha1.c +++ b/library/sha1.c @@ -26,14 +26,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SHA1_C) -#include "polarssl/sha1.h" +#include "mbedtls/sha1.h" #include @@ -43,7 +43,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/sha256.c b/library/sha256.c index b9b3f097b..1b2d4b22f 100644 --- a/library/sha256.c +++ b/library/sha256.c @@ -26,14 +26,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SHA256_C) -#include "polarssl/sha256.h" +#include "mbedtls/sha256.h" #include @@ -43,7 +43,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/sha512.c b/library/sha512.c index 629ed1b58..1ef088f2f 100644 --- a/library/sha512.c +++ b/library/sha512.c @@ -26,14 +26,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SHA512_C) -#include "polarssl/sha512.h" +#include "mbedtls/sha512.h" #if defined(_MSC_VER) || defined(__WATCOMC__) #define UL64(x) x##ui64 @@ -49,7 +49,7 @@ #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/library/ssl_cache.c b/library/ssl_cache.c index 0c2df29bb..eaf67e8e5 100644 --- a/library/ssl_cache.c +++ b/library/ssl_cache.c @@ -25,19 +25,19 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SSL_CACHE_C) -#include "polarssl/ssl_cache.h" +#include "mbedtls/ssl_cache.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/ssl_ciphersuites.c b/library/ssl_ciphersuites.c index 694bcf08b..11c46a590 100644 --- a/library/ssl_ciphersuites.c +++ b/library/ssl_ciphersuites.c @@ -23,15 +23,15 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SSL_TLS_C) -#include "polarssl/ssl_ciphersuites.h" -#include "polarssl/ssl.h" +#include "mbedtls/ssl_ciphersuites.h" +#include "mbedtls/ssl.h" // #include #include diff --git a/library/ssl_cli.c b/library/ssl_cli.c index 95618726d..bdb5522b6 100644 --- a/library/ssl_cli.c +++ b/library/ssl_cli.c @@ -21,20 +21,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SSL_CLI_C) -#include "polarssl/debug.h" -#include "polarssl/ssl.h" +#include "mbedtls/debug.h" +#include "mbedtls/ssl.h" #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/ssl_cookie.c b/library/ssl_cookie.c index 4f8ad68d0..c2fde82a2 100644 --- a/library/ssl_cookie.c +++ b/library/ssl_cookie.c @@ -25,17 +25,17 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SSL_COOKIE_C) -#include "polarssl/ssl_cookie.h" +#include "mbedtls/ssl_cookie.h" #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_malloc malloc #define polarssl_free free diff --git a/library/ssl_srv.c b/library/ssl_srv.c index ebae2724f..cc3ee3e02 100644 --- a/library/ssl_srv.c +++ b/library/ssl_srv.c @@ -21,24 +21,24 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SSL_SRV_C) -#include "polarssl/debug.h" -#include "polarssl/ssl.h" +#include "mbedtls/debug.h" +#include "mbedtls/ssl.h" #include #if defined(POLARSSL_ECP_C) -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/ssl_tls.c b/library/ssl_tls.c index d474ccdab..e9baa8f81 100644 --- a/library/ssl_tls.c +++ b/library/ssl_tls.c @@ -29,25 +29,25 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SSL_TLS_C) -#include "polarssl/debug.h" -#include "polarssl/ssl.h" +#include "mbedtls/debug.h" +#include "mbedtls/ssl.h" #include #if defined(POLARSSL_X509_CRT_PARSE_C) && \ defined(POLARSSL_X509_CHECK_EXTENDED_KEY_USAGE) -#include "polarssl/oid.h" +#include "mbedtls/oid.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_malloc malloc diff --git a/library/threading.c b/library/threading.c index 5d48516ba..b383efefc 100644 --- a/library/threading.c +++ b/library/threading.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_THREADING_C) -#include "polarssl/threading.h" +#include "mbedtls/threading.h" #if defined(POLARSSL_THREADING_PTHREAD) static int threading_mutex_init_pthread( threading_mutex_t *mutex ) diff --git a/library/timing.c b/library/timing.c index 5d58f529a..751b0b4a4 100644 --- a/library/timing.c +++ b/library/timing.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,7 +35,7 @@ #if defined(POLARSSL_TIMING_C) && !defined(POLARSSL_TIMING_ALT) -#include "polarssl/timing.h" +#include "mbedtls/timing.h" #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) @@ -337,7 +337,7 @@ void m_sleep( int milliseconds ) /* To test net_usleep against our functions */ #if defined(POLARSSL_NET_C) && defined(POLARSSL_HAVE_TIME) -#include "polarssl/net.h" +#include "mbedtls/net.h" #endif /* diff --git a/library/version.c b/library/version.c index 2856d6ccd..c3af429d9 100644 --- a/library/version.c +++ b/library/version.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_VERSION_C) -#include "polarssl/version.h" +#include "mbedtls/version.h" #include unsigned int version_get_number() diff --git a/library/version_features.c b/library/version_features.c index fcda59575..ebcda4cb8 100644 --- a/library/version_features.c +++ b/library/version_features.c @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_VERSION_C) -#include "polarssl/version.h" +#include "mbedtls/version.h" #include diff --git a/library/x509.c b/library/x509.c index b35663d8c..c1fd8ad7d 100644 --- a/library/x509.c +++ b/library/x509.c @@ -31,26 +31,26 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_USE_C) -#include "polarssl/x509.h" -#include "polarssl/asn1.h" -#include "polarssl/oid.h" +#include "mbedtls/x509.h" +#include "mbedtls/asn1.h" +#include "mbedtls/oid.h" #include #include #if defined(POLARSSL_PEM_PARSE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #include @@ -1009,8 +1009,8 @@ int x509_time_future( const x509_time *from ) #if defined(POLARSSL_SELF_TEST) -#include "polarssl/x509_crt.h" -#include "polarssl/certs.h" +#include "mbedtls/x509_crt.h" +#include "mbedtls/certs.h" /* * Checkup routine diff --git a/library/x509_create.c b/library/x509_create.c index f505bab80..5318cd3fb 100644 --- a/library/x509_create.c +++ b/library/x509_create.c @@ -21,16 +21,16 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_CREATE_C) -#include "polarssl/x509.h" -#include "polarssl/asn1write.h" -#include "polarssl/oid.h" +#include "mbedtls/x509.h" +#include "mbedtls/asn1write.h" +#include "mbedtls/oid.h" #include diff --git a/library/x509_crl.c b/library/x509_crl.c index e2076a661..afba7b2e8 100644 --- a/library/x509_crl.c +++ b/library/x509_crl.c @@ -31,24 +31,24 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_CRL_PARSE_C) -#include "polarssl/x509_crl.h" -#include "polarssl/oid.h" +#include "mbedtls/x509_crl.h" +#include "mbedtls/oid.h" #include #if defined(POLARSSL_PEM_PARSE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #include diff --git a/library/x509_crt.c b/library/x509_crt.c index 77008ed23..84e441506 100644 --- a/library/x509_crt.c +++ b/library/x509_crt.c @@ -31,25 +31,25 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_CRT_PARSE_C) -#include "polarssl/x509_crt.h" -#include "polarssl/oid.h" +#include "mbedtls/x509_crt.h" +#include "mbedtls/oid.h" #include #include #if defined(POLARSSL_PEM_PARSE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_free free @@ -58,7 +58,7 @@ #endif #if defined(POLARSSL_THREADING_C) -#include "polarssl/threading.h" +#include "mbedtls/threading.h" #endif #if defined(_WIN32) && !defined(EFIX64) && !defined(EFI32) diff --git a/library/x509_csr.c b/library/x509_csr.c index 558b078b7..e62417e16 100644 --- a/library/x509_csr.c +++ b/library/x509_csr.c @@ -31,24 +31,24 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_CSR_PARSE_C) -#include "polarssl/x509_csr.h" -#include "polarssl/oid.h" +#include "mbedtls/x509_csr.h" +#include "mbedtls/oid.h" #include #if defined(POLARSSL_PEM_PARSE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #include diff --git a/library/x509write_crt.c b/library/x509write_crt.c index 80913ec19..89a298828 100644 --- a/library/x509write_crt.c +++ b/library/x509write_crt.c @@ -27,22 +27,22 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_CRT_WRITE_C) -#include "polarssl/x509_crt.h" -#include "polarssl/oid.h" -#include "polarssl/asn1write.h" -#include "polarssl/sha1.h" +#include "mbedtls/x509_crt.h" +#include "mbedtls/oid.h" +#include "mbedtls/asn1write.h" +#include "mbedtls/sha1.h" #include #if defined(POLARSSL_PEM_WRITE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif /* POLARSSL_PEM_WRITE_C */ /* Implementation that should never be optimized out by the compiler */ diff --git a/library/x509write_csr.c b/library/x509write_csr.c index c5a587540..6c112e603 100644 --- a/library/x509write_csr.c +++ b/library/x509write_csr.c @@ -26,22 +26,22 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_X509_CSR_WRITE_C) -#include "polarssl/x509_csr.h" -#include "polarssl/oid.h" -#include "polarssl/asn1write.h" +#include "mbedtls/x509_csr.h" +#include "mbedtls/oid.h" +#include "mbedtls/asn1write.h" #include #include #if defined(POLARSSL_PEM_WRITE_C) -#include "polarssl/pem.h" +#include "mbedtls/pem.h" #endif /* Implementation that should never be optimized out by the compiler */ diff --git a/library/xtea.c b/library/xtea.c index 0558b93c8..8fac8c139 100644 --- a/library/xtea.c +++ b/library/xtea.c @@ -21,20 +21,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_XTEA_C) -#include "polarssl/xtea.h" +#include "mbedtls/xtea.h" #include #if defined(POLARSSL_SELF_TEST) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/programs/aes/aescrypt2.c b/programs/aes/aescrypt2.c index 2582b9611..5d733b44f 100644 --- a/programs/aes/aescrypt2.c +++ b/programs/aes/aescrypt2.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -36,8 +36,8 @@ #if defined(POLARSSL_AES_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/aes.h" -#include "polarssl/sha256.h" +#include "mbedtls/aes.h" +#include "mbedtls/sha256.h" #include #include diff --git a/programs/aes/crypt_and_hash.c b/programs/aes/crypt_and_hash.c index 1f14d3f4d..b00293488 100644 --- a/programs/aes/crypt_and_hash.c +++ b/programs/aes/crypt_and_hash.c @@ -22,13 +22,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -37,8 +37,8 @@ #if defined(POLARSSL_CIPHER_C) && defined(POLARSSL_MD_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/cipher.h" -#include "polarssl/md.h" +#include "mbedtls/cipher.h" +#include "mbedtls/md.h" #include #include diff --git a/programs/hash/generic_sum.c b/programs/hash/generic_sum.c index 08f175d09..888f0f9a1 100644 --- a/programs/hash/generic_sum.c +++ b/programs/hash/generic_sum.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -35,7 +35,7 @@ #endif #if defined(POLARSSL_MD_C) && defined(POLARSSL_FS_IO) -#include "polarssl/md.h" +#include "mbedtls/md.h" #include #include diff --git a/programs/hash/hello.c b/programs/hash/hello.c index 77ae7f98b..be81d5678 100644 --- a/programs/hash/hello.c +++ b/programs/hash/hello.c @@ -21,20 +21,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf #endif #if defined(POLARSSL_MD5_C) -#include "polarssl/md5.h" +#include "mbedtls/md5.h" #endif #if !defined(POLARSSL_MD5_C) diff --git a/programs/hash/md5sum.c b/programs/hash/md5sum.c index f8e32f715..0ac0b0c7c 100644 --- a/programs/hash/md5sum.c +++ b/programs/hash/md5sum.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -35,7 +35,7 @@ #endif #if defined(POLARSSL_MD5_C) && defined(POLARSSL_FS_IO) -#include "polarssl/md5.h" +#include "mbedtls/md5.h" #include #include diff --git a/programs/hash/sha1sum.c b/programs/hash/sha1sum.c index dbdce3e5d..a6f96733b 100644 --- a/programs/hash/sha1sum.c +++ b/programs/hash/sha1sum.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -35,7 +35,7 @@ #endif #if defined(POLARSSL_SHA1_C) && defined(POLARSSL_FS_IO) -#include "polarssl/sha1.h" +#include "mbedtls/sha1.h" #include #include diff --git a/programs/hash/sha2sum.c b/programs/hash/sha2sum.c index 2ed92fcfc..453ea5d80 100644 --- a/programs/hash/sha2sum.c +++ b/programs/hash/sha2sum.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -35,7 +35,7 @@ #endif #if defined(POLARSSL_SHA256_C) && defined(POLARSSL_FS_IO) -#include "polarssl/sha256.h" +#include "mbedtls/sha256.h" #include #include diff --git a/programs/pkey/dh_client.c b/programs/pkey/dh_client.c index ef88958b2..8ff4e5c3a 100644 --- a/programs/pkey/dh_client.c +++ b/programs/pkey/dh_client.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -37,13 +37,13 @@ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_NET_C) && \ defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/net.h" -#include "polarssl/aes.h" -#include "polarssl/dhm.h" -#include "polarssl/rsa.h" -#include "polarssl/sha1.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/net.h" +#include "mbedtls/aes.h" +#include "mbedtls/dhm.h" +#include "mbedtls/rsa.h" +#include "mbedtls/sha1.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/dh_genprime.c b/programs/pkey/dh_genprime.c index b5f901847..c2f5b6cca 100644 --- a/programs/pkey/dh_genprime.c +++ b/programs/pkey/dh_genprime.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -36,9 +36,9 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_GENPRIME) -#include "polarssl/bignum.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/bignum.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/dh_server.c b/programs/pkey/dh_server.c index d0bc1c676..524e8d6c6 100644 --- a/programs/pkey/dh_server.c +++ b/programs/pkey/dh_server.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -37,13 +37,13 @@ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_NET_C) && \ defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/net.h" -#include "polarssl/aes.h" -#include "polarssl/dhm.h" -#include "polarssl/rsa.h" -#include "polarssl/sha1.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/net.h" +#include "mbedtls/aes.h" +#include "mbedtls/dhm.h" +#include "mbedtls/rsa.h" +#include "mbedtls/sha1.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/ecdsa.c b/programs/pkey/ecdsa.c index aa8eafb97..3d749785f 100644 --- a/programs/pkey/ecdsa.c +++ b/programs/pkey/ecdsa.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,9 +35,9 @@ #if defined(POLARSSL_ECDSA_C) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/ecdsa.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/ecdsa.h" #include #endif diff --git a/programs/pkey/gen_key.c b/programs/pkey/gen_key.c index fca35e55a..6b9311181 100644 --- a/programs/pkey/gen_key.c +++ b/programs/pkey/gen_key.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,13 +35,13 @@ #if defined(POLARSSL_PK_WRITE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/error.h" -#include "polarssl/pk.h" -#include "polarssl/ecdsa.h" -#include "polarssl/rsa.h" -#include "polarssl/error.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/error.h" +#include "mbedtls/pk.h" +#include "mbedtls/ecdsa.h" +#include "mbedtls/rsa.h" +#include "mbedtls/error.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/key_app.c b/programs/pkey/key_app.c index f8a2d2db7..c72f17d9f 100644 --- a/programs/pkey/key_app.c +++ b/programs/pkey/key_app.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,9 +35,9 @@ #if defined(POLARSSL_BIGNUM_C) && \ defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) -#include "polarssl/error.h" -#include "polarssl/rsa.h" -#include "polarssl/x509.h" +#include "mbedtls/error.h" +#include "mbedtls/rsa.h" +#include "mbedtls/x509.h" #include #endif diff --git a/programs/pkey/key_app_writer.c b/programs/pkey/key_app_writer.c index 3be1ce0de..1be0dd3a3 100644 --- a/programs/pkey/key_app_writer.c +++ b/programs/pkey/key_app_writer.c @@ -21,22 +21,22 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf #endif #if defined(POLARSSL_PK_WRITE_C) && defined(POLARSSL_FS_IO) -#include "polarssl/error.h" -#include "polarssl/pk.h" -#include "polarssl/error.h" +#include "mbedtls/error.h" +#include "mbedtls/pk.h" +#include "mbedtls/error.h" #include #include diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c index c94fb9764..9f013a1a7 100644 --- a/programs/pkey/mpi_demo.c +++ b/programs/pkey/mpi_demo.c @@ -21,20 +21,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf #endif #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_FS_IO) -#include "polarssl/bignum.h" +#include "mbedtls/bignum.h" #include #endif diff --git a/programs/pkey/pk_decrypt.c b/programs/pkey/pk_decrypt.c index bafa4a99c..a212351be 100644 --- a/programs/pkey/pk_decrypt.c +++ b/programs/pkey/pk_decrypt.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -36,10 +36,10 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/error.h" -#include "polarssl/pk.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/error.h" +#include "mbedtls/pk.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/pk_encrypt.c b/programs/pkey/pk_encrypt.c index ad94159a3..13fa484bd 100644 --- a/programs/pkey/pk_encrypt.c +++ b/programs/pkey/pk_encrypt.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -37,10 +37,10 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/error.h" -#include "polarssl/pk.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/error.h" +#include "mbedtls/pk.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/pk_sign.c b/programs/pkey/pk_sign.c index 7ccc70b6d..4b2a56891 100644 --- a/programs/pkey/pk_sign.c +++ b/programs/pkey/pk_sign.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_snprintf snprintf @@ -39,12 +39,12 @@ defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/error.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/md.h" -#include "polarssl/pk.h" -#include "polarssl/sha1.h" +#include "mbedtls/error.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/md.h" +#include "mbedtls/pk.h" +#include "mbedtls/sha1.h" #include #include diff --git a/programs/pkey/pk_verify.c b/programs/pkey/pk_verify.c index 3afa34a35..a9c66456d 100644 --- a/programs/pkey/pk_verify.c +++ b/programs/pkey/pk_verify.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_snprintf snprintf @@ -38,10 +38,10 @@ #if defined(POLARSSL_BIGNUM_C) && \ defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/error.h" -#include "polarssl/md.h" -#include "polarssl/pk.h" -#include "polarssl/sha1.h" +#include "mbedtls/error.h" +#include "mbedtls/md.h" +#include "mbedtls/pk.h" +#include "mbedtls/sha1.h" #include #include diff --git a/programs/pkey/rsa_decrypt.c b/programs/pkey/rsa_decrypt.c index dfa475c1a..215c3bc1e 100644 --- a/programs/pkey/rsa_decrypt.c +++ b/programs/pkey/rsa_decrypt.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -36,9 +36,9 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/rsa.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/rsa.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/rsa_encrypt.c b/programs/pkey/rsa_encrypt.c index 683183324..b3d23bb8a 100644 --- a/programs/pkey/rsa_encrypt.c +++ b/programs/pkey/rsa_encrypt.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -37,9 +37,9 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/rsa.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/rsa.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/pkey/rsa_genkey.c b/programs/pkey/rsa_genkey.c index 0270b53bc..d5f1cf501 100644 --- a/programs/pkey/rsa_genkey.c +++ b/programs/pkey/rsa_genkey.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -36,11 +36,11 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_RSA_C) && defined(POLARSSL_GENPRIME) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/bignum.h" -#include "polarssl/x509.h" -#include "polarssl/rsa.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/bignum.h" +#include "mbedtls/x509.h" +#include "mbedtls/rsa.h" #include #include diff --git a/programs/pkey/rsa_sign.c b/programs/pkey/rsa_sign.c index d9a9a6e51..69c7374f2 100644 --- a/programs/pkey/rsa_sign.c +++ b/programs/pkey/rsa_sign.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -36,8 +36,8 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_SHA256_C) && defined(POLARSSL_FS_IO) -#include "polarssl/rsa.h" -#include "polarssl/sha1.h" +#include "mbedtls/rsa.h" +#include "mbedtls/sha1.h" #include #include diff --git a/programs/pkey/rsa_sign_pss.c b/programs/pkey/rsa_sign_pss.c index 7c0c7ca88..075097528 100644 --- a/programs/pkey/rsa_sign_pss.c +++ b/programs/pkey/rsa_sign_pss.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_snprintf snprintf @@ -39,12 +39,12 @@ defined(POLARSSL_RSA_C) && defined(POLARSSL_SHA256_C) && \ defined(POLARSSL_PK_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/md.h" -#include "polarssl/rsa.h" -#include "polarssl/sha1.h" -#include "polarssl/x509.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/md.h" +#include "mbedtls/rsa.h" +#include "mbedtls/sha1.h" +#include "mbedtls/x509.h" #include #include diff --git a/programs/pkey/rsa_verify.c b/programs/pkey/rsa_verify.c index 374a5f1e2..5121afe59 100644 --- a/programs/pkey/rsa_verify.c +++ b/programs/pkey/rsa_verify.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,8 +35,8 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_SHA256_C) && defined(POLARSSL_FS_IO) -#include "polarssl/rsa.h" -#include "polarssl/sha1.h" +#include "mbedtls/rsa.h" +#include "mbedtls/sha1.h" #include #include diff --git a/programs/pkey/rsa_verify_pss.c b/programs/pkey/rsa_verify_pss.c index 217b7137f..50a0c06b8 100644 --- a/programs/pkey/rsa_verify_pss.c +++ b/programs/pkey/rsa_verify_pss.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_snprintf snprintf @@ -38,11 +38,11 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_SHA256_C) && defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/md.h" -#include "polarssl/pem.h" -#include "polarssl/pk.h" -#include "polarssl/sha1.h" -#include "polarssl/x509.h" +#include "mbedtls/md.h" +#include "mbedtls/pem.h" +#include "mbedtls/pk.h" +#include "mbedtls/sha1.h" +#include "mbedtls/x509.h" #include #include diff --git a/programs/random/gen_entropy.c b/programs/random/gen_entropy.c index 573a13bc1..b2a04d947 100644 --- a/programs/random/gen_entropy.c +++ b/programs/random/gen_entropy.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -35,7 +35,7 @@ #endif #if defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) -#include "polarssl/entropy.h" +#include "mbedtls/entropy.h" #include #endif diff --git a/programs/random/gen_random_ctr_drbg.c b/programs/random/gen_random_ctr_drbg.c index e96e37b4a..31b93bd60 100644 --- a/programs/random/gen_random_ctr_drbg.c +++ b/programs/random/gen_random_ctr_drbg.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -36,8 +36,8 @@ #if defined(POLARSSL_CTR_DRBG_C) && defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #endif diff --git a/programs/random/gen_random_havege.c b/programs/random/gen_random_havege.c index e5a53560d..20588ced2 100644 --- a/programs/random/gen_random_havege.c +++ b/programs/random/gen_random_havege.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -35,7 +35,7 @@ #endif #if defined(POLARSSL_HAVEGE_C) && defined(POLARSSL_FS_IO) -#include "polarssl/havege.h" +#include "mbedtls/havege.h" #include #include diff --git a/programs/ssl/dtls_client.c b/programs/ssl/dtls_client.c index b7580c78a..4a1961858 100644 --- a/programs/ssl/dtls_client.c +++ b/programs/ssl/dtls_client.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_printf printf #define polarssl_fprintf fprintf @@ -57,13 +57,13 @@ int main( int argc, char *argv[] ) #include #include -#include "polarssl/net.h" -#include "polarssl/debug.h" -#include "polarssl/ssl.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/error.h" -#include "polarssl/certs.h" +#include "mbedtls/net.h" +#include "mbedtls/debug.h" +#include "mbedtls/ssl.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/error.h" +#include "mbedtls/certs.h" #define SERVER_PORT 4433 #define SERVER_NAME "localhost" diff --git a/programs/ssl/dtls_server.c b/programs/ssl/dtls_server.c index 48b6c92b0..46c2a334f 100644 --- a/programs/ssl/dtls_server.c +++ b/programs/ssl/dtls_server.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_printf printf #define polarssl_fprintf fprintf @@ -59,18 +59,18 @@ int main( void ) #include #include -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" -#include "polarssl/ssl.h" -#include "polarssl/ssl_cookie.h" -#include "polarssl/net.h" -#include "polarssl/error.h" -#include "polarssl/debug.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" +#include "mbedtls/ssl.h" +#include "mbedtls/ssl_cookie.h" +#include "mbedtls/net.h" +#include "mbedtls/error.h" +#include "mbedtls/debug.h" #if defined(POLARSSL_SSL_CACHE_C) -#include "polarssl/ssl_cache.h" +#include "mbedtls/ssl_cache.h" #endif #define READ_TIMEOUT_MS 10000 /* 5 seconds */ diff --git a/programs/ssl/mini_client.c b/programs/ssl/mini_client.c index c48969bd9..de4fb327d 100644 --- a/programs/ssl/mini_client.c +++ b/programs/ssl/mini_client.c @@ -22,7 +22,7 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif @@ -41,7 +41,7 @@ !defined(POLARSSL_NET_C) || !defined(POLARSSL_SSL_CLI_C) || \ !defined(UNIX) #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -57,10 +57,10 @@ int main( void ) #include -#include "polarssl/net.h" -#include "polarssl/ssl.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/net.h" +#include "mbedtls/ssl.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" #include #include diff --git a/programs/ssl/ssl_client1.c b/programs/ssl/ssl_client1.c index b0a75dc9f..dfd5067d8 100644 --- a/programs/ssl/ssl_client1.c +++ b/programs/ssl/ssl_client1.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -38,13 +38,13 @@ defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) && \ defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_CTR_DRBG_C) && defined(POLARSSL_X509_CRT_PARSE_C) -#include "polarssl/net.h" -#include "polarssl/debug.h" -#include "polarssl/ssl.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/error.h" -#include "polarssl/certs.h" +#include "mbedtls/net.h" +#include "mbedtls/debug.h" +#include "mbedtls/ssl.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/error.h" +#include "mbedtls/certs.h" #include #include diff --git a/programs/ssl/ssl_client2.c b/programs/ssl/ssl_client2.c index 48ceeb283..46389ae40 100644 --- a/programs/ssl/ssl_client2.c +++ b/programs/ssl/ssl_client2.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -39,14 +39,14 @@ #if defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_CLI_C) && \ defined(POLARSSL_NET_C) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/net.h" -#include "polarssl/ssl.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" -#include "polarssl/error.h" -#include "polarssl/debug.h" +#include "mbedtls/net.h" +#include "mbedtls/ssl.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" +#include "mbedtls/error.h" +#include "mbedtls/debug.h" #include #include @@ -54,7 +54,7 @@ #endif #if defined(POLARSSL_TIMING_C) -#include "polarssl/timing.h" +#include "mbedtls/timing.h" #endif #if defined(_MSC_VER) && !defined(EFIX64) && !defined(EFI32) diff --git a/programs/ssl/ssl_fork_server.c b/programs/ssl/ssl_fork_server.c index 3408364fd..b58d8d2dd 100644 --- a/programs/ssl/ssl_fork_server.c +++ b/programs/ssl/ssl_fork_server.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -44,13 +44,13 @@ defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_TIMING_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" -#include "polarssl/ssl.h" -#include "polarssl/net.h" -#include "polarssl/timing.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" +#include "mbedtls/ssl.h" +#include "mbedtls/net.h" +#include "mbedtls/timing.h" #include #include diff --git a/programs/ssl/ssl_mail_client.c b/programs/ssl/ssl_mail_client.c index 92ebed077..41e0777c6 100644 --- a/programs/ssl/ssl_mail_client.c +++ b/programs/ssl/ssl_mail_client.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -39,14 +39,14 @@ defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_CTR_DRBG_C) && defined(POLARSSL_X509_CRT_PARSE_C) && \ defined(POLARSSL_FS_IO) -#include "polarssl/base64.h" -#include "polarssl/error.h" -#include "polarssl/net.h" -#include "polarssl/ssl.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" +#include "mbedtls/base64.h" +#include "mbedtls/error.h" +#include "mbedtls/net.h" +#include "mbedtls/ssl.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" #include #include diff --git a/programs/ssl/ssl_pthread_server.c b/programs/ssl/ssl_pthread_server.c index 5f12b9679..52224356b 100644 --- a/programs/ssl/ssl_pthread_server.c +++ b/programs/ssl/ssl_pthread_server.c @@ -22,13 +22,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -46,13 +46,13 @@ defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_THREADING_C) && defined(POLARSSL_THREADING_PTHREAD) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" -#include "polarssl/ssl.h" -#include "polarssl/net.h" -#include "polarssl/error.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" +#include "mbedtls/ssl.h" +#include "mbedtls/net.h" +#include "mbedtls/error.h" #include #include @@ -60,11 +60,11 @@ #endif #if defined(POLARSSL_SSL_CACHE_C) -#include "polarssl/ssl_cache.h" +#include "mbedtls/ssl_cache.h" #endif #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" #endif #define HTTP_RESPONSE \ diff --git a/programs/ssl/ssl_server.c b/programs/ssl/ssl_server.c index eb5cd253c..9c45e1476 100644 --- a/programs/ssl/ssl_server.c +++ b/programs/ssl/ssl_server.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -43,14 +43,14 @@ defined(POLARSSL_SSL_SRV_C) && defined(POLARSSL_NET_C) && \ defined(POLARSSL_RSA_C) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" -#include "polarssl/ssl.h" -#include "polarssl/net.h" -#include "polarssl/error.h" -#include "polarssl/debug.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" +#include "mbedtls/ssl.h" +#include "mbedtls/net.h" +#include "mbedtls/error.h" +#include "mbedtls/debug.h" #include #include @@ -58,7 +58,7 @@ #endif #if defined(POLARSSL_SSL_CACHE_C) -#include "polarssl/ssl_cache.h" +#include "mbedtls/ssl_cache.h" #endif #define HTTP_RESPONSE \ diff --git a/programs/ssl/ssl_server2.c b/programs/ssl/ssl_server2.c index ad0631b56..c935165d9 100644 --- a/programs/ssl/ssl_server2.c +++ b/programs/ssl/ssl_server2.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_free free @@ -47,14 +47,14 @@ #if defined(POLARSSL_ENTROPY_C) && \ defined(POLARSSL_SSL_TLS_C) && defined(POLARSSL_SSL_SRV_C) && \ defined(POLARSSL_NET_C) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/net.h" -#include "polarssl/ssl.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/certs.h" -#include "polarssl/x509.h" -#include "polarssl/error.h" -#include "polarssl/debug.h" +#include "mbedtls/net.h" +#include "mbedtls/ssl.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509.h" +#include "mbedtls/error.h" +#include "mbedtls/debug.h" #include #include @@ -66,15 +66,15 @@ #endif #if defined(POLARSSL_SSL_CACHE_C) -#include "polarssl/ssl_cache.h" +#include "mbedtls/ssl_cache.h" #endif #if defined(POLARSSL_SSL_COOKIE_C) -#include "polarssl/ssl_cookie.h" +#include "mbedtls/ssl_cookie.h" #endif #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" #endif #define DFL_SERVER_ADDR NULL diff --git a/programs/test/benchmark.c b/programs/test/benchmark.c index 1a308be6f..59239e1e9 100644 --- a/programs/test/benchmark.c +++ b/programs/test/benchmark.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_exit exit @@ -46,32 +46,32 @@ int main( void ) #include -#include "polarssl/timing.h" +#include "mbedtls/timing.h" -#include "polarssl/md4.h" -#include "polarssl/md5.h" -#include "polarssl/ripemd160.h" -#include "polarssl/sha1.h" -#include "polarssl/sha256.h" -#include "polarssl/sha512.h" -#include "polarssl/arc4.h" -#include "polarssl/des.h" -#include "polarssl/aes.h" -#include "polarssl/blowfish.h" -#include "polarssl/camellia.h" -#include "polarssl/gcm.h" -#include "polarssl/ccm.h" -#include "polarssl/havege.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/hmac_drbg.h" -#include "polarssl/rsa.h" -#include "polarssl/dhm.h" -#include "polarssl/ecdsa.h" -#include "polarssl/ecdh.h" -#include "polarssl/error.h" +#include "mbedtls/md4.h" +#include "mbedtls/md5.h" +#include "mbedtls/ripemd160.h" +#include "mbedtls/sha1.h" +#include "mbedtls/sha256.h" +#include "mbedtls/sha512.h" +#include "mbedtls/arc4.h" +#include "mbedtls/des.h" +#include "mbedtls/aes.h" +#include "mbedtls/blowfish.h" +#include "mbedtls/camellia.h" +#include "mbedtls/gcm.h" +#include "mbedtls/ccm.h" +#include "mbedtls/havege.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/hmac_drbg.h" +#include "mbedtls/rsa.h" +#include "mbedtls/dhm.h" +#include "mbedtls/ecdsa.h" +#include "mbedtls/ecdh.h" +#include "mbedtls/error.h" #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" #endif #if defined _MSC_VER && !defined snprintf diff --git a/programs/test/selftest.c b/programs/test/selftest.c index 280e3b7c8..0e1a8bedc 100644 --- a/programs/test/selftest.c +++ b/programs/test/selftest.c @@ -21,50 +21,50 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif -#include "polarssl/entropy.h" -#include "polarssl/hmac_drbg.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/dhm.h" -#include "polarssl/gcm.h" -#include "polarssl/ccm.h" -#include "polarssl/md2.h" -#include "polarssl/md4.h" -#include "polarssl/md5.h" -#include "polarssl/ripemd160.h" -#include "polarssl/sha1.h" -#include "polarssl/sha256.h" -#include "polarssl/sha512.h" -#include "polarssl/arc4.h" -#include "polarssl/des.h" -#include "polarssl/aes.h" -#include "polarssl/camellia.h" -#include "polarssl/base64.h" -#include "polarssl/bignum.h" -#include "polarssl/rsa.h" -#include "polarssl/x509.h" -#include "polarssl/xtea.h" -#include "polarssl/pkcs5.h" -#include "polarssl/pbkdf2.h" -#include "polarssl/ecp.h" -#include "polarssl/timing.h" +#include "mbedtls/entropy.h" +#include "mbedtls/hmac_drbg.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/dhm.h" +#include "mbedtls/gcm.h" +#include "mbedtls/ccm.h" +#include "mbedtls/md2.h" +#include "mbedtls/md4.h" +#include "mbedtls/md5.h" +#include "mbedtls/ripemd160.h" +#include "mbedtls/sha1.h" +#include "mbedtls/sha256.h" +#include "mbedtls/sha512.h" +#include "mbedtls/arc4.h" +#include "mbedtls/des.h" +#include "mbedtls/aes.h" +#include "mbedtls/camellia.h" +#include "mbedtls/base64.h" +#include "mbedtls/bignum.h" +#include "mbedtls/rsa.h" +#include "mbedtls/x509.h" +#include "mbedtls/xtea.h" +#include "mbedtls/pkcs5.h" +#include "mbedtls/pbkdf2.h" +#include "mbedtls/ecp.h" +#include "mbedtls/timing.h" #include #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf #endif #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" #endif int main( int argc, char *argv[] ) diff --git a/programs/test/ssl_cert_test.c b/programs/test/ssl_cert_test.c index d823964ee..d9960d242 100644 --- a/programs/test/ssl_cert_test.c +++ b/programs/test/ssl_cert_test.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_snprintf snprintf @@ -37,8 +37,8 @@ #if defined(POLARSSL_RSA_C) && defined(POLARSSL_X509_CRT_PARSE_C) && \ defined(POLARSSL_FS_IO) && defined(POLARSSL_X509_CRL_PARSE_C) -#include "polarssl/certs.h" -#include "polarssl/x509_crt.h" +#include "mbedtls/certs.h" +#include "mbedtls/x509_crt.h" #include #include diff --git a/programs/test/udp_proxy.c b/programs/test/udp_proxy.c index 05393abee..f5faa29fb 100644 --- a/programs/test/udp_proxy.c +++ b/programs/test/udp_proxy.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_printf printf #endif @@ -41,9 +41,9 @@ int main( void ) } #else -#include "polarssl/net.h" -#include "polarssl/error.h" -#include "polarssl/ssl.h" +#include "mbedtls/net.h" +#include "mbedtls/error.h" +#include "mbedtls/ssl.h" #include #include diff --git a/programs/util/pem2der.c b/programs/util/pem2der.c index 8ef3e4b37..857cbb6c1 100644 --- a/programs/util/pem2der.c +++ b/programs/util/pem2der.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_free free @@ -36,8 +36,8 @@ #endif #if defined(POLARSSL_BASE64_C) && defined(POLARSSL_FS_IO) -#include "polarssl/error.h" -#include "polarssl/base64.h" +#include "mbedtls/error.h" +#include "mbedtls/base64.h" #include #include diff --git a/programs/util/strerror.c b/programs/util/strerror.c index 715bd3fbf..9145e7435 100644 --- a/programs/util/strerror.c +++ b/programs/util/strerror.c @@ -21,20 +21,20 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf #endif #if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY) -#include "polarssl/error.h" +#include "mbedtls/error.h" #include #include diff --git a/programs/x509/cert_app.c b/programs/x509/cert_app.c index 0c564bd32..9d8588c0d 100644 --- a/programs/x509/cert_app.c +++ b/programs/x509/cert_app.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_fprintf fprintf @@ -39,11 +39,11 @@ defined(POLARSSL_NET_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/net.h" -#include "polarssl/ssl.h" -#include "polarssl/x509.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/net.h" +#include "mbedtls/ssl.h" +#include "mbedtls/x509.h" #include #include diff --git a/programs/x509/cert_req.c b/programs/x509/cert_req.c index 83766ea5a..e78f87cec 100644 --- a/programs/x509/cert_req.c +++ b/programs/x509/cert_req.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -36,10 +36,10 @@ #if defined(POLARSSL_X509_CSR_WRITE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_PK_PARSE_C) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) -#include "polarssl/x509_csr.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/error.h" +#include "mbedtls/x509_csr.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/error.h" #include #include diff --git a/programs/x509/cert_write.c b/programs/x509/cert_write.c index 5653da251..8436b92e5 100644 --- a/programs/x509/cert_write.c +++ b/programs/x509/cert_write.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -37,11 +37,11 @@ defined(POLARSSL_X509_CRT_PARSE_C) && defined(POLARSSL_FS_IO) && \ defined(POLARSSL_ENTROPY_C) && defined(POLARSSL_CTR_DRBG_C) && \ defined(POLARSSL_ERROR_C) -#include "polarssl/x509_crt.h" -#include "polarssl/x509_csr.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" -#include "polarssl/error.h" +#include "mbedtls/x509_crt.h" +#include "mbedtls/x509_csr.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" +#include "mbedtls/error.h" #include #include diff --git a/programs/x509/crl_app.c b/programs/x509/crl_app.c index ff80a3d4e..64eeb8338 100644 --- a/programs/x509/crl_app.c +++ b/programs/x509/crl_app.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,7 +35,7 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_X509_CRL_PARSE_C) && defined(POLARSSL_FS_IO) -#include "polarssl/x509_crl.h" +#include "mbedtls/x509_crl.h" #include #include diff --git a/programs/x509/req_app.c b/programs/x509/req_app.c index 1164fd6fd..644b8efed 100644 --- a/programs/x509/req_app.c +++ b/programs/x509/req_app.c @@ -21,13 +21,13 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf @@ -35,7 +35,7 @@ #if defined(POLARSSL_BIGNUM_C) && defined(POLARSSL_RSA_C) && \ defined(POLARSSL_X509_CSR_PARSE_C) && defined(POLARSSL_FS_IO) -#include "polarssl/x509_csr.h" +#include "mbedtls/x509_csr.h" #include #include diff --git a/scripts/bump_version.sh b/scripts/bump_version.sh index 64af2dcbb..a487982e5 100755 --- a/scripts/bump_version.sh +++ b/scripts/bump_version.sh @@ -60,10 +60,10 @@ then mv tmp library/Makefile fi -[ $VERBOSE ] && echo "Bumping VERSION in include/polarssl/version.h" +[ $VERBOSE ] && echo "Bumping VERSION in include/mbedtls/version.h" read MAJOR MINOR PATCH <<<$(IFS="."; echo $VERSION) VERSION_NR="$( printf "0x%02X%02X%02X00" $MAJOR $MINOR $PATCH )" -cat include/polarssl/version.h | \ +cat include/mbedtls/version.h | \ sed -e "s/_VERSION_MAJOR .\+/_VERSION_MAJOR $MAJOR/" | \ sed -e "s/_VERSION_MINOR .\+/_VERSION_MINOR $MINOR/" | \ sed -e "s/_VERSION_PATCH .\+/_VERSION_PATCH $PATCH/" | \ @@ -71,7 +71,7 @@ cat include/polarssl/version.h | \ sed -e "s/_VERSION_STRING .\+/_VERSION_STRING \"$VERSION\"/" | \ sed -e "s/_VERSION_STRING_FULL .\+/_VERSION_STRING_FULL \"mbed TLS $VERSION\"/" \ > tmp -mv tmp include/polarssl/version.h +mv tmp include/mbedtls/version.h [ $VERBOSE ] && echo "Bumping version in tests/suites/test_suite_version.data" sed -e "s/version:\".\+/version:\"$VERSION\"/g" < tests/suites/test_suite_version.data > tmp diff --git a/scripts/check_doxy_blocks.pl b/scripts/check_doxy_blocks.pl index 2601d88a8..e62d4dab8 100755 --- a/scripts/check_doxy_blocks.pl +++ b/scripts/check_doxy_blocks.pl @@ -13,7 +13,7 @@ use strict; use File::Basename; # header files in the following directories will be checked -my @directories = qw(include/polarssl library doxygen/input); +my @directories = qw(include/mbedtls library doxygen/input); # very naive pattern to find directives: # everything with a backslach except '\0' and backslash at EOL diff --git a/scripts/config.pl b/scripts/config.pl index c105a2321..ace5459e6 100755 --- a/scripts/config.pl +++ b/scripts/config.pl @@ -36,7 +36,7 @@ POLARSSL_PKCS11_C _ALT\s*$ ); -my $config_file = "include/polarssl/config.h"; +my $config_file = "include/mbedtls/config.h"; # get -f option if (@ARGV >= 2 && $ARGV[0] eq "-f") { diff --git a/scripts/data_files/error.fmt b/scripts/data_files/error.fmt index 7449d85ab..98799a155 100644 --- a/scripts/data_files/error.fmt +++ b/scripts/data_files/error.fmt @@ -21,18 +21,18 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_ERROR_C) || defined(POLARSSL_ERROR_STRERROR_DUMMY) -#include "polarssl/error.h" +#include "mbedtls/error.h" #include #endif #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #define polarssl_snprintf snprintf #endif diff --git a/scripts/data_files/version_features.fmt b/scripts/data_files/version_features.fmt index 500e026c7..59b70a1da 100644 --- a/scripts/data_files/version_features.fmt +++ b/scripts/data_files/version_features.fmt @@ -21,14 +21,14 @@ */ #if !defined(POLARSSL_CONFIG_FILE) -#include "polarssl/config.h" +#include "mbedtls/config.h" #else #include POLARSSL_CONFIG_FILE #endif #if defined(POLARSSL_VERSION_C) -#include "polarssl/version.h" +#include "mbedtls/version.h" #include diff --git a/scripts/ecc-heap.sh b/scripts/ecc-heap.sh index 4f88a4422..dcec84bcc 100755 --- a/scripts/ecc-heap.sh +++ b/scripts/ecc-heap.sh @@ -9,7 +9,7 @@ set -eu -CONFIG_H='include/polarssl/config.h' +CONFIG_H='include/mbedtls/config.h' if [ -r $CONFIG_H ]; then :; else echo "$CONFIG_H not found" >&2 diff --git a/scripts/generate_errors.pl b/scripts/generate_errors.pl index c0d9685f6..02b2aaf21 100755 --- a/scripts/generate_errors.pl +++ b/scripts/generate_errors.pl @@ -16,7 +16,7 @@ if( @ARGV ) { -d $include_dir or die "No such directory: $include_dir\n"; -d $data_dir or die "No such directory: $data_dir\n"; } else { - $include_dir = 'include/polarssl'; + $include_dir = 'include/mbedtls'; $data_dir = 'scripts/data_files'; $error_file = 'library/error.c'; @@ -143,7 +143,7 @@ while (my $line = ) ($include_name ne ""); } ${$code_check} .= "\n"; - $headers .= "\n#include \"polarssl/${include_name}.h\"\n". + $headers .= "\n#include \"mbedtls/${include_name}.h\"\n". "#endif\n\n" if ($include_name ne ""); ${$old_define} = $define_name; } diff --git a/scripts/generate_features.pl b/scripts/generate_features.pl index ee94e356f..2aa695c54 100755 --- a/scripts/generate_features.pl +++ b/scripts/generate_features.pl @@ -12,7 +12,7 @@ if( @ARGV ) { -d $include_dir or die "No such directory: $include_dir\n"; -d $data_dir or die "No such directory: $data_dir\n"; } else { - $include_dir = 'include/polarssl'; + $include_dir = 'include/mbedtls'; $data_dir = 'scripts/data_files'; $feature_file = 'library/version_features.c'; diff --git a/scripts/generate_visualc_files.pl b/scripts/generate_visualc_files.pl index d6f7104a2..fd6923710 100755 --- a/scripts/generate_visualc_files.pl +++ b/scripts/generate_visualc_files.pl @@ -28,7 +28,7 @@ my $vsx_sln_tpl_file = "scripts/data_files/vs2010-sln-template.sln"; my $vsx_sln_file = "$vsx_dir/mbedTLS.sln"; my $programs_dir = 'programs'; -my $header_dir = 'include/polarssl'; +my $header_dir = 'include/mbedtls'; my $source_dir = 'library'; # Need windows line endings! diff --git a/scripts/memory.sh b/scripts/memory.sh index 710ee96e0..2e5621549 100755 --- a/scripts/memory.sh +++ b/scripts/memory.sh @@ -8,7 +8,7 @@ set -eu -CONFIG_H='include/polarssl/config.h' +CONFIG_H='include/mbedtls/config.h' CLIENT='mini_client' diff --git a/tests/scripts/all.sh b/tests/scripts/all.sh index b525c3ab9..47abfb98b 100755 --- a/tests/scripts/all.sh +++ b/tests/scripts/all.sh @@ -17,7 +17,7 @@ if [ -d library -a -d include -a -d tests ]; then :; else exit 1 fi -CONFIG_H='include/polarssl/config.h' +CONFIG_H='include/mbedtls/config.h' CONFIG_BAK="$CONFIG_H.bak" MEMORY=0 @@ -42,7 +42,7 @@ cleanup() make clean find . -iname '*cmake*' -not -name CMakeLists.txt -exec rm -rf {} \+ - rm -f include/Makefile include/polarssl/Makefile programs/*/Makefile + rm -f include/Makefile include/mbedtls/Makefile programs/*/Makefile git update-index --no-skip-worktree Makefile library/Makefile programs/Makefile tests/Makefile git checkout -- Makefile library/Makefile programs/Makefile tests/Makefile diff --git a/tests/scripts/curves.pl b/tests/scripts/curves.pl index 8a1e6b6b1..4e338b563 100755 --- a/tests/scripts/curves.pl +++ b/tests/scripts/curves.pl @@ -12,7 +12,7 @@ use strict; -d 'library' && -d 'include' && -d 'tests' or die "Must be run from root\n"; my $sed_cmd = 's/^#define \(POLARSSL_ECP_DP.*_ENABLED\)/\1/p'; -my $config_h = 'include/polarssl/config.h'; +my $config_h = 'include/mbedtls/config.h'; my @curves = split( /\s+/, `sed -n -e '$sed_cmd' $config_h` ); my $test = system( "grep -i cmake Makefile >/dev/null" ) ? 'check' : 'test'; diff --git a/tests/scripts/generate_code.pl b/tests/scripts/generate_code.pl index ba7473816..6d5d0055c 100755 --- a/tests/scripts/generate_code.pl +++ b/tests/scripts/generate_code.pl @@ -60,7 +60,7 @@ $/ = $line_separator; open(TEST_FILE, ">$test_file") or die "Opening destination file '$test_file': $!"; print TEST_FILE << "END"; #if !defined(POLARSSL_CONFIG_FILE) -#include +#include #else #include POLARSSL_CONFIG_FILE #endif diff --git a/tests/scripts/test-ref-configs.pl b/tests/scripts/test-ref-configs.pl index 057b8be70..e4fc874fe 100755 --- a/tests/scripts/test-ref-configs.pl +++ b/tests/scripts/test-ref-configs.pl @@ -42,7 +42,7 @@ if ($#ARGV >= 0) { my $test = system( "grep -i cmake Makefile >/dev/null" ) ? 'check' : 'test'; -my $config_h = 'include/polarssl/config.h'; +my $config_h = 'include/mbedtls/config.h'; system( "cp $config_h $config_h.bak" ) and die; sub abort { diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh index 634b14970..b54b777c4 100755 --- a/tests/ssl-opt.sh +++ b/tests/ssl-opt.sh @@ -27,7 +27,7 @@ TESTS=0 FAILS=0 SKIPS=0 -CONFIG_H='../include/polarssl/config.h' +CONFIG_H='../include/mbedtls/config.h' MEMCHECK=0 FILTER='.*' diff --git a/tests/suites/helpers.function b/tests/suites/helpers.function index 0f074859c..54786af6e 100644 --- a/tests/suites/helpers.function +++ b/tests/suites/helpers.function @@ -1,5 +1,5 @@ #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_printf printf diff --git a/tests/suites/main_test.function b/tests/suites/main_test.function index d67d875ca..5342fb370 100644 --- a/tests/suites/main_test.function +++ b/tests/suites/main_test.function @@ -1,7 +1,7 @@ #include #if defined(POLARSSL_PLATFORM_C) -#include "polarssl/platform.h" +#include "mbedtls/platform.h" #else #include #define polarssl_exit exit @@ -12,7 +12,7 @@ #endif #if defined(POLARSSL_MEMORY_BUFFER_ALLOC_C) -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" #endif static int test_errors = 0; diff --git a/tests/suites/test_suite_aes.function b/tests/suites/test_suite_aes.function index 7027247a5..8cc16e547 100644 --- a/tests/suites/test_suite_aes.function +++ b/tests/suites/test_suite_aes.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/aes.h" +#include "mbedtls/aes.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_arc4.function b/tests/suites/test_suite_arc4.function index dc7b24b5d..6bc5d1f45 100644 --- a/tests/suites/test_suite_arc4.function +++ b/tests/suites/test_suite_arc4.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/arc4.h" +#include "mbedtls/arc4.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_asn1write.function b/tests/suites/test_suite_asn1write.function index 49b073aa9..62a1b9943 100644 --- a/tests/suites/test_suite_asn1write.function +++ b/tests/suites/test_suite_asn1write.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/asn1write.h" +#include "mbedtls/asn1write.h" #define GUARD_LEN 4 #define GUARD_VAL 0x2a diff --git a/tests/suites/test_suite_base64.function b/tests/suites/test_suite_base64.function index a8348d2ee..57c2989ef 100644 --- a/tests/suites/test_suite_base64.function +++ b/tests/suites/test_suite_base64.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/base64.h" +#include "mbedtls/base64.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_blowfish.function b/tests/suites/test_suite_blowfish.function index b058698b4..5a2a712a7 100644 --- a/tests/suites/test_suite_blowfish.function +++ b/tests/suites/test_suite_blowfish.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/blowfish.h" +#include "mbedtls/blowfish.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_camellia.function b/tests/suites/test_suite_camellia.function index e73aa867a..ef6a72b1a 100644 --- a/tests/suites/test_suite_camellia.function +++ b/tests/suites/test_suite_camellia.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/camellia.h" +#include "mbedtls/camellia.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ccm.function b/tests/suites/test_suite_ccm.function index d8ca4f5d1..2022fc6c7 100644 --- a/tests/suites/test_suite_ccm.function +++ b/tests/suites/test_suite_ccm.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/ccm.h" +#include "mbedtls/ccm.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_cipher.function b/tests/suites/test_suite_cipher.function index 448bfccc5..471bcef28 100644 --- a/tests/suites/test_suite_cipher.function +++ b/tests/suites/test_suite_cipher.function @@ -1,8 +1,8 @@ /* BEGIN_HEADER */ -#include "polarssl/cipher.h" +#include "mbedtls/cipher.h" #if defined(POLARSSL_GCM_C) -#include "polarssl/gcm.h" +#include "mbedtls/gcm.h" #endif /* END_HEADER */ diff --git a/tests/suites/test_suite_ctr_drbg.function b/tests/suites/test_suite_ctr_drbg.function index 644eb4676..6b3028a59 100644 --- a/tests/suites/test_suite_ctr_drbg.function +++ b/tests/suites/test_suite_ctr_drbg.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/ctr_drbg.h" +#include "mbedtls/ctr_drbg.h" int test_offset_idx; int entropy_func( void *data, unsigned char *buf, size_t len ) diff --git a/tests/suites/test_suite_debug.function b/tests/suites/test_suite_debug.function index 7db04e5d3..a76ba9f7f 100644 --- a/tests/suites/test_suite_debug.function +++ b/tests/suites/test_suite_debug.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/debug.h" +#include "mbedtls/debug.h" struct buffer_data { diff --git a/tests/suites/test_suite_des.function b/tests/suites/test_suite_des.function index dfa168f22..bb21a5899 100644 --- a/tests/suites/test_suite_des.function +++ b/tests/suites/test_suite_des.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/des.h" +#include "mbedtls/des.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_dhm.function b/tests/suites/test_suite_dhm.function index d7cabf464..4e8ad3352 100644 --- a/tests/suites/test_suite_dhm.function +++ b/tests/suites/test_suite_dhm.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/dhm.h" +#include "mbedtls/dhm.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ecdh.function b/tests/suites/test_suite_ecdh.function index 27be96918..795b40929 100644 --- a/tests/suites/test_suite_ecdh.function +++ b/tests/suites/test_suite_ecdh.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/ecdh.h" +#include "mbedtls/ecdh.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ecdsa.function b/tests/suites/test_suite_ecdsa.function index ee379dcf9..98d834a0e 100644 --- a/tests/suites/test_suite_ecdsa.function +++ b/tests/suites/test_suite_ecdsa.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/ecdsa.h" +#include "mbedtls/ecdsa.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_ecp.function b/tests/suites/test_suite_ecp.function index 696c5977e..11149203d 100644 --- a/tests/suites/test_suite_ecp.function +++ b/tests/suites/test_suite_ecp.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/ecp.h" +#include "mbedtls/ecp.h" #define POLARSSL_ECP_PF_UNKNOWN -1 /* END_HEADER */ diff --git a/tests/suites/test_suite_entropy.function b/tests/suites/test_suite_entropy.function index c46246c47..41a115cc6 100644 --- a/tests/suites/test_suite_entropy.function +++ b/tests/suites/test_suite_entropy.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/entropy.h" +#include "mbedtls/entropy.h" /* * Number of calls made to entropy_dummy_source() diff --git a/tests/suites/test_suite_error.function b/tests/suites/test_suite_error.function index 87287b7ab..8ed3b61ef 100644 --- a/tests/suites/test_suite_error.function +++ b/tests/suites/test_suite_error.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/error.h" +#include "mbedtls/error.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_gcm.function b/tests/suites/test_suite_gcm.function index 2ac76280f..a3b112eab 100644 --- a/tests/suites/test_suite_gcm.function +++ b/tests/suites/test_suite_gcm.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/gcm.h" +#include "mbedtls/gcm.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_hmac_drbg.function b/tests/suites/test_suite_hmac_drbg.function index 56267e075..2e4e83c0d 100644 --- a/tests/suites/test_suite_hmac_drbg.function +++ b/tests/suites/test_suite_hmac_drbg.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/hmac_drbg.h" +#include "mbedtls/hmac_drbg.h" typedef struct { diff --git a/tests/suites/test_suite_hmac_shax.function b/tests/suites/test_suite_hmac_shax.function index b31d7726c..761c281a4 100644 --- a/tests/suites/test_suite_hmac_shax.function +++ b/tests/suites/test_suite_hmac_shax.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include "polarssl/sha1.h" -#include "polarssl/sha256.h" -#include "polarssl/sha512.h" +#include "mbedtls/sha1.h" +#include "mbedtls/sha256.h" +#include "mbedtls/sha512.h" /* END_HEADER */ /* BEGIN_CASE depends_on:POLARSSL_SHA1_C */ diff --git a/tests/suites/test_suite_md.function b/tests/suites/test_suite_md.function index 40eb7177e..98dac475d 100644 --- a/tests/suites/test_suite_md.function +++ b/tests/suites/test_suite_md.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/md.h" +#include "mbedtls/md.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_mdx.function b/tests/suites/test_suite_mdx.function index 6e4c6d834..46152717b 100644 --- a/tests/suites/test_suite_mdx.function +++ b/tests/suites/test_suite_mdx.function @@ -1,8 +1,8 @@ /* BEGIN_HEADER */ -#include "polarssl/md2.h" -#include "polarssl/md4.h" -#include "polarssl/md5.h" -#include "polarssl/ripemd160.h" +#include "mbedtls/md2.h" +#include "mbedtls/md4.h" +#include "mbedtls/md5.h" +#include "mbedtls/ripemd160.h" /* END_HEADER */ /* BEGIN_CASE depends_on:POLARSSL_MD2_C */ diff --git a/tests/suites/test_suite_memory_buffer_alloc.function b/tests/suites/test_suite_memory_buffer_alloc.function index e9cd0217f..704279c08 100644 --- a/tests/suites/test_suite_memory_buffer_alloc.function +++ b/tests/suites/test_suite_memory_buffer_alloc.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/memory_buffer_alloc.h" +#include "mbedtls/memory_buffer_alloc.h" #define TEST_SUITE_MEMORY_BUFFER_ALLOC /* END_HEADER */ diff --git a/tests/suites/test_suite_mpi.function b/tests/suites/test_suite_mpi.function index ce1a07205..75c8d30f1 100644 --- a/tests/suites/test_suite_mpi.function +++ b/tests/suites/test_suite_mpi.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/bignum.h" +#include "mbedtls/bignum.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pbkdf2.function b/tests/suites/test_suite_pbkdf2.function index f99cb6d1b..6b8b2783a 100644 --- a/tests/suites/test_suite_pbkdf2.function +++ b/tests/suites/test_suite_pbkdf2.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/pbkdf2.h" +#include "mbedtls/pbkdf2.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pem.function b/tests/suites/test_suite_pem.function index f8aab47c1..9318d1d0a 100644 --- a/tests/suites/test_suite_pem.function +++ b/tests/suites/test_suite_pem.function @@ -1,6 +1,6 @@ /* BEGIN_HEADER */ -#include "polarssl/base64.h" -#include "polarssl/pem.h" +#include "mbedtls/base64.h" +#include "mbedtls/pem.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pk.function b/tests/suites/test_suite_pk.function index cc378c499..bedf75cb6 100644 --- a/tests/suites/test_suite_pk.function +++ b/tests/suites/test_suite_pk.function @@ -1,9 +1,9 @@ /* BEGIN_HEADER */ -#include "polarssl/pk.h" +#include "mbedtls/pk.h" /* For error codes */ -#include "polarssl/ecp.h" -#include "polarssl/rsa.h" +#include "mbedtls/ecp.h" +#include "mbedtls/rsa.h" static int rnd_std_rand( void *rng_state, unsigned char *output, size_t len ); diff --git a/tests/suites/test_suite_pkcs1_v21.function b/tests/suites/test_suite_pkcs1_v21.function index 6fbe2e1d3..ab87a7027 100644 --- a/tests/suites/test_suite_pkcs1_v21.function +++ b/tests/suites/test_suite_pkcs1_v21.function @@ -1,6 +1,6 @@ /* BEGIN_HEADER */ -#include "polarssl/rsa.h" -#include "polarssl/md.h" +#include "mbedtls/rsa.h" +#include "mbedtls/md.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pkcs5.function b/tests/suites/test_suite_pkcs5.function index f7165f6e1..6074e04ee 100644 --- a/tests/suites/test_suite_pkcs5.function +++ b/tests/suites/test_suite_pkcs5.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/pkcs5.h" +#include "mbedtls/pkcs5.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pkparse.function b/tests/suites/test_suite_pkparse.function index 9479cd993..892739769 100644 --- a/tests/suites/test_suite_pkparse.function +++ b/tests/suites/test_suite_pkparse.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include "polarssl/pk.h" -#include "polarssl/pem.h" -#include "polarssl/oid.h" +#include "mbedtls/pk.h" +#include "mbedtls/pem.h" +#include "mbedtls/oid.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_pkwrite.function b/tests/suites/test_suite_pkwrite.function index 8b5fafbc0..be0ab60c1 100644 --- a/tests/suites/test_suite_pkwrite.function +++ b/tests/suites/test_suite_pkwrite.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include "polarssl/pk.h" -#include "polarssl/pem.h" -#include "polarssl/oid.h" +#include "mbedtls/pk.h" +#include "mbedtls/pem.h" +#include "mbedtls/oid.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_rsa.function b/tests/suites/test_suite_rsa.function index 45d572330..3c61f51d2 100644 --- a/tests/suites/test_suite_rsa.function +++ b/tests/suites/test_suite_rsa.function @@ -1,13 +1,13 @@ /* BEGIN_HEADER */ -#include "polarssl/rsa.h" -#include "polarssl/md2.h" -#include "polarssl/md4.h" -#include "polarssl/md5.h" -#include "polarssl/sha1.h" -#include "polarssl/sha256.h" -#include "polarssl/sha512.h" -#include "polarssl/entropy.h" -#include "polarssl/ctr_drbg.h" +#include "mbedtls/rsa.h" +#include "mbedtls/md2.h" +#include "mbedtls/md4.h" +#include "mbedtls/md5.h" +#include "mbedtls/sha1.h" +#include "mbedtls/sha256.h" +#include "mbedtls/sha512.h" +#include "mbedtls/entropy.h" +#include "mbedtls/ctr_drbg.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_shax.function b/tests/suites/test_suite_shax.function index 51c330114..29ede7156 100644 --- a/tests/suites/test_suite_shax.function +++ b/tests/suites/test_suite_shax.function @@ -1,7 +1,7 @@ /* BEGIN_HEADER */ -#include "polarssl/sha1.h" -#include "polarssl/sha256.h" -#include "polarssl/sha512.h" +#include "mbedtls/sha1.h" +#include "mbedtls/sha256.h" +#include "mbedtls/sha512.h" /* END_HEADER */ /* BEGIN_CASE depends_on:POLARSSL_SHA1_C */ diff --git a/tests/suites/test_suite_ssl.function b/tests/suites/test_suite_ssl.function index f138c2f78..4de888fca 100644 --- a/tests/suites/test_suite_ssl.function +++ b/tests/suites/test_suite_ssl.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include +#include /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_version.function b/tests/suites/test_suite_version.function index fd12032e1..bfa52ffc6 100644 --- a/tests/suites/test_suite_version.function +++ b/tests/suites/test_suite_version.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/version.h" +#include "mbedtls/version.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_x509parse.function b/tests/suites/test_suite_x509parse.function index 50de457b0..744085956 100644 --- a/tests/suites/test_suite_x509parse.function +++ b/tests/suites/test_suite_x509parse.function @@ -1,10 +1,10 @@ /* BEGIN_HEADER */ -#include "polarssl/x509_crt.h" -#include "polarssl/x509_crl.h" -#include "polarssl/x509_csr.h" -#include "polarssl/pem.h" -#include "polarssl/oid.h" -#include "polarssl/base64.h" +#include "mbedtls/x509_crt.h" +#include "mbedtls/x509_crl.h" +#include "mbedtls/x509_csr.h" +#include "mbedtls/pem.h" +#include "mbedtls/oid.h" +#include "mbedtls/base64.h" int verify_none( void *data, x509_crt *crt, int certificate_depth, int *flags ) { diff --git a/tests/suites/test_suite_x509write.function b/tests/suites/test_suite_x509write.function index 63f35a6db..fe4b9a690 100644 --- a/tests/suites/test_suite_x509write.function +++ b/tests/suites/test_suite_x509write.function @@ -1,8 +1,8 @@ /* BEGIN_HEADER */ -#include "polarssl/x509_crt.h" -#include "polarssl/x509_csr.h" -#include "polarssl/pem.h" -#include "polarssl/oid.h" +#include "mbedtls/x509_crt.h" +#include "mbedtls/x509_csr.h" +#include "mbedtls/pem.h" +#include "mbedtls/oid.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/tests/suites/test_suite_xtea.function b/tests/suites/test_suite_xtea.function index d22c7fdc4..e7c11358c 100644 --- a/tests/suites/test_suite_xtea.function +++ b/tests/suites/test_suite_xtea.function @@ -1,5 +1,5 @@ /* BEGIN_HEADER */ -#include "polarssl/xtea.h" +#include "mbedtls/xtea.h" /* END_HEADER */ /* BEGIN_DEPENDENCIES diff --git a/visualc/VS2010/mbedTLS.vcxproj b/visualc/VS2010/mbedTLS.vcxproj index 91c6c6d61..907f108e7 100644 --- a/visualc/VS2010/mbedTLS.vcxproj +++ b/visualc/VS2010/mbedTLS.vcxproj @@ -142,70 +142,70 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/visualc/VS6/mbedtls.dsp b/visualc/VS6/mbedtls.dsp index a3c69402c..59108ec84 100644 --- a/visualc/VS6/mbedtls.dsp +++ b/visualc/VS6/mbedtls.dsp @@ -365,259 +365,259 @@ SOURCE=..\..\library\xtea.c # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=..\..\include\polarssl\aes.h +SOURCE=..\..\include\mbedtls\aes.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\aesni.h +SOURCE=..\..\include\mbedtls\aesni.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\arc4.h +SOURCE=..\..\include\mbedtls\arc4.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\asn1.h +SOURCE=..\..\include\mbedtls\asn1.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\asn1write.h +SOURCE=..\..\include\mbedtls\asn1write.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\base64.h +SOURCE=..\..\include\mbedtls\base64.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\bignum.h +SOURCE=..\..\include\mbedtls\bignum.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\blowfish.h +SOURCE=..\..\include\mbedtls\blowfish.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\bn_mul.h +SOURCE=..\..\include\mbedtls\bn_mul.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\camellia.h +SOURCE=..\..\include\mbedtls\camellia.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ccm.h +SOURCE=..\..\include\mbedtls\ccm.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\certs.h +SOURCE=..\..\include\mbedtls\certs.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\check_config.h +SOURCE=..\..\include\mbedtls\check_config.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\cipher.h +SOURCE=..\..\include\mbedtls\cipher.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\cipher_wrap.h +SOURCE=..\..\include\mbedtls\cipher_wrap.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\config.h +SOURCE=..\..\include\mbedtls\config.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ctr_drbg.h +SOURCE=..\..\include\mbedtls\ctr_drbg.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\debug.h +SOURCE=..\..\include\mbedtls\debug.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\des.h +SOURCE=..\..\include\mbedtls\des.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\dhm.h +SOURCE=..\..\include\mbedtls\dhm.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ecdh.h +SOURCE=..\..\include\mbedtls\ecdh.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ecdsa.h +SOURCE=..\..\include\mbedtls\ecdsa.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ecp.h +SOURCE=..\..\include\mbedtls\ecp.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\entropy.h +SOURCE=..\..\include\mbedtls\entropy.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\entropy_poll.h +SOURCE=..\..\include\mbedtls\entropy_poll.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\error.h +SOURCE=..\..\include\mbedtls\error.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\gcm.h +SOURCE=..\..\include\mbedtls\gcm.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\havege.h +SOURCE=..\..\include\mbedtls\havege.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\hmac_drbg.h +SOURCE=..\..\include\mbedtls\hmac_drbg.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\md.h +SOURCE=..\..\include\mbedtls\md.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\md2.h +SOURCE=..\..\include\mbedtls\md2.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\md4.h +SOURCE=..\..\include\mbedtls\md4.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\md5.h +SOURCE=..\..\include\mbedtls\md5.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\md_wrap.h +SOURCE=..\..\include\mbedtls\md_wrap.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\memory.h +SOURCE=..\..\include\mbedtls\memory.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\memory_buffer_alloc.h +SOURCE=..\..\include\mbedtls\memory_buffer_alloc.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\net.h +SOURCE=..\..\include\mbedtls\net.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\oid.h +SOURCE=..\..\include\mbedtls\oid.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\padlock.h +SOURCE=..\..\include\mbedtls\padlock.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pbkdf2.h +SOURCE=..\..\include\mbedtls\pbkdf2.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pem.h +SOURCE=..\..\include\mbedtls\pem.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pk.h +SOURCE=..\..\include\mbedtls\pk.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pk_wrap.h +SOURCE=..\..\include\mbedtls\pk_wrap.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pkcs11.h +SOURCE=..\..\include\mbedtls\pkcs11.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pkcs12.h +SOURCE=..\..\include\mbedtls\pkcs12.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\pkcs5.h +SOURCE=..\..\include\mbedtls\pkcs5.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\platform.h +SOURCE=..\..\include\mbedtls\platform.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ripemd160.h +SOURCE=..\..\include\mbedtls\ripemd160.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\rsa.h +SOURCE=..\..\include\mbedtls\rsa.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\sha1.h +SOURCE=..\..\include\mbedtls\sha1.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\sha256.h +SOURCE=..\..\include\mbedtls\sha256.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\sha512.h +SOURCE=..\..\include\mbedtls\sha512.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ssl.h +SOURCE=..\..\include\mbedtls\ssl.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ssl_cache.h +SOURCE=..\..\include\mbedtls\ssl_cache.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ssl_ciphersuites.h +SOURCE=..\..\include\mbedtls\ssl_ciphersuites.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\ssl_cookie.h +SOURCE=..\..\include\mbedtls\ssl_cookie.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\threading.h +SOURCE=..\..\include\mbedtls\threading.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\timing.h +SOURCE=..\..\include\mbedtls\timing.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\version.h +SOURCE=..\..\include\mbedtls\version.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\x509.h +SOURCE=..\..\include\mbedtls\x509.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\x509_crl.h +SOURCE=..\..\include\mbedtls\x509_crl.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\x509_crt.h +SOURCE=..\..\include\mbedtls\x509_crt.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\x509_csr.h +SOURCE=..\..\include\mbedtls\x509_csr.h # End Source File # Begin Source File -SOURCE=..\..\include\polarssl\xtea.h +SOURCE=..\..\include\mbedtls\xtea.h # End Source File # End Group # End Target