Skip to content

Commit

Permalink
Rename to mbed TLS in the documentation/comments
Browse files Browse the repository at this point in the history
  • Loading branch information
mpg committed Jan 22, 2015
1 parent 967a2a5 commit b4fe3cb
Show file tree
Hide file tree
Showing 32 changed files with 73 additions and 73 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ addons:
coverity_scan:
project:
name: "polarssl/polarssl"
description: "PolarSSL Open Source SSL Library"
description: "mbed TLS Open Source SSL Library"
notification_email: [email protected]
build_command_prepend:
build_command: make
Expand Down
2 changes: 1 addition & 1 deletion DartConfiguration.tcl
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Site: localhost
BuildName: PolarSSL-test
BuildName: mbed TLS-test
CoverageCommand: /usr/bin/gcov
MemoryCheckCommand: /usr/bin/valgrind
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ lcov:
lcov --add-tracefile files.info --add-tracefile tests.info -o all.info
lcov --remove all.info -o final.info '*.h'
gendesc tests/Descriptions.txt -o descriptions
genhtml --title PolarSSL --description-file descriptions --keep-descriptions --legend --no-branch-coverage -o Coverage final.info
genhtml --title mbed TLS --description-file descriptions --keep-descriptions --legend --no-branch-coverage -o Coverage final.info
rm -f files.info tests.info all.info final.info descriptions

apidoc:
Expand Down
12 changes: 6 additions & 6 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
===================
README for PolarSSL
README for mbed TLS
===================

Configuration
=============

PolarSSL 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/polarssl/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).

Expand All @@ -14,7 +14,7 @@ Compiler options can be set using standard variables such as *CC* and *CFLAGS* w
Compiling
=========

There are currently three active build systems within the PolarSSL releases:
There are currently three active build systems within the mbed TLS releases:

- Make
- CMake
Expand All @@ -35,7 +35,7 @@ In order to run the tests, enter::

make check

Depending on your platform, you might run into some issues. Please check the Makefiles in *library/*, *programs/* and *tests/* for options to manually add or remove for specific platforms. You can also check `the PolarSSL Knowledge Base <https://polarssl.org/kb>`_ for articles on your platform or issue.
Depending on your platform, you might run into some issues. Please check the Makefiles in *library/*, *programs/* and *tests/* for options to manually add or remove for specific platforms. You can also check `the mbed TLS Knowledge Base <https://polarssl.org/kb>`_ for articles on your platform or issue.

In case you find that you need to do something else as well, please let us know what, so we can add it to the KB.

Expand Down Expand Up @@ -101,7 +101,7 @@ We've included example programs for a lot of different features and uses in *pro
Tests
=====

PolarSSL includes an elaborate test suite in *tests/* that initially requires Perl to generate the tests files (e.g. *test_suite_mpi.c*). These files are generates from a **function file** (e.g. *suites/test_suite_mpi.function*) and a **data file** (e.g. *suites/test_suite_mpi.data*). The **function file** contains the template for each test function. The **data file** contains the test cases, specified as parameters that should be pushed into a template function.
mbed TLS includes an elaborate test suite in *tests/* that initially requires Perl to generate the tests files (e.g. *test_suite_mpi.c*). These files are generates from a **function file** (e.g. *suites/test_suite_mpi.function*) and a **data file** (e.g. *suites/test_suite_mpi.data*). The **function file** contains the template for each test function. The **data file** contains the test cases, specified as parameters that should be pushed into a template function.

For machines with a Unix shell and OpenSSL (and optionnally GnuTLS) installed, additional test scripts are available:

Expand Down Expand Up @@ -129,7 +129,7 @@ Process
#. `Check for open issues <https://github.com/polarssl/polarssl/issues>`_ or
`start a discussion <https://polarssl.org/discussions>`_ around a feature
idea or a bug.
#. Fork the `PolarSSL repository on Github <https://github.com/polarssl/polarssl>`_
#. Fork the `mbed TLS repository on Github <https://github.com/polarssl/polarssl>`_
to start making your changes.
#. Write a test which shows that the bug was fixed or that the feature works
as expected.
Expand Down
2 changes: 1 addition & 1 deletion configs/README.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@ them, you can pick one of the following methods:
make

Note that the second method also works if you want to keep your custom
configuration file outside the PolarSSL tree.
configuration file outside the mbed TLS tree.
4 changes: 2 additions & 2 deletions configs/config-ccm-psk-tls1_2.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
//#define POLARSSL_HAVE_TIME /* Optionally used in Hello messages */
/* Other POLARSSL_HAVE_XXX flags irrelevant for this configuration */

/* PolarSSL feature support */
/* mbed TLS feature support */
#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
#define POLARSSL_SSL_PROTO_TLS1_2
#define POLARSSL_SSL_DISABLE_RENEGOTIATION

/* PolarSSL modules */
/* mbed TLS modules */
#define POLARSSL_AES_C
#define POLARSSL_CCM_C
#define POLARSSL_CIPHER_C
Expand Down
4 changes: 2 additions & 2 deletions configs/config-mini-tls1_1.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
#define POLARSSL_HAVE_TIME
#define POLARSSL_HAVE_IPV6

/* PolarSSL feature support */
/* mbed TLS feature support */
#define POLARSSL_CIPHER_MODE_CBC
#define POLARSSL_PKCS1_V15
#define POLARSSL_KEY_EXCHANGE_RSA_ENABLED
#define POLARSSL_SSL_PROTO_TLS1_1
#define POLARSSL_SSL_DISABLE_RENEGOTIATION

/* PolarSSL modules */
/* mbed TLS modules */
#define POLARSSL_AES_C
#define POLARSSL_ASN1_PARSE_C
#define POLARSSL_ASN1_WRITE_C
Expand Down
4 changes: 2 additions & 2 deletions configs/config-picocoin.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#define POLARSSL_HAVE_TIME
#define POLARSSL_HAVE_IPV6

/* PolarSSL feature support */
/* mbed TLS feature support */
#define POLARSSL_CIPHER_MODE_CBC
#define POLARSSL_CIPHER_PADDING_PKCS7
#define POLARSSL_ECP_DP_SECP256K1_ENABLED
Expand All @@ -27,7 +27,7 @@
#define POLARSSL_ERROR_STRERROR_DUMMY
#define POLARSSL_FS_IO

/* PolarSSL modules */
/* mbed TLS modules */
#define POLARSSL_AESNI_C
#define POLARSSL_AES_C
#define POLARSSL_ASN1_PARSE_C
Expand Down
4 changes: 2 additions & 2 deletions configs/config-psk-rc4-tls1_0.h
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
//#define POLARSSL_HAVE_TIME /* Optionnaly used in Hello messages */
/* Other POLARSSL_HAVE_XXX flags irrelevant for this configuration */

/* PolarSSL feature support */
/* mbed TLS feature support */
#define POLARSSL_KEY_EXCHANGE_PSK_ENABLED
#define POLARSSL_SSL_PROTO_TLS1
#define POLARSSL_SSL_DISABLE_RENEGOTIATION

/* PolarSSL modules */
/* mbed TLS modules */
#define POLARSSL_AES_C
#define POLARSSL_ARC4_C
#define POLARSSL_CIPHER_C
Expand Down
4 changes: 2 additions & 2 deletions configs/config-suite-b.h
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,14 @@
#define POLARSSL_HAVE_TIME
#define POLARSSL_HAVE_IPV6

/* PolarSSL feature support */
/* mbed TLS feature support */
#define POLARSSL_ECP_DP_SECP256R1_ENABLED
#define POLARSSL_ECP_DP_SECP384R1_ENABLED
#define POLARSSL_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
#define POLARSSL_SSL_PROTO_TLS1_2
#define POLARSSL_SSL_DISABLE_RENEGOTIATION

/* PolarSSL modules */
/* mbed TLS modules */
#define POLARSSL_AES_C
#define POLARSSL_ASN1_PARSE_C
#define POLARSSL_ASN1_WRITE_C
Expand Down
14 changes: 7 additions & 7 deletions doxygen/input/doc_mainpage.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,23 @@
*/

/**
* @mainpage PolarSSL v1.3.9 source code documentation
* @mainpage mbed TLS v1.3.9 source code documentation
*
* This documentation describes the internal structure of PolarSSL. It was
* This documentation describes the internal structure of mbed TLS. It was
* automatically generated from specially formatted comment blocks in
* PolarSSL's source code using Doxygen. (See
* mbed TLS's source code using Doxygen. (See
* http://www.stack.nl/~dimitri/doxygen/ for more information on Doxygen)
*
* PolarSSL has a simple setup: it provides the ingredients for an SSL/TLS
* mbed TLS has a simple setup: it provides the ingredients for an SSL/TLS
* implementation. These ingredients are listed as modules in the
* \ref mainpage_modules "Modules section". This "Modules section" introduces
* the high-level module concepts used throughout this documentation.\n
* Some examples of PolarSSL usage can be found in the \ref mainpage_examples
* Some examples of mbed TLS usage can be found in the \ref mainpage_examples
* "Examples section".
*
* @section mainpage_modules Modules
*
* PolarSSL supports SSLv3 up to TLSv1.2 communication by providing the
* mbed TLS supports SSLv3 up to TLSv1.2 communication by providing the
* following:
* - TCP/IP communication functions: listen, connect, accept, read/write.
* - SSL/TLS communication functions: init, handshake, read/write.
Expand All @@ -34,7 +34,7 @@
* into an SSL server/client solution that utilises a X.509 PKI. Examples of
* such implementations are amply provided with the source code.
*
* Note that PolarSSL does not provide a control channel or (multiple) session
* Note that mbed TLS does not provide a control channel or (multiple) session
* handling without additional work from the developer.
*
* @section mainpage_examples Examples
Expand Down
2 changes: 1 addition & 1 deletion doxygen/polarssl.doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ DOXYFILE_ENCODING = UTF-8
# identify the project. Note that if you do not use Doxywizard you need
# to put quotes around the project name if it contains spaces.

PROJECT_NAME = "PolarSSL v1.3.9"
PROJECT_NAME = "mbed TLS v1.3.9"

# The PROJECT_NUMBER tag can be used to enter a project or revision number.
# This could be handy for archiving the generated documentation or
Expand Down
28 changes: 14 additions & 14 deletions include/polarssl/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -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.
*
Expand Down Expand Up @@ -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.
*
Expand All @@ -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.
Expand All @@ -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.
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -1158,12 +1158,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
* \{
*/

Expand Down Expand Up @@ -1695,7 +1695,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.
*/
Expand Down Expand Up @@ -2038,7 +2038,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.
Expand All @@ -2051,7 +2051,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

Expand Down Expand Up @@ -2188,7 +2188,7 @@
*/
#define POLARSSL_XTEA_C

/* \} name SECTION: PolarSSL modules */
/* \} name SECTION: mbed TLS modules */

/**
* \name SECTION: Module configuration options
Expand Down
2 changes: 1 addition & 1 deletion include/polarssl/error.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ extern "C" {
#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.
*
Expand Down
2 changes: 1 addition & 1 deletion include/polarssl/pbkdf2.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ extern "C" {
* \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,
Expand Down
2 changes: 1 addition & 1 deletion include/polarssl/pkcs11.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ typedef struct {
} 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
Expand Down
4 changes: 2 additions & 2 deletions include/polarssl/pkcs12.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extern "C" {
* \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,
Expand All @@ -82,7 +82,7 @@ int pkcs12_pbe_sha1_rc4_128( asn1_buf *pbe_params, int mode,
* \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,
Expand Down
4 changes: 2 additions & 2 deletions include/polarssl/pkcs5.h
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ extern "C" {
* \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,
Expand All @@ -83,7 +83,7 @@ int pkcs5_pbes2( asn1_buf *pbe_params, int mode,
* \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,
Expand Down
2 changes: 1 addition & 1 deletion include/polarssl/platform.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* \file platform.h
*
* \brief PolarSSL Platform abstraction layer
* \brief mbed TLS Platform abstraction layer
*
* Copyright (C) 2006-2014, Brainspark B.V.
*
Expand Down
Loading

0 comments on commit b4fe3cb

Please sign in to comment.