Rename include directory to mbedtls

andrei-menzopol · Mar 10, 2015 · 7f80997 · 7f80997
1 parent 129db08
commit 7f80997
Show file tree

Hide file tree

Showing 250 changed files with 909 additions and 909 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,4 +1,4 @@
 Makefile
 *.sln
 *.vcxproj
-polarssl/check_config
+mbedtls/check_config
diff --git 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 → include/mbedtls/aes.h b/include/polarssl/aes.h → include/mbedtls/aes.h
diff --git a/include/polarssl/aesni.h → include/mbedtls/aesni.h b/include/polarssl/aesni.h → include/mbedtls/aesni.h
diff --git a/include/polarssl/arc4.h → include/mbedtls/arc4.h b/include/polarssl/arc4.h → include/mbedtls/arc4.h
diff --git a/include/polarssl/asn1.h → include/mbedtls/asn1.h b/include/polarssl/asn1.h → include/mbedtls/asn1.h
diff --git a/include/polarssl/asn1write.h → include/mbedtls/asn1write.h b/include/polarssl/asn1write.h → include/mbedtls/asn1write.h
diff --git a/include/polarssl/base64.h → include/mbedtls/base64.h b/include/polarssl/base64.h → include/mbedtls/base64.h
diff --git a/include/polarssl/bignum.h → include/mbedtls/bignum.h b/include/polarssl/bignum.h → include/mbedtls/bignum.h
diff --git a/include/polarssl/blowfish.h → include/mbedtls/blowfish.h b/include/polarssl/blowfish.h → include/mbedtls/blowfish.h
diff --git a/include/polarssl/bn_mul.h → include/mbedtls/bn_mul.h b/include/polarssl/bn_mul.h → include/mbedtls/bn_mul.h
diff --git a/include/polarssl/camellia.h → include/mbedtls/camellia.h b/include/polarssl/camellia.h → include/mbedtls/camellia.h
diff --git a/include/polarssl/ccm.h → include/mbedtls/ccm.h b/include/polarssl/ccm.h → include/mbedtls/ccm.h
diff --git a/include/polarssl/certs.h → include/mbedtls/certs.h b/include/polarssl/certs.h → include/mbedtls/certs.h
diff --git a/include/polarssl/check_config.h → include/mbedtls/check_config.h b/include/polarssl/check_config.h → include/mbedtls/check_config.h
diff --git a/include/polarssl/cipher.h → include/mbedtls/cipher.h b/include/polarssl/cipher.h → include/mbedtls/cipher.h
diff --git a/include/polarssl/cipher_wrap.h → include/mbedtls/cipher_wrap.h b/include/polarssl/cipher_wrap.h → include/mbedtls/cipher_wrap.h
diff --git a/include/polarssl/config.h → include/mbedtls/config.h b/include/polarssl/config.h → 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 → include/mbedtls/ctr_drbg.h b/include/polarssl/ctr_drbg.h → include/mbedtls/ctr_drbg.h
diff --git a/include/polarssl/debug.h → include/mbedtls/debug.h b/include/polarssl/debug.h → include/mbedtls/debug.h
diff --git a/include/polarssl/des.h → include/mbedtls/des.h b/include/polarssl/des.h → include/mbedtls/des.h
diff --git a/include/polarssl/dhm.h → include/mbedtls/dhm.h b/include/polarssl/dhm.h → include/mbedtls/dhm.h
diff --git a/include/polarssl/ecdh.h → include/mbedtls/ecdh.h b/include/polarssl/ecdh.h → include/mbedtls/ecdh.h
diff --git a/include/polarssl/ecdsa.h → include/mbedtls/ecdsa.h b/include/polarssl/ecdsa.h → include/mbedtls/ecdsa.h
diff --git a/include/polarssl/ecp.h → include/mbedtls/ecp.h b/include/polarssl/ecp.h → include/mbedtls/ecp.h
diff --git a/include/polarssl/entropy.h → include/mbedtls/entropy.h b/include/polarssl/entropy.h → include/mbedtls/entropy.h
diff --git a/include/polarssl/entropy_poll.h → include/mbedtls/entropy_poll.h b/include/polarssl/entropy_poll.h → include/mbedtls/entropy_poll.h
diff --git a/include/polarssl/error.h → include/mbedtls/error.h b/include/polarssl/error.h → include/mbedtls/error.h
diff --git a/include/polarssl/gcm.h → include/mbedtls/gcm.h b/include/polarssl/gcm.h → include/mbedtls/gcm.h
diff --git a/include/polarssl/havege.h → include/mbedtls/havege.h b/include/polarssl/havege.h → include/mbedtls/havege.h
diff --git a/include/polarssl/hmac_drbg.h → include/mbedtls/hmac_drbg.h b/include/polarssl/hmac_drbg.h → include/mbedtls/hmac_drbg.h
diff --git a/include/polarssl/md.h → include/mbedtls/md.h b/include/polarssl/md.h → include/mbedtls/md.h
diff --git a/include/polarssl/md2.h → include/mbedtls/md2.h b/include/polarssl/md2.h → include/mbedtls/md2.h
diff --git a/include/polarssl/md4.h → include/mbedtls/md4.h b/include/polarssl/md4.h → include/mbedtls/md4.h
diff --git a/include/polarssl/md5.h → include/mbedtls/md5.h b/include/polarssl/md5.h → include/mbedtls/md5.h
diff --git a/include/polarssl/md_wrap.h → include/mbedtls/md_wrap.h b/include/polarssl/md_wrap.h → include/mbedtls/md_wrap.h
diff --git a/include/polarssl/memory.h → include/mbedtls/memory.h b/include/polarssl/memory.h → include/mbedtls/memory.h
diff --git a/include/polarssl/memory_buffer_alloc.h → include/mbedtls/memory_buffer_alloc.h b/include/polarssl/memory_buffer_alloc.h → include/mbedtls/memory_buffer_alloc.h
diff --git a/include/polarssl/net.h → include/mbedtls/net.h b/include/polarssl/net.h → include/mbedtls/net.h
diff --git a/include/polarssl/oid.h → include/mbedtls/oid.h b/include/polarssl/oid.h → include/mbedtls/oid.h
diff --git a/include/polarssl/padlock.h → include/mbedtls/padlock.h b/include/polarssl/padlock.h → include/mbedtls/padlock.h
diff --git a/include/polarssl/pbkdf2.h → include/mbedtls/pbkdf2.h b/include/polarssl/pbkdf2.h → include/mbedtls/pbkdf2.h
diff --git a/include/polarssl/pem.h → include/mbedtls/pem.h b/include/polarssl/pem.h → include/mbedtls/pem.h
diff --git a/include/polarssl/pk.h → include/mbedtls/pk.h b/include/polarssl/pk.h → include/mbedtls/pk.h
diff --git a/include/polarssl/pk_wrap.h → include/mbedtls/pk_wrap.h b/include/polarssl/pk_wrap.h → include/mbedtls/pk_wrap.h
diff --git a/include/polarssl/pkcs11.h → include/mbedtls/pkcs11.h b/include/polarssl/pkcs11.h → include/mbedtls/pkcs11.h
diff --git a/include/polarssl/pkcs12.h → include/mbedtls/pkcs12.h b/include/polarssl/pkcs12.h → include/mbedtls/pkcs12.h
diff --git a/include/polarssl/pkcs5.h → include/mbedtls/pkcs5.h b/include/polarssl/pkcs5.h → include/mbedtls/pkcs5.h
diff --git a/include/polarssl/platform.h → include/mbedtls/platform.h b/include/polarssl/platform.h → include/mbedtls/platform.h
diff --git a/include/polarssl/ripemd160.h → include/mbedtls/ripemd160.h b/include/polarssl/ripemd160.h → include/mbedtls/ripemd160.h
diff --git a/include/polarssl/rsa.h → include/mbedtls/rsa.h b/include/polarssl/rsa.h → include/mbedtls/rsa.h
diff --git a/include/polarssl/sha1.h → include/mbedtls/sha1.h b/include/polarssl/sha1.h → include/mbedtls/sha1.h
diff --git a/include/polarssl/sha256.h → include/mbedtls/sha256.h b/include/polarssl/sha256.h → include/mbedtls/sha256.h
diff --git a/include/polarssl/sha512.h → include/mbedtls/sha512.h b/include/polarssl/sha512.h → include/mbedtls/sha512.h
diff --git a/include/polarssl/ssl.h → include/mbedtls/ssl.h b/include/polarssl/ssl.h → include/mbedtls/ssl.h
diff --git a/include/polarssl/ssl_cache.h → include/mbedtls/ssl_cache.h b/include/polarssl/ssl_cache.h → include/mbedtls/ssl_cache.h
diff --git a/include/polarssl/ssl_ciphersuites.h → include/mbedtls/ssl_ciphersuites.h b/include/polarssl/ssl_ciphersuites.h → include/mbedtls/ssl_ciphersuites.h
diff --git a/include/polarssl/ssl_cookie.h → include/mbedtls/ssl_cookie.h b/include/polarssl/ssl_cookie.h → include/mbedtls/ssl_cookie.h
diff --git a/include/polarssl/threading.h → include/mbedtls/threading.h b/include/polarssl/threading.h → include/mbedtls/threading.h
diff --git a/include/polarssl/timing.h → include/mbedtls/timing.h b/include/polarssl/timing.h → include/mbedtls/timing.h
diff --git a/include/polarssl/version.h → include/mbedtls/version.h b/include/polarssl/version.h → include/mbedtls/version.h
diff --git a/include/polarssl/x509.h → include/mbedtls/x509.h b/include/polarssl/x509.h → include/mbedtls/x509.h
diff --git a/include/polarssl/x509_crl.h → include/mbedtls/x509_crl.h b/include/polarssl/x509_crl.h → include/mbedtls/x509_crl.h
diff --git a/include/polarssl/x509_crt.h → include/mbedtls/x509_crt.h b/include/polarssl/x509_crt.h → include/mbedtls/x509_crt.h
diff --git a/include/polarssl/x509_csr.h → include/mbedtls/x509_csr.h b/include/polarssl/x509_csr.h → include/mbedtls/x509_csr.h
diff --git a/include/polarssl/xtea.h → include/mbedtls/xtea.h b/include/polarssl/xtea.h → include/mbedtls/xtea.h
diff --git 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
@@ -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 <string.h>
 
-#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 <stdio.h>
 #define polarssl_printf printf

diff --git 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 <string.h>
 

diff --git 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 <string.h>
 
 #if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
 #define polarssl_printf printf

diff --git 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 <string.h>
 
 #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 <stdlib.h>
 #define polarssl_malloc     malloc

diff --git 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 <string.h>
 
 #if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdlib.h>
 #define polarssl_malloc     malloc

diff --git 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 <basetsd.h>
@@ -40,7 +40,7 @@ typedef UINT32 uint32_t;
 #if defined(POLARSSL_SELF_TEST)
 #include <string.h>
 #if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
 #define polarssl_printf printf

diff --git 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 <string.h>
 
 #if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
 #include <stdlib.h>

diff --git 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 <string.h>
 

diff --git 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 <string.h>
 
 #if defined(POLARSSL_SELF_TEST)
 #if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
 #define polarssl_printf printf

diff --git 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 <string.h>
 
 #if defined(POLARSSL_SELF_TEST) && defined(POLARSSL_AES_C)
 #if defined(POLARSSL_PLATFORM_C)
-#include "polarssl/platform.h"
+#include "mbedtls/platform.h"
 #else
 #include <stdio.h>
 #define polarssl_printf printf

diff --git 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
@@ -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 <stdlib.h>
 #include <string.h>
 
 #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)