Rename include directory to mbedtls

parent 129db08c
......@@ -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 \
......
......@@ -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).
......
......@@ -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:
......
......@@ -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
......
......@@ -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 */
......@@ -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 */
......@@ -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 */
Makefile
*.sln
*.vcxproj
polarssl/check_config
mbedtls/check_config
......@@ -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)
......@@ -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.
*/
......
# 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
......
......@@ -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
......
......@@ -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>
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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
......
......@@ -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>
......
......@@ -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>
......
......@@ -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
......
......@@ -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
......
......@@ -21,7 +21,7 @@
*/
#if !defined(POLARSSL_CONFIG_FILE)
#include "polarssl/config.h"
#include "mbedtls/config.h"
#else
#include POLARSSL_CONFIG_FILE
#endif
......
......@@ -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)
......
......@@ -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 <stdlib.h>
#define polarssl_malloc malloc
......
......@@ -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 <string.h>
......@@ -43,7 +43,7 @@
#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
......
......@@ -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 <stdarg.h>
#include <stdio.h>
......@@ -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
......
......@@ -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 <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
......
......@@ -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 <string.h>
#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"