Merge branch 'development' into dtls
* development:
Update copyright
Fix issue in compat.sh
Rename doxyfile
Rename to mbed TLS in tests/
Rename to mbed TLS in examples
Remove old test certificates.
Rename to mbed TLS in the documentation/comments
Change name to mbed TLS in the copyright notice
Conflicts:
doxygen/input/doc_mainpage.h
doxygen/mbedtls.doxyfile
include/polarssl/version.h
tests/compat.sh
diff --git a/include/polarssl/aes.h b/include/polarssl/aes.h
index 2e9092f..abf6517 100644
--- a/include/polarssl/aes.h
+++ b/include/polarssl/aes.h
@@ -3,9 +3,9 @@
*
* \brief AES block cipher
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/aesni.h b/include/polarssl/aesni.h
index 92b23cd..46f1344 100644
--- a/include/polarssl/aesni.h
+++ b/include/polarssl/aesni.h
@@ -3,9 +3,9 @@
*
* \brief AES-NI for hardware AES acceleration on some Intel processors
*
- * Copyright (C) 2013, Brainspark B.V.
+ * Copyright (C) 2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/arc4.h b/include/polarssl/arc4.h
index 555f54f..995d611 100644
--- a/include/polarssl/arc4.h
+++ b/include/polarssl/arc4.h
@@ -3,9 +3,9 @@
*
* \brief The ARCFOUR stream cipher
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/asn1.h b/include/polarssl/asn1.h
index eacdd08..ba80b17 100644
--- a/include/polarssl/asn1.h
+++ b/include/polarssl/asn1.h
@@ -3,9 +3,9 @@
*
* \brief Generic ASN.1 parsing
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/asn1write.h b/include/polarssl/asn1write.h
index 7a7fbf7..99830ae 100644
--- a/include/polarssl/asn1write.h
+++ b/include/polarssl/asn1write.h
@@ -3,9 +3,9 @@
*
* \brief ASN.1 buffer writing functionality
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/base64.h b/include/polarssl/base64.h
index d041493..f930f4e 100644
--- a/include/polarssl/base64.h
+++ b/include/polarssl/base64.h
@@ -3,9 +3,9 @@
*
* \brief RFC 1521 base64 encoding/decoding
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/bignum.h b/include/polarssl/bignum.h
index 992ed8e..a1c6087 100644
--- a/include/polarssl/bignum.h
+++ b/include/polarssl/bignum.h
@@ -3,9 +3,9 @@
*
* \brief Multi-precision integer library
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/blowfish.h b/include/polarssl/blowfish.h
index c652b46..41cfcec 100644
--- a/include/polarssl/blowfish.h
+++ b/include/polarssl/blowfish.h
@@ -3,9 +3,9 @@
*
* \brief Blowfish block cipher
*
- * Copyright (C) 2012-2014, Brainspark B.V.
+ * Copyright (C) 2012-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/bn_mul.h b/include/polarssl/bn_mul.h
index a8f0d22..b1de31e 100644
--- a/include/polarssl/bn_mul.h
+++ b/include/polarssl/bn_mul.h
@@ -3,9 +3,9 @@
*
* \brief Multi-precision integer library
*
- * Copyright (C) 2006-2010, Brainspark B.V.
+ * Copyright (C) 2006-2010, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/camellia.h b/include/polarssl/camellia.h
index 8488d1d..dc6653f 100644
--- a/include/polarssl/camellia.h
+++ b/include/polarssl/camellia.h
@@ -3,9 +3,9 @@
*
* \brief Camellia block cipher
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ccm.h b/include/polarssl/ccm.h
index 439152f..b4dd22e 100644
--- a/include/polarssl/ccm.h
+++ b/include/polarssl/ccm.h
@@ -3,9 +3,9 @@
*
* \brief Counter with CBC-MAC (CCM) for 128-bit block ciphers
*
- * Copyright (C) 2014, Brainspark B.V.
+ * Copyright (C) 2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/certs.h b/include/polarssl/certs.h
index ba7c028..bddd813 100644
--- a/include/polarssl/certs.h
+++ b/include/polarssl/certs.h
@@ -3,9 +3,9 @@
*
* \brief Sample certificates and DHM parameters for testing
*
- * Copyright (C) 2006-2010, Brainspark B.V.
+ * Copyright (C) 2006-2010, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/check_config.h b/include/polarssl/check_config.h
index d2c3643..50e0a45 100644
--- a/include/polarssl/check_config.h
+++ b/include/polarssl/check_config.h
@@ -3,9 +3,9 @@
*
* \brief Consistency checks for configuration options
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/cipher.h b/include/polarssl/cipher.h
index 087e590..332953a 100644
--- a/include/polarssl/cipher.h
+++ b/include/polarssl/cipher.h
@@ -5,9 +5,9 @@
*
* \author Adriaan de Jong <dejong@fox-it.com>
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/cipher_wrap.h b/include/polarssl/cipher_wrap.h
index 46bc757..a66bfd6 100644
--- a/include/polarssl/cipher_wrap.h
+++ b/include/polarssl/cipher_wrap.h
@@ -5,9 +5,9 @@
*
* \author Adriaan de Jong <dejong@fox-it.com>
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/compat-1.2.h b/include/polarssl/compat-1.2.h
index 15b5aa1..6bf94fa 100644
--- a/include/polarssl/compat-1.2.h
+++ b/include/polarssl/compat-1.2.h
@@ -3,9 +3,9 @@
*
* \brief Backwards compatibility header for PolarSSL-1.2 from PolarSSL-1.3
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/config.h b/include/polarssl/config.h
index 6d76883..f39be85 100644
--- a/include/polarssl/config.h
+++ b/include/polarssl/config.h
@@ -3,9 +3,9 @@
*
* \brief Configuration options (set of defines)
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -119,7 +119,7 @@
*
* Enable the memory allocation layer.
*
- * By default PolarSSL uses the system-provided malloc() and free().
+ * By default mbed TLS uses the system-provided malloc() and free().
* This allows different allocators (self-implemented or provided) to be
* provided to the platform abstraction layer.
*
@@ -153,10 +153,10 @@
/**
* \def POLARSSL_PLATFORM_XXX_ALT
*
- * Uncomment a macro to let PolarSSL support the function in the platform
+ * Uncomment a macro to let mbed TLS support the function in the platform
* abstraction layer.
*
- * Example: In case you uncomment POLARSSL_PLATFORM_PRINTF_ALT, PolarSSL will
+ * Example: In case you uncomment POLARSSL_PLATFORM_PRINTF_ALT, mbed TLS will
* provide a function "platform_set_printf()" that allows you to set an
* alternative printf function pointer.
*
@@ -170,7 +170,7 @@
/* \} name SECTION: System support */
/**
- * \name SECTION: PolarSSL feature support
+ * \name SECTION: mbed TLS feature support
*
* This section sets support for features that are or are not needed
* within the modules that are enabled.
@@ -193,12 +193,12 @@
/**
* \def POLARSSL_XXX_ALT
*
- * Uncomment a macro to let PolarSSL use your alternate core implementation of
+ * Uncomment a macro to let mbed TLS use your alternate core implementation of
* a symmetric or hash algorithm (e.g. platform specific assembly optimized
* implementations). Keep in mind that the function prototypes should remain
* the same.
*
- * Example: In case you uncomment POLARSSL_AES_ALT, PolarSSL will no longer
+ * Example: In case you uncomment POLARSSL_AES_ALT, mbed TLS will no longer
* provide the "struct aes_context" definition and omit the base function
* declarations and implementations. "aes_alt.h" will be included from
* "aes.h" to include the new function definitions.
@@ -797,7 +797,7 @@
* \def POLARSSL_SSL_ALL_ALERT_MESSAGES
*
* Enable sending of alert messages in case of encountered errors as per RFC.
- * If you choose not to send the alert messages, PolarSSL can still communicate
+ * If you choose not to send the alert messages, mbed TLS can still communicate
* with other servers, only debugging of failures is harder.
*
* The advantage of not sending alert messages, is that no information is given
@@ -1225,12 +1225,12 @@
* Uncomment to enable use of ZLIB
*/
//#define POLARSSL_ZLIB_SUPPORT
-/* \} name SECTION: PolarSSL feature support */
+/* \} name SECTION: mbed TLS feature support */
/**
- * \name SECTION: PolarSSL modules
+ * \name SECTION: mbed TLS modules
*
- * This section enables or disables entire modules in PolarSSL
+ * This section enables or disables entire modules in mbed TLS
* \{
*/
@@ -1762,7 +1762,7 @@
* Module: library/memory_buffer_alloc.c
*
* Requires: POLARSSL_PLATFORM_C
- * POLARSSL_PLATFORM_MEMORY (to use it within PolarSSL)
+ * POLARSSL_PLATFORM_MEMORY (to use it within mbed TLS)
*
* Enable this module to enable the buffer memory allocator.
*/
@@ -2117,7 +2117,7 @@
* \def POLARSSL_THREADING_C
*
* Enable the threading abstraction layer.
- * By default PolarSSL assumes it is used in a non-threaded environment or that
+ * By default mbed TLS assumes it is used in a non-threaded environment or that
* contexts are not shared between threads. If you do intend to use contexts
* between threads, you will need to enable this layer to prevent race
* conditions.
@@ -2130,7 +2130,7 @@
* You will have to enable either POLARSSL_THREADING_ALT or
* POLARSSL_THREADING_PTHREAD.
*
- * Enable this layer to allow use of mutexes within PolarSSL
+ * Enable this layer to allow use of mutexes within mbed TLS
*/
//#define POLARSSL_THREADING_C
@@ -2267,7 +2267,7 @@
*/
#define POLARSSL_XTEA_C
-/* \} name SECTION: PolarSSL modules */
+/* \} name SECTION: mbed TLS modules */
/**
* \name SECTION: Module configuration options
diff --git a/include/polarssl/ctr_drbg.h b/include/polarssl/ctr_drbg.h
index de696dc..3eb0398 100644
--- a/include/polarssl/ctr_drbg.h
+++ b/include/polarssl/ctr_drbg.h
@@ -3,9 +3,9 @@
*
* \brief CTR_DRBG based on AES-256 (NIST SP 800-90)
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/debug.h b/include/polarssl/debug.h
index 0dd79d5..a5d4fda 100644
--- a/include/polarssl/debug.h
+++ b/include/polarssl/debug.h
@@ -3,9 +3,9 @@
*
* \brief Debug functions
*
- * Copyright (C) 2006-2011, Brainspark B.V.
+ * Copyright (C) 2006-2011, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/des.h b/include/polarssl/des.h
index 89bb394..47e06de 100644
--- a/include/polarssl/des.h
+++ b/include/polarssl/des.h
@@ -3,9 +3,9 @@
*
* \brief DES block cipher
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/dhm.h b/include/polarssl/dhm.h
index 064472f..56d92a3 100644
--- a/include/polarssl/dhm.h
+++ b/include/polarssl/dhm.h
@@ -3,9 +3,9 @@
*
* \brief Diffie-Hellman-Merkle key exchange
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ecdh.h b/include/polarssl/ecdh.h
index 525cade..d5a29fd 100644
--- a/include/polarssl/ecdh.h
+++ b/include/polarssl/ecdh.h
@@ -3,9 +3,9 @@
*
* \brief Elliptic curve Diffie-Hellman
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ecdsa.h b/include/polarssl/ecdsa.h
index d99a17a..f1907dd 100644
--- a/include/polarssl/ecdsa.h
+++ b/include/polarssl/ecdsa.h
@@ -3,9 +3,9 @@
*
* \brief Elliptic curve DSA
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ecp.h b/include/polarssl/ecp.h
index 6dec5bd..18f15e2 100644
--- a/include/polarssl/ecp.h
+++ b/include/polarssl/ecp.h
@@ -3,9 +3,9 @@
*
* \brief Elliptic curves over GF(p)
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/entropy.h b/include/polarssl/entropy.h
index f5fa928..286f55a 100644
--- a/include/polarssl/entropy.h
+++ b/include/polarssl/entropy.h
@@ -3,9 +3,9 @@
*
* \brief Entropy accumulator implementation
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/entropy_poll.h b/include/polarssl/entropy_poll.h
index 92efa00..695767b 100644
--- a/include/polarssl/entropy_poll.h
+++ b/include/polarssl/entropy_poll.h
@@ -3,9 +3,9 @@
*
* \brief Platform-specific and custom entropy polling functions
*
- * Copyright (C) 2006-2011, Brainspark B.V.
+ * Copyright (C) 2006-2011, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/error.h b/include/polarssl/error.h
index 1e36a0d..c72441a 100644
--- a/include/polarssl/error.h
+++ b/include/polarssl/error.h
@@ -3,9 +3,9 @@
*
* \brief Error to string translation
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -102,7 +102,7 @@
#endif
/**
- * \brief Translate a PolarSSL error code into a string representation,
+ * \brief Translate a mbed TLS error code into a string representation,
* Result is truncated if necessary and always includes a terminating
* null byte.
*
diff --git a/include/polarssl/gcm.h b/include/polarssl/gcm.h
index c2829a0..465a89f 100644
--- a/include/polarssl/gcm.h
+++ b/include/polarssl/gcm.h
@@ -3,9 +3,9 @@
*
* \brief Galois/Counter mode for 128-bit block ciphers
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/havege.h b/include/polarssl/havege.h
index 536eb08..ceb54b7 100644
--- a/include/polarssl/havege.h
+++ b/include/polarssl/havege.h
@@ -3,9 +3,9 @@
*
* \brief HAVEGE: HArdware Volatile Entropy Gathering and Expansion
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/hmac_drbg.h b/include/polarssl/hmac_drbg.h
index 2d765d5..a4b73bd 100644
--- a/include/polarssl/hmac_drbg.h
+++ b/include/polarssl/hmac_drbg.h
@@ -3,9 +3,9 @@
*
* \brief HMAC_DRBG (NIST SP 800-90A)
*
- * Copyright (C) 2014, Brainspark B.V.
+ * Copyright (C) 2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/md.h b/include/polarssl/md.h
index 81d8a2e..a657c40 100644
--- a/include/polarssl/md.h
+++ b/include/polarssl/md.h
@@ -5,9 +5,9 @@
*
* \author Adriaan de Jong <dejong@fox-it.com>
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/md2.h b/include/polarssl/md2.h
index 952b0bf..78aec4e 100644
--- a/include/polarssl/md2.h
+++ b/include/polarssl/md2.h
@@ -3,9 +3,9 @@
*
* \brief MD2 message digest algorithm (hash function)
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/md4.h b/include/polarssl/md4.h
index fc5a5cd..9fab25c 100644
--- a/include/polarssl/md4.h
+++ b/include/polarssl/md4.h
@@ -3,9 +3,9 @@
*
* \brief MD4 message digest algorithm (hash function)
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/md5.h b/include/polarssl/md5.h
index 2f378f6..760c0e4 100644
--- a/include/polarssl/md5.h
+++ b/include/polarssl/md5.h
@@ -3,9 +3,9 @@
*
* \brief MD5 message digest algorithm (hash function)
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/md_wrap.h b/include/polarssl/md_wrap.h
index eb1db0f..aecac66 100644
--- a/include/polarssl/md_wrap.h
+++ b/include/polarssl/md_wrap.h
@@ -5,9 +5,9 @@
*
* \author Adriaan de Jong <dejong@fox-it.com>
*
- * Copyright (C) 2006-2011, Brainspark B.V.
+ * Copyright (C) 2006-2011, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/memory.h b/include/polarssl/memory.h
index 3af3951..0068be7 100644
--- a/include/polarssl/memory.h
+++ b/include/polarssl/memory.h
@@ -3,9 +3,9 @@
*
* \brief Memory allocation layer (Deprecated to platform layer)
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/memory_buffer_alloc.h b/include/polarssl/memory_buffer_alloc.h
index a1b4937..d51fac5 100644
--- a/include/polarssl/memory_buffer_alloc.h
+++ b/include/polarssl/memory_buffer_alloc.h
@@ -3,9 +3,9 @@
*
* \brief Buffer-based memory allocator
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/net.h b/include/polarssl/net.h
index f5b3f42..7e5e41d 100644
--- a/include/polarssl/net.h
+++ b/include/polarssl/net.h
@@ -3,9 +3,9 @@
*
* \brief Network communication functions
*
- * Copyright (C) 2006-2011, Brainspark B.V.
+ * Copyright (C) 2006-2011, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/oid.h b/include/polarssl/oid.h
index c4d5c3f..6adee5a 100644
--- a/include/polarssl/oid.h
+++ b/include/polarssl/oid.h
@@ -3,9 +3,9 @@
*
* \brief Object Identifier (OID) database
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/openssl.h b/include/polarssl/openssl.h
index b77e7da..4ff2f35 100644
--- a/include/polarssl/openssl.h
+++ b/include/polarssl/openssl.h
@@ -3,9 +3,9 @@
*
* \brief OpenSSL wrapper (definitions, inline functions).
*
- * Copyright (C) 2006-2010, Brainspark B.V.
+ * Copyright (C) 2006-2010, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/padlock.h b/include/polarssl/padlock.h
index 3c5f725..147ddff 100644
--- a/include/polarssl/padlock.h
+++ b/include/polarssl/padlock.h
@@ -4,9 +4,9 @@
* \brief VIA PadLock ACE for HW encryption/decryption supported by some
* processors
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/pbkdf2.h b/include/polarssl/pbkdf2.h
index 5ccb2fa..5378a1b 100644
--- a/include/polarssl/pbkdf2.h
+++ b/include/polarssl/pbkdf2.h
@@ -6,9 +6,9 @@
*
* \author Mathias Olsson <mathias@kompetensum.com>
*
- * Copyright (C) 2006-2012, Brainspark B.V.
+ * Copyright (C) 2006-2012, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -60,7 +60,7 @@
* \param key_length Length of generated key
* \param output Generated key. Must be at least as big as key_length
*
- * \returns 0 on success, or a PolarSSL error code if verification fails.
+ * \returns 0 on success, or a POLARSSL_ERR_xxx code if verification fails.
*/
int pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
size_t plen, const unsigned char *salt, size_t slen,
diff --git a/include/polarssl/pem.h b/include/polarssl/pem.h
index e606cf0..8508ed9 100644
--- a/include/polarssl/pem.h
+++ b/include/polarssl/pem.h
@@ -3,9 +3,9 @@
*
* \brief Privacy Enhanced Mail (PEM) decoding
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/pk.h b/include/polarssl/pk.h
index b29eb74..da7251c 100644
--- a/include/polarssl/pk.h
+++ b/include/polarssl/pk.h
@@ -3,9 +3,9 @@
*
* \brief Public Key abstraction layer
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/pk_wrap.h b/include/polarssl/pk_wrap.h
index 7baafb9..c29c379 100644
--- a/include/polarssl/pk_wrap.h
+++ b/include/polarssl/pk_wrap.h
@@ -3,9 +3,9 @@
*
* \brief Public Key abstraction layer: wrapper functions
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/pkcs11.h b/include/polarssl/pkcs11.h
index 84f862d..93fd865 100644
--- a/include/polarssl/pkcs11.h
+++ b/include/polarssl/pkcs11.h
@@ -5,9 +5,9 @@
*
* \author Adriaan de Jong <dejong@fox-it.com>
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -62,7 +62,7 @@
} pkcs11_context;
/**
- * Fill in a PolarSSL certificate, based on the given PKCS11 helper certificate.
+ * Fill in a mbed TLS certificate, based on the given PKCS11 helper certificate.
*
* \param cert X.509 certificate to fill
* \param pkcs11h_cert PKCS #11 helper certificate
diff --git a/include/polarssl/pkcs12.h b/include/polarssl/pkcs12.h
index 4bd5018..d5bad29 100644
--- a/include/polarssl/pkcs12.h
+++ b/include/polarssl/pkcs12.h
@@ -3,9 +3,9 @@
*
* \brief PKCS#12 Personal Information Exchange Syntax
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -61,7 +61,7 @@
* \param len data length
* \param output the output buffer
*
- * \return 0 if successful, or a PolarSSL error code
+ * \return 0 if successful, or a POLARSSL_ERR_xxx code
*/
int pkcs12_pbe_sha1_rc4_128( asn1_buf *pbe_params, int mode,
const unsigned char *pwd, size_t pwdlen,
@@ -82,7 +82,7 @@
* \param len data length
* \param output the output buffer
*
- * \return 0 if successful, or a PolarSSL error code
+ * \return 0 if successful, or a POLARSSL_ERR_xxx code
*/
int pkcs12_pbe( asn1_buf *pbe_params, int mode,
cipher_type_t cipher_type, md_type_t md_type,
diff --git a/include/polarssl/pkcs5.h b/include/polarssl/pkcs5.h
index 34e824b..2691f98 100644
--- a/include/polarssl/pkcs5.h
+++ b/include/polarssl/pkcs5.h
@@ -5,9 +5,9 @@
*
* \author Mathias Olsson <mathias@kompetensum.com>
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -64,7 +64,7 @@
* \param datalen length of data
* \param output output buffer
*
- * \returns 0 on success, or a PolarSSL error code if verification fails.
+ * \returns 0 on success, or a POLARSSL_ERR_xxx code if verification fails.
*/
int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
const unsigned char *pwd, size_t pwdlen,
@@ -83,7 +83,7 @@
* \param key_length Length of generated key
* \param output Generated key. Must be at least as big as key_length
*
- * \returns 0 on success, or a PolarSSL error code if verification fails.
+ * \returns 0 on success, or a POLARSSL_ERR_xxx code if verification fails.
*/
int pkcs5_pbkdf2_hmac( md_context_t *ctx, const unsigned char *password,
size_t plen, const unsigned char *salt, size_t slen,
diff --git a/include/polarssl/platform.h b/include/polarssl/platform.h
index eae887a..d5acbdf 100644
--- a/include/polarssl/platform.h
+++ b/include/polarssl/platform.h
@@ -1,11 +1,11 @@
/**
* \file platform.h
*
- * \brief PolarSSL Platform abstraction layer
+ * \brief mbed TLS Platform abstraction layer
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ripemd160.h b/include/polarssl/ripemd160.h
index e3b66c9..f3f0624 100644
--- a/include/polarssl/ripemd160.h
+++ b/include/polarssl/ripemd160.h
@@ -3,9 +3,9 @@
*
* \brief RIPE MD-160 message digest
*
- * Copyright (C) 2014-2014, Brainspark B.V.
+ * Copyright (C) 2014-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/rsa.h b/include/polarssl/rsa.h
index e636c80..2b719d1 100644
--- a/include/polarssl/rsa.h
+++ b/include/polarssl/rsa.h
@@ -3,9 +3,9 @@
*
* \brief The RSA public-key cryptosystem
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/sha1.h b/include/polarssl/sha1.h
index cb0c436..ed46b5b 100644
--- a/include/polarssl/sha1.h
+++ b/include/polarssl/sha1.h
@@ -3,9 +3,9 @@
*
* \brief SHA-1 cryptographic hash function
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/sha256.h b/include/polarssl/sha256.h
index b143674..8f1aa19 100644
--- a/include/polarssl/sha256.h
+++ b/include/polarssl/sha256.h
@@ -3,9 +3,9 @@
*
* \brief SHA-224 and SHA-256 cryptographic hash function
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/sha512.h b/include/polarssl/sha512.h
index dfbae4a..ce0fed1 100644
--- a/include/polarssl/sha512.h
+++ b/include/polarssl/sha512.h
@@ -3,9 +3,9 @@
*
* \brief SHA-384 and SHA-512 cryptographic hash function
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ssl.h b/include/polarssl/ssl.h
index 7aa4ba7..6972836 100644
--- a/include/polarssl/ssl.h
+++ b/include/polarssl/ssl.h
@@ -3,9 +3,9 @@
*
* \brief SSL/TLS functions.
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -1480,8 +1480,8 @@
* order. First in the list has the highest preference.
* (Overrides all version specific lists)
*
- * Note: The PolarSSL SSL server uses its own preferences
- * over the preference of the connection SSL client unless
+ * Note: The server uses its own preferences
+ * over the preference of the client unless
* POLARSSL_SSL_SRV_RESPECT_CLIENT_PREFERENCE is defined!
*
* \param ssl SSL context
@@ -1564,7 +1564,7 @@
#endif /* POLARSSL_RSA_C */
/**
- * \brief Set own certificate and alternate non-PolarSSL RSA private
+ * \brief Set own certificate and external RSA private
* key and handling callbacks, such as the PKCS#11 wrappers
* or any other external private key handler.
* (see the respective RSA functions in rsa.h for documentation
diff --git a/include/polarssl/ssl_cache.h b/include/polarssl/ssl_cache.h
index 918fb60..bfc1afa 100644
--- a/include/polarssl/ssl_cache.h
+++ b/include/polarssl/ssl_cache.h
@@ -3,9 +3,9 @@
*
* \brief SSL session cache implementation
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/ssl_ciphersuites.h b/include/polarssl/ssl_ciphersuites.h
index c803b40..b98c0cc 100644
--- a/include/polarssl/ssl_ciphersuites.h
+++ b/include/polarssl/ssl_ciphersuites.h
@@ -1,11 +1,11 @@
/**
* \file ssl_ciphersuites.h
*
- * \brief SSL Ciphersuites for PolarSSL
+ * \brief SSL Ciphersuites for mbed TLS
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/threading.h b/include/polarssl/threading.h
index 1fc9f98..4f8a48e 100644
--- a/include/polarssl/threading.h
+++ b/include/polarssl/threading.h
@@ -3,9 +3,9 @@
*
* \brief Threading abstraction layer
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/timing.h b/include/polarssl/timing.h
index 383120e..a0011ba 100644
--- a/include/polarssl/timing.h
+++ b/include/polarssl/timing.h
@@ -3,9 +3,9 @@
*
* \brief Portable interface to the CPU cycle counter
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/version.h b/include/polarssl/version.h
index 24b1dec..245540e 100644
--- a/include/polarssl/version.h
+++ b/include/polarssl/version.h
@@ -3,9 +3,9 @@
*
* \brief Run-time version information
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -26,7 +26,7 @@
*/
/*
* This set of compile-time defines and run-time variables can be used to
- * determine the version number of the PolarSSL library used.
+ * determine the version number of the mbed TLS library used.
*/
#ifndef POLARSSL_VERSION_H
#define POLARSSL_VERSION_H
@@ -52,7 +52,7 @@
*/
#define POLARSSL_VERSION_NUMBER 0x01040000
#define POLARSSL_VERSION_STRING "1.4.0"
-#define POLARSSL_VERSION_STRING_FULL "PolarSSL 1.4.0"
+#define POLARSSL_VERSION_STRING_FULL "mbed TLS 1.4.0"
#if defined(POLARSSL_VERSION_C)
@@ -77,9 +77,9 @@
void version_get_string( char *string );
/**
- * Get the full version string ("PolarSSL x.y.z").
+ * Get the full version string ("mbed TLS x.y.z").
*
- * \param string The string that will receive the value. The PolarSSL version
+ * \param string The string that will receive the value. The mbed TLS version
* string will use 18 bytes AT MOST including a terminating
* null byte.
* (So the buffer should be at least 18 bytes to receive this
@@ -89,12 +89,12 @@
/**
* \brief Check if support for a feature was compiled into this
- * PolarSSL binary. This allows you to see at runtime if the
+ * mbed TLS binary. This allows you to see at runtime if the
* library was for instance compiled with or without
* Multi-threading support.
*
* Note: only checks against defines in the sections "System
- * support", "PolarSSL modules" and "PolarSSL feature
+ * support", "mbed TLS modules" and "mbed TLS feature
* support" in config.h
*
* \param feature The string for the define to check (e.g. "POLARSSL_AES_C")
diff --git a/include/polarssl/x509.h b/include/polarssl/x509.h
index 5f71881..69963b4 100644
--- a/include/polarssl/x509.h
+++ b/include/polarssl/x509.h
@@ -3,9 +3,9 @@
*
* \brief X.509 generic defines and structures
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/x509_crl.h b/include/polarssl/x509_crl.h
index 4ddbafc..5fb9312 100644
--- a/include/polarssl/x509_crl.h
+++ b/include/polarssl/x509_crl.h
@@ -3,9 +3,9 @@
*
* \brief X.509 certificate revocation list parsing
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
diff --git a/include/polarssl/x509_crt.h b/include/polarssl/x509_crt.h
index 4bf8e56..f56a7c0 100644
--- a/include/polarssl/x509_crt.h
+++ b/include/polarssl/x509_crt.h
@@ -3,9 +3,9 @@
*
* \brief X.509 certificate parsing and writing
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -367,7 +367,7 @@
* \brief Set the issuer name for a Certificate
* Issuer names should contain a comma-separated list
* of OID types and values:
- * e.g. "C=NL,O=Offspark,CN=PolarSSL CA"
+ * e.g. "C=UK,O=ARM,CN=mbed TLS CA"
*
* \param ctx CRT context to use
* \param issuer_name issuer name to set
@@ -382,7 +382,7 @@
* \brief Set the subject name for a Certificate
* Subject names should contain a comma-separated list
* of OID types and values:
- * e.g. "C=NL,O=Offspark,CN=PolarSSL Server 1"
+ * e.g. "C=UK,O=ARM,CN=mbed TLS Server 1"
*
* \param ctx CRT context to use
* \param subject_name subject name to set
diff --git a/include/polarssl/x509_csr.h b/include/polarssl/x509_csr.h
index 6591e38..5baeb70 100644
--- a/include/polarssl/x509_csr.h
+++ b/include/polarssl/x509_csr.h
@@ -3,9 +3,9 @@
*
* \brief X.509 certificate signing request parsing and writing
*
- * Copyright (C) 2006-2014, Brainspark B.V.
+ * Copyright (C) 2006-2014, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.
@@ -164,7 +164,7 @@
* \brief Set the subject name for a CSR
* Subject names should contain a comma-separated list
* of OID types and values:
- * e.g. "C=NL,O=Offspark,CN=PolarSSL Server 1"
+ * e.g. "C=UK,O=ARM,CN=mbed TLS Server 1"
*
* \param ctx CSR context to use
* \param subject_name subject name to set
diff --git a/include/polarssl/xtea.h b/include/polarssl/xtea.h
index 794c5ef..e8f41b8 100644
--- a/include/polarssl/xtea.h
+++ b/include/polarssl/xtea.h
@@ -3,9 +3,9 @@
*
* \brief XTEA block cipher (32-bit)
*
- * Copyright (C) 2006-2013, Brainspark B.V.
+ * Copyright (C) 2006-2013, ARM Limited, All Rights Reserved
*
- * This file is part of PolarSSL (http://www.polarssl.org)
+ * This file is part of mbed TLS (http://www.polarssl.org)
* Lead Maintainer: Paul Bakker <polarssl_maintainer at polarssl.org>
*
* All rights reserved.