yuzu-emu/mbedtls
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update spelling "mbed TLS" to "Mbed TLS"

Browse source 
The official spelling of the trade mark changed from all-lowercase "mbed"
to normal proper noun capitalization "Mbed" a few years ago. We've been
using the new spelling in new text but still have the old spelling in a
lot of text. This commit updates most occurrences of "mbed TLS":

```
sed -i -e 's/mbed TLS/Mbed TLS/g' $(git ls-files ':!ChangeLog' ':!tests/data_files/**' ':!tests/suites/*.data' ':!programs/x509/*' ':!configs/tfm*')
```

Justification for the omissions:

* `ChangeLog`: historical text.
* `test/data_files/**`, `tests/suites/*.data`, `programs/x509/*`: many
  occurrences are significant names in certificates and such. Changing
  the spelling would invalidate many signatures and tests.
* `configs/tfm*`: this is an imported file. We'll follow the upstream
  updates.

Signed-off-by: Gilles Peskine <Gilles.Peskine@arm.com>
This commit is contained in:
Gilles Peskine 2023-08-03 17:45:20 +02:00
parent 4843278237
commit e820c0abc8
57 changed files with 100 additions and 100 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
3rdparty/everest/include/everest/vs2013/inttypes.h vendored
View file

@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
#ifndef _INTTYPES_H_VS2010 #ifndef _INTTYPES_H_VS2010

2
3rdparty/everest/include/everest/vs2013/stdbool.h vendored
View file

@ -17,7 +17,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
#ifndef _STDBOOL_H_VS2010 #ifndef _STDBOOL_H_VS2010

2
3rdparty/everest/include/everest/x25519.h vendored
View file

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
#ifndef MBEDTLS_X25519_H #ifndef MBEDTLS_X25519_H

2
3rdparty/everest/library/Hacl_Curve25519_joined.c vendored
View file

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
#ifndef _BSD_SOURCE #ifndef _BSD_SOURCE
/* Required to get htole64() from gcc/glibc's endian.h (older systems) /* Required to get htole64() from gcc/glibc's endian.h (older systems)

2
3rdparty/everest/library/x25519.c vendored
View file

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
#include "common.h" #include "common.h"

2
3rdparty/p256-m/p256-m_driver_entrypoints.h vendored
View file

@ -31,7 +31,7 @@
/** Generate SECP256R1 ECC Key Pair. /** Generate SECP256R1 ECC Key Pair.
* Interface function which calls the p256-m key generation function and * Interface function which calls the p256-m key generation function and
* places it in the key buffer provided by the caller (mbed TLS) in the * places it in the key buffer provided by the caller (Mbed TLS) in the
* correct format. For a SECP256R1 curve this is the 32 bit private key. * correct format. For a SECP256R1 curve this is the 32 bit private key.
* *
* \param[in] attributes The attributes of the key to use for the * \param[in] attributes The attributes of the key to use for the

12
CMakeLists.txt
View file

@ -34,14 +34,14 @@ cmake_policy(SET CMP0011 NEW)
cmake_policy(SET CMP0012 NEW) cmake_policy(SET CMP0012 NEW)
if(TEST_CPP) if(TEST_CPP)
project("mbed TLS" LANGUAGES C CXX) project("Mbed TLS" LANGUAGES C CXX)
else() else()
project("mbed TLS" LANGUAGES C) project("Mbed TLS" LANGUAGES C)
endif() endif()
include(GNUInstallDirs) include(GNUInstallDirs)
# Determine if mbed TLS is being built as a subproject using add_subdirectory() # Determine if Mbed TLS is being built as a subproject using add_subdirectory()
if(NOT DEFINED MBEDTLS_AS_SUBPROJECT) if(NOT DEFINED MBEDTLS_AS_SUBPROJECT)
set(MBEDTLS_AS_SUBPROJECT ON) set(MBEDTLS_AS_SUBPROJECT ON)
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@ -52,7 +52,7 @@ endif()
# Set the project root directory. # Set the project root directory.
set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
option(ENABLE_PROGRAMS "Build mbed TLS programs." ON) option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON)
option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF) option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF)
option(MBEDTLS_FATAL_WARNINGS "Compiler warnings treated as errors" ON) option(MBEDTLS_FATAL_WARNINGS "Compiler warnings treated as errors" ON)
@ -71,9 +71,9 @@ string(REGEX MATCH "MSVC" CMAKE_COMPILER_IS_MSVC "${CMAKE_C_COMPILER_ID}")
# the test suites currently have compile errors with MSVC # the test suites currently have compile errors with MSVC
if(CMAKE_COMPILER_IS_MSVC) if(CMAKE_COMPILER_IS_MSVC)
option(ENABLE_TESTING "Build mbed TLS tests." OFF) option(ENABLE_TESTING "Build Mbed TLS tests." OFF)
else() else()
option(ENABLE_TESTING "Build mbed TLS tests." ON) option(ENABLE_TESTING "Build Mbed TLS tests." ON)
endif() endif()
# Warning string - created as a list for compatibility with CMake 2.8 # Warning string - created as a list for compatibility with CMake 2.8

2
DartConfiguration.tcl
View file

@ -1,4 +1,4 @@
Site: localhost Site: localhost
BuildName: mbed TLS-test BuildName: Mbed TLS-test
CoverageCommand: /usr/bin/gcov CoverageCommand: /usr/bin/gcov
MemoryCheckCommand: /usr/bin/valgrind MemoryCheckCommand: /usr/bin/valgrind

2
configs/README.txt
View file

@ -21,4 +21,4 @@ them, you can pick one of the following methods:
make make
Note that the second method also works if you want to keep your custom Note that the second method also works if you want to keep your custom
configuration file outside the mbed TLS tree. configuration file outside the Mbed TLS tree.

4
configs/config-no-entropy.h
View file

@ -33,7 +33,7 @@
#define MBEDTLS_HAVE_ASM #define MBEDTLS_HAVE_ASM
#define MBEDTLS_HAVE_TIME #define MBEDTLS_HAVE_TIME
/* mbed TLS feature support */ /* Mbed TLS feature support */
#define MBEDTLS_CIPHER_MODE_CBC #define MBEDTLS_CIPHER_MODE_CBC
#define MBEDTLS_CIPHER_PADDING_PKCS7 #define MBEDTLS_CIPHER_PADDING_PKCS7
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
@ -47,7 +47,7 @@
#define MBEDTLS_SELF_TEST #define MBEDTLS_SELF_TEST
#define MBEDTLS_VERSION_FEATURES #define MBEDTLS_VERSION_FEATURES
/* mbed TLS modules */ /* Mbed TLS modules */
#define MBEDTLS_AES_C #define MBEDTLS_AES_C
#define MBEDTLS_ASN1_PARSE_C #define MBEDTLS_ASN1_PARSE_C
#define MBEDTLS_ASN1_WRITE_C #define MBEDTLS_ASN1_WRITE_C

4
configs/config-suite-b.h
View file

@ -37,13 +37,13 @@
#define MBEDTLS_HAVE_ASM #define MBEDTLS_HAVE_ASM
#define MBEDTLS_HAVE_TIME #define MBEDTLS_HAVE_TIME
/* mbed TLS feature support */ /* Mbed TLS feature support */
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
#define MBEDTLS_ECP_DP_SECP384R1_ENABLED #define MBEDTLS_ECP_DP_SECP384R1_ENABLED
#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED #define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
#define MBEDTLS_SSL_PROTO_TLS1_2 #define MBEDTLS_SSL_PROTO_TLS1_2
/* mbed TLS modules */ /* Mbed TLS modules */
#define MBEDTLS_AES_C #define MBEDTLS_AES_C
#define MBEDTLS_ASN1_PARSE_C #define MBEDTLS_ASN1_PARSE_C
#define MBEDTLS_ASN1_WRITE_C #define MBEDTLS_ASN1_WRITE_C

4
configs/config-thread.h
View file

@ -35,7 +35,7 @@
/* System support */ /* System support */
#define MBEDTLS_HAVE_ASM #define MBEDTLS_HAVE_ASM
/* mbed TLS feature support */ /* Mbed TLS feature support */
#define MBEDTLS_AES_ROM_TABLES #define MBEDTLS_AES_ROM_TABLES
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED #define MBEDTLS_ECP_DP_SECP256R1_ENABLED
#define MBEDTLS_ECP_NIST_OPTIM #define MBEDTLS_ECP_NIST_OPTIM
@ -46,7 +46,7 @@
#define MBEDTLS_SSL_DTLS_ANTI_REPLAY #define MBEDTLS_SSL_DTLS_ANTI_REPLAY
#define MBEDTLS_SSL_DTLS_HELLO_VERIFY #define MBEDTLS_SSL_DTLS_HELLO_VERIFY
/* mbed TLS modules */ /* Mbed TLS modules */
#define MBEDTLS_AES_C #define MBEDTLS_AES_C
#define MBEDTLS_ASN1_PARSE_C #define MBEDTLS_ASN1_PARSE_C
#define MBEDTLS_ASN1_WRITE_C #define MBEDTLS_ASN1_WRITE_C

2
doxygen/mbedtls.doxyfile
View file

@ -1,4 +1,4 @@
PROJECT_NAME = "mbed TLS v3.4.1" PROJECT_NAME = "Mbed TLS v3.4.1"
OUTPUT_DIRECTORY = ../apidoc/ OUTPUT_DIRECTORY = ../apidoc/
FULL_PATH_NAMES = NO FULL_PATH_NAMES = NO
OPTIMIZE_OUTPUT_FOR_C = YES OPTIMIZE_OUTPUT_FOR_C = YES

2
include/CMakeLists.txt
View file

@ -1,4 +1,4 @@
option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON) option(INSTALL_MBEDTLS_HEADERS "Install Mbed TLS headers." ON)
if(INSTALL_MBEDTLS_HEADERS) if(INSTALL_MBEDTLS_HEADERS)

2
include/mbedtls/build_info.h
View file

@ -47,7 +47,7 @@
*/ */
#define MBEDTLS_VERSION_NUMBER 0x03040100 #define MBEDTLS_VERSION_NUMBER 0x03040100
#define MBEDTLS_VERSION_STRING "3.4.1" #define MBEDTLS_VERSION_STRING "3.4.1"
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 3.4.1" #define MBEDTLS_VERSION_STRING_FULL "Mbed TLS 3.4.1"
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE) #if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
#define _CRT_SECURE_NO_DEPRECATE 1 #define _CRT_SECURE_NO_DEPRECATE 1

2
include/mbedtls/check_config.h
View file

@ -30,7 +30,7 @@
*/ */
#include <limits.h> #include <limits.h>
#if CHAR_BIT != 8 #if CHAR_BIT != 8
#error "mbed TLS requires a platform with 8-bit chars" #error "Mbed TLS requires a platform with 8-bit chars"
#endif #endif
#include <stdint.h> #include <stdint.h>

2
include/mbedtls/ecp.h
View file

@ -175,7 +175,7 @@ mbedtls_ecp_point;
#if !defined(MBEDTLS_ECP_ALT) #if !defined(MBEDTLS_ECP_ALT)
/* /*
* default mbed TLS elliptic curve arithmetic implementation * default Mbed TLS elliptic curve arithmetic implementation
* *
* (in case MBEDTLS_ECP_ALT is defined then the developer has to provide an * (in case MBEDTLS_ECP_ALT is defined then the developer has to provide an
* alternative implementation for the whole module and it will replace this * alternative implementation for the whole module and it will replace this

2
include/mbedtls/error.h
View file

@ -166,7 +166,7 @@ static inline int mbedtls_error_add(int high, int low,
} }
/** /**
* \brief Translate a mbed TLS 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 * Result is truncated if necessary and always includes a terminating
* null byte. * null byte.
* *

44
include/mbedtls/mbedtls_config.h
View file

@ -168,7 +168,7 @@
* *
* Enable the memory allocation layer. * Enable the memory allocation layer.
* *
* By default mbed TLS uses the system-provided calloc() and free(). * By default Mbed TLS uses the system-provided calloc() and free().
* This allows different allocators (self-implemented or provided) to be * This allows different allocators (self-implemented or provided) to be
* provided to the platform abstraction layer. * provided to the platform abstraction layer.
* *
@ -241,10 +241,10 @@
/** /**
* \def MBEDTLS_PLATFORM_EXIT_ALT * \def MBEDTLS_PLATFORM_EXIT_ALT
* *
* MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the * MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let Mbed TLS support the
* function in the platform abstraction layer. * function in the platform abstraction layer.
* *
* Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will * Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, Mbed TLS will
* provide a function "mbedtls_platform_set_printf()" that allows you to set an * provide a function "mbedtls_platform_set_printf()" that allows you to set an
* alternative printf function pointer. * alternative printf function pointer.
* *
@ -344,7 +344,7 @@
/** \} name SECTION: System support */ /** \} name SECTION: System support */
/** /**
* \name SECTION: mbed TLS feature support * \name SECTION: Mbed TLS feature support
* *
* This section sets support for features that are or are not needed * This section sets support for features that are or are not needed
* within the modules that are enabled. * within the modules that are enabled.
@ -367,7 +367,7 @@
/** /**
* \def MBEDTLS_AES_ALT * \def MBEDTLS_AES_ALT
* *
* MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your * MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let Mbed TLS use your
* alternate core implementation of a symmetric crypto, an arithmetic or hash * alternate core implementation of a symmetric crypto, an arithmetic or hash
* module (e.g. platform specific assembly optimized implementations). Keep * module (e.g. platform specific assembly optimized implementations). Keep
* in mind that the function prototypes should remain the same. * in mind that the function prototypes should remain the same.
@ -375,7 +375,7 @@
* This replaces the whole module. If you only want to replace one of the * This replaces the whole module. If you only want to replace one of the
* functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags. * functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
* *
* Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer * Example: In case you uncomment MBEDTLS_AES_ALT, Mbed TLS will no longer
* provide the "struct mbedtls_aes_context" definition and omit the base * provide the "struct mbedtls_aes_context" definition and omit the base
* function declarations and implementations. "aes_alt.h" will be included from * function declarations and implementations. "aes_alt.h" will be included from
* "aes.h" to include the new function definitions. * "aes.h" to include the new function definitions.
@ -423,14 +423,14 @@
/** /**
* \def MBEDTLS_SHA256_PROCESS_ALT * \def MBEDTLS_SHA256_PROCESS_ALT
* *
* MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you * MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let Mbed TLS use you
* alternate core implementation of symmetric crypto or hash function. Keep in * alternate core implementation of symmetric crypto or hash function. Keep in
* mind that function prototypes should remain the same. * mind that function prototypes should remain the same.
* *
* This replaces only one function. The header file from mbed TLS is still * This replaces only one function. The header file from Mbed TLS is still
* used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags. * used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
* *
* Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will * Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, Mbed TLS will
* no longer provide the mbedtls_sha1_process() function, but it will still provide * no longer provide the mbedtls_sha1_process() function, but it will still provide
* the other function (using your mbedtls_sha1_process() function) and the definition * the other function (using your mbedtls_sha1_process() function) and the definition
* of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible * of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
@ -480,11 +480,11 @@
* *
* Expose a part of the internal interface of the Elliptic Curve Point module. * Expose a part of the internal interface of the Elliptic Curve Point module.
* *
* MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your * MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let Mbed TLS use your
* alternative core implementation of elliptic curve arithmetic. Keep in mind * alternative core implementation of elliptic curve arithmetic. Keep in mind
* that function prototypes should remain the same. * that function prototypes should remain the same.
* *
* This partially replaces one function. The header file from mbed TLS is still * This partially replaces one function. The header file from Mbed TLS is still
* used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation * used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
* is still present and it is used for group structures not supported by the * is still present and it is used for group structures not supported by the
* alternative. * alternative.
@ -508,11 +508,11 @@
* implement optimized set up and tear down instructions. * implement optimized set up and tear down instructions.
* *
* Example: In case you set MBEDTLS_ECP_INTERNAL_ALT and * Example: In case you set MBEDTLS_ECP_INTERNAL_ALT and
* MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac() * MBEDTLS_ECP_DOUBLE_JAC_ALT, Mbed TLS will still provide the ecp_double_jac()
* function, but will use your mbedtls_internal_ecp_double_jac() if the group * function, but will use your mbedtls_internal_ecp_double_jac() if the group
* for the operation is supported by your implementation (i.e. your * for the operation is supported by your implementation (i.e. your
* mbedtls_internal_ecp_grp_capable() function returns 1 for this group). If the * mbedtls_internal_ecp_grp_capable() function returns 1 for this group). If the
* group is not supported by your implementation, then the original mbed TLS * group is not supported by your implementation, then the original Mbed TLS
* implementation of ecp_double_jac() is used instead, unless this fallback * implementation of ecp_double_jac() is used instead, unless this fallback
* behaviour is disabled by setting MBEDTLS_ECP_NO_FALLBACK (in which case * behaviour is disabled by setting MBEDTLS_ECP_NO_FALLBACK (in which case
* ecp_double_jac() will return MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE). * ecp_double_jac() will return MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE).
@ -543,7 +543,7 @@
/** /**
* \def MBEDTLS_ENTROPY_HARDWARE_ALT * \def MBEDTLS_ENTROPY_HARDWARE_ALT
* *
* Uncomment this macro to let mbed TLS use your own implementation of a * Uncomment this macro to let Mbed TLS use your own implementation of a
* hardware entropy collector. * hardware entropy collector.
* *
* Your function must be called \c mbedtls_hardware_poll(), have the same * Your function must be called \c mbedtls_hardware_poll(), have the same
@ -1491,7 +1491,7 @@
* \def MBEDTLS_SSL_ALL_ALERT_MESSAGES * \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
* *
* Enable sending of alert messages in case of encountered errors as per RFC. * Enable sending of alert messages in case of encountered errors as per RFC.
* If you choose not to send the alert messages, mbed TLS 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. * with other servers, only debugging of failures is harder.
* *
* The advantage of not sending alert messages, is that no information is given * The advantage of not sending alert messages, is that no information is given
@ -2181,12 +2181,12 @@
* Comment this macro to disallow using RSASSA-PSS in certificates. * Comment this macro to disallow using RSASSA-PSS in certificates.
*/ */
#define MBEDTLS_X509_RSASSA_PSS_SUPPORT #define MBEDTLS_X509_RSASSA_PSS_SUPPORT
/** \} name SECTION: mbed TLS feature support */ /** \} name SECTION: Mbed TLS feature support */
/** /**
* \name SECTION: mbed TLS modules * \name SECTION: Mbed TLS modules
* *
* This section enables or disables entire modules in mbed TLS * This section enables or disables entire modules in Mbed TLS
* \{ * \{
*/ */
@ -2882,7 +2882,7 @@
* Module: library/memory_buffer_alloc.c * Module: library/memory_buffer_alloc.c
* *
* Requires: MBEDTLS_PLATFORM_C * Requires: MBEDTLS_PLATFORM_C
* MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS) * MBEDTLS_PLATFORM_MEMORY (to use it within Mbed TLS)
* *
* Enable this module to enable the buffer memory allocator. * Enable this module to enable the buffer memory allocator.
*/ */
@ -3484,7 +3484,7 @@
* \def MBEDTLS_THREADING_C * \def MBEDTLS_THREADING_C
* *
* Enable the threading abstraction layer. * Enable the threading abstraction layer.
* By default mbed TLS 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 * 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 * between threads, you will need to enable this layer to prevent race
* conditions. See also our Knowledge Base article about threading: * conditions. See also our Knowledge Base article about threading:
@ -3498,7 +3498,7 @@
* You will have to enable either MBEDTLS_THREADING_ALT or * You will have to enable either MBEDTLS_THREADING_ALT or
* MBEDTLS_THREADING_PTHREAD. * MBEDTLS_THREADING_PTHREAD.
* *
* Enable this layer to allow use of mutexes within mbed TLS * Enable this layer to allow use of mutexes within Mbed TLS
*/ */
//#define MBEDTLS_THREADING_C //#define MBEDTLS_THREADING_C
@ -3644,7 +3644,7 @@
*/ */
#define MBEDTLS_X509_CSR_WRITE_C #define MBEDTLS_X509_CSR_WRITE_C
/** \} name SECTION: mbed TLS modules */ /** \} name SECTION: Mbed TLS modules */
/** /**
* \name SECTION: General configuration options * \name SECTION: General configuration options

2
include/mbedtls/platform_time.h
View file

@ -1,7 +1,7 @@
/** /**
* \file platform_time.h * \file platform_time.h
* *
* \brief mbed TLS Platform time abstraction * \brief Mbed TLS Platform time abstraction
*/ */
/* /*
* Copyright The Mbed TLS Contributors * Copyright The Mbed TLS Contributors

2
include/mbedtls/ssl_ciphersuites.h
View file

@ -1,7 +1,7 @@
/** /**
* \file ssl_ciphersuites.h * \file ssl_ciphersuites.h
* *
* \brief SSL Ciphersuites for mbed TLS * \brief SSL Ciphersuites for Mbed TLS
*/ */
/* /*
* Copyright The Mbed TLS Contributors * Copyright The Mbed TLS Contributors

4
include/mbedtls/threading.h
View file

@ -55,9 +55,9 @@ typedef struct mbedtls_threading_mutex_t {
* \brief Set your alternate threading implementation function * \brief Set your alternate threading implementation function
* pointers and initialize global mutexes. If used, this * pointers and initialize global mutexes. If used, this
* function must be called once in the main thread before any * function must be called once in the main thread before any
* other mbed TLS function is called, and * other Mbed TLS function is called, and
* mbedtls_threading_free_alt() must be called once in the main * mbedtls_threading_free_alt() must be called once in the main
* thread after all other mbed TLS functions. * thread after all other Mbed TLS functions.
* *
* \note mutex_init() and mutex_free() don't return a status code. * \note mutex_init() and mutex_free() don't return a status code.
* If mutex_init() fails, it should leave its argument (the * If mutex_init() fails, it should leave its argument (the

8
include/mbedtls/version.h
View file

@ -52,9 +52,9 @@ unsigned int mbedtls_version_get_number(void);
void mbedtls_version_get_string(char *string); void mbedtls_version_get_string(char *string);
/** /**
* Get the full version string ("mbed TLS x.y.z"). * Get the full version string ("Mbed TLS x.y.z").
* *
* \param string The string that will receive the value. The mbed TLS version * \param string The string that will receive the value. The Mbed TLS version
* string will use 18 bytes AT MOST including a terminating * string will use 18 bytes AT MOST including a terminating
* null byte. * null byte.
* (So the buffer should be at least 18 bytes to receive this * (So the buffer should be at least 18 bytes to receive this
@ -64,12 +64,12 @@ void mbedtls_version_get_string_full(char *string);
/** /**
* \brief Check if support for a feature was compiled into this * \brief Check if support for a feature was compiled into this
* mbed TLS 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 * library was for instance compiled with or without
* Multi-threading support. * Multi-threading support.
* *
* \note only checks against defines in the sections "System * \note only checks against defines in the sections "System
* support", "mbed TLS modules" and "mbed TLS feature * support", "Mbed TLS modules" and "Mbed TLS feature
* support" in mbedtls_config.h * support" in mbedtls_config.h
* *
* \param feature The string for the define to check (e.g. "MBEDTLS_AES_C") * \param feature The string for the define to check (e.g. "MBEDTLS_AES_C")

4
include/mbedtls/x509_crt.h
View file

@ -1007,7 +1007,7 @@ int mbedtls_x509write_crt_set_validity(mbedtls_x509write_cert *ctx, const char *
* \brief Set the issuer name for a Certificate * \brief Set the issuer name for a Certificate
* Issuer names should contain a comma-separated list * Issuer names should contain a comma-separated list
* of OID types and values: * of OID types and values:
* e.g. "C=UK,O=ARM,CN=mbed TLS CA" * e.g. "C=UK,O=ARM,CN=Mbed TLS CA"
* *
* \param ctx CRT context to use * \param ctx CRT context to use
* \param issuer_name issuer name to set * \param issuer_name issuer name to set
@ -1022,7 +1022,7 @@ int mbedtls_x509write_crt_set_issuer_name(mbedtls_x509write_cert *ctx,
* \brief Set the subject name for a Certificate * \brief Set the subject name for a Certificate
* Subject names should contain a comma-separated list * Subject names should contain a comma-separated list
* of OID types and values: * of OID types and values:
* e.g. "C=UK,O=ARM,CN=mbed TLS Server 1" * e.g. "C=UK,O=ARM,CN=Mbed TLS Server 1"
* *
* \param ctx CRT context to use * \param ctx CRT context to use
* \param subject_name subject name to set * \param subject_name subject name to set

2
include/mbedtls/x509_csr.h
View file

@ -180,7 +180,7 @@ void mbedtls_x509write_csr_init(mbedtls_x509write_csr *ctx);
* \brief Set the subject name for a CSR * \brief Set the subject name for a CSR
* Subject names should contain a comma-separated list * Subject names should contain a comma-separated list
* of OID types and values: * of OID types and values:
* e.g. "C=UK,O=ARM,CN=mbed TLS Server 1" * e.g. "C=UK,O=ARM,CN=Mbed TLS Server 1"
* *
* \param ctx CSR context to use * \param ctx CSR context to use
* \param subject_name subject name to set * \param subject_name subject name to set

8
library/CMakeLists.txt
View file

@ -1,7 +1,7 @@
option(USE_STATIC_MBEDTLS_LIBRARY "Build mbed TLS static library." ON) option(USE_STATIC_MBEDTLS_LIBRARY "Build Mbed TLS static library." ON)
option(USE_SHARED_MBEDTLS_LIBRARY "Build mbed TLS shared library." OFF) option(USE_SHARED_MBEDTLS_LIBRARY "Build Mbed TLS shared library." OFF)
option(LINK_WITH_PTHREAD "Explicitly link mbed TLS library to pthread." OFF) option(LINK_WITH_PTHREAD "Explicitly link Mbed TLS library to pthread." OFF)
option(LINK_WITH_TRUSTED_STORAGE "Explicitly link mbed TLS library to trusted_storage." OFF) option(LINK_WITH_TRUSTED_STORAGE "Explicitly link Mbed TLS library to trusted_storage." OFF)
# Set the project root directory if it's not already defined, as may happen if # Set the project root directory if it's not already defined, as may happen if
# the library folder is included directly by a parent project, without # the library folder is included directly by a parent project, without

2
library/cipher.c
View file

@ -1,7 +1,7 @@
/** /**
* \file cipher.c * \file cipher.c
* *
* \brief Generic cipher wrapper for mbed TLS * \brief Generic cipher wrapper for Mbed TLS
* *
* \author Adriaan de Jong <dejong@fox-it.com> * \author Adriaan de Jong <dejong@fox-it.com>
* *

2
library/cipher_wrap.c
View file

@ -1,7 +1,7 @@
/** /**
* \file cipher_wrap.c * \file cipher_wrap.c
* *
* \brief Generic cipher wrapper for mbed TLS * \brief Generic cipher wrapper for Mbed TLS
* *
* \author Adriaan de Jong <dejong@fox-it.com> * \author Adriaan de Jong <dejong@fox-it.com>
* *

2
library/ecjpake.c
View file

@ -1131,7 +1131,7 @@ int mbedtls_ecjpake_self_test(int verbose)
#if !defined(MBEDTLS_ECJPAKE_ALT) #if !defined(MBEDTLS_ECJPAKE_ALT)
/* 'reference handshake' tests can only be run against implementations /* 'reference handshake' tests can only be run against implementations
* for which we have 100% control over how the random ephemeral keys * for which we have 100% control over how the random ephemeral keys
* are generated. This is only the case for the internal mbed TLS * are generated. This is only the case for the internal Mbed TLS
* implementation, so these tests are skipped in case the internal * implementation, so these tests are skipped in case the internal
* implementation is swapped out for an alternative one. */ * implementation is swapped out for an alternative one. */
if (verbose != 0) { if (verbose != 0) {

2
library/entropy_poll.h
View file

@ -50,7 +50,7 @@ int mbedtls_platform_entropy_poll(void *data,
/** /**
* \brief Entropy poll callback for a hardware source * \brief Entropy poll callback for a hardware source
* *
* \warning This is not provided by mbed TLS! * \warning This is not provided by Mbed TLS!
* See \c MBEDTLS_ENTROPY_HARDWARE_ALT in mbedtls_config.h. * See \c MBEDTLS_ENTROPY_HARDWARE_ALT in mbedtls_config.h.
* *
* \note This must accept NULL as its first argument. * \note This must accept NULL as its first argument.

2
library/md.c
View file

@ -1,7 +1,7 @@
/** /**
* \file md.c * \file md.c
* *
* \brief Generic message digest wrapper for mbed TLS * \brief Generic message digest wrapper for Mbed TLS
* *
* \author Adriaan de Jong <dejong@fox-it.com> * \author Adriaan de Jong <dejong@fox-it.com>
* *

2
library/mps_common.h
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
/** /**

2
library/mps_error.h
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
/** /**

2
library/mps_reader.h
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
/** /**

2
library/mps_trace.h
View file

@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS (https://tls.mbed.org) * This file is part of Mbed TLS (https://tls.mbed.org)
*/ */
/** /**

4
library/psa_crypto_core.h
View file

@ -225,12 +225,12 @@ psa_status_t psa_copy_key_material_into_slot(psa_key_slot_t *slot,
const uint8_t *data, const uint8_t *data,
size_t data_length); size_t data_length);
/** Convert an mbed TLS error code to a PSA error code /** Convert an Mbed TLS error code to a PSA error code
* *
* \note This function is provided solely for the convenience of * \note This function is provided solely for the convenience of
* Mbed TLS and may be removed at any time without notice. * Mbed TLS and may be removed at any time without notice.
* *
* \param ret An mbed TLS-thrown error code * \param ret An Mbed TLS-thrown error code
* *
* \return The corresponding PSA error code * \return The corresponding PSA error code
*/ */

2
library/ssl_ciphersuites.c
View file

@ -1,7 +1,7 @@
/** /**
* \file ssl_ciphersuites.c * \file ssl_ciphersuites.c
* *
* \brief SSL ciphersuites for mbed TLS * \brief SSL ciphersuites for Mbed TLS
* *
* Copyright The Mbed TLS Contributors * Copyright The Mbed TLS Contributors
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0

2
library/ssl_client.c
View file

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS ( https://tls.mbed.org ) * This file is part of Mbed TLS ( https://tls.mbed.org )
*/ */
#include "common.h" #include "common.h"

2
library/ssl_tls13_client.c
View file

@ -16,7 +16,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
* *
* This file is part of mbed TLS ( https://tls.mbed.org ) * This file is part of Mbed TLS ( https://tls.mbed.org )
*/ */
#include "common.h" #include "common.h"

2
programs/ssl/ssl_fork_server.c
View file

@ -65,7 +65,7 @@ int main(void)
#define HTTP_RESPONSE \ #define HTTP_RESPONSE \
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \ "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \
"<h2>mbed TLS Test Server</h2>\r\n" \ "<h2>Mbed TLS Test Server</h2>\r\n" \
"<p>Successful connection using: %s</p>\r\n" "<p>Successful connection using: %s</p>\r\n"
#define DEBUG_LEVEL 0 #define DEBUG_LEVEL 0

4
programs/ssl/ssl_mail_client.c
View file

@ -775,9 +775,9 @@ usage:
mbedtls_printf(" > Write content to server:"); mbedtls_printf(" > Write content to server:");
fflush(stdout); fflush(stdout);
len = sprintf((char *) buf, "From: %s\r\nSubject: mbed TLS Test mail\r\n\r\n" len = sprintf((char *) buf, "From: %s\r\nSubject: Mbed TLS Test mail\r\n\r\n"
"This is a simple test mail from the " "This is a simple test mail from the "
"mbed TLS mail client example.\r\n" "Mbed TLS mail client example.\r\n"
"\r\n" "\r\n"
"Enjoy!", opt.mail_from); "Enjoy!", opt.mail_from);
ret = write_ssl_data(&ssl, buf, len); ret = write_ssl_data(&ssl, buf, len);

2
programs/ssl/ssl_pthread_server.c
View file

@ -66,7 +66,7 @@ int main(void)
#define HTTP_RESPONSE \ #define HTTP_RESPONSE \
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \ "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \
"<h2>mbed TLS Test Server</h2>\r\n" \ "<h2>Mbed TLS Test Server</h2>\r\n" \
"<p>Successful connection using: %s</p>\r\n" "<p>Successful connection using: %s</p>\r\n"
#define DEBUG_LEVEL 0 #define DEBUG_LEVEL 0

2
programs/ssl/ssl_server.c
View file

@ -59,7 +59,7 @@ int main(void)
#define HTTP_RESPONSE \ #define HTTP_RESPONSE \
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \ "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \
"<h2>mbed TLS Test Server</h2>\r\n" \ "<h2>Mbed TLS Test Server</h2>\r\n" \
"<p>Successful connection using: %s</p>\r\n" "<p>Successful connection using: %s</p>\r\n"
#define DEBUG_LEVEL 0 #define DEBUG_LEVEL 0

2
programs/ssl/ssl_server2.c
View file

@ -173,7 +173,7 @@ int main(void)
* packets (for fragmentation purposes) */ * packets (for fragmentation purposes) */
#define HTTP_RESPONSE \ #define HTTP_RESPONSE \
"HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \ "HTTP/1.0 200 OK\r\nContent-Type: text/html\r\n\r\n" \
"<h2>mbed TLS Test Server</h2>\r\n" \ "<h2>Mbed TLS Test Server</h2>\r\n" \
"<p>Successful connection using: %s</p>\r\n" // LONG_RESPONSE "<p>Successful connection using: %s</p>\r\n" // LONG_RESPONSE
/* /*

2
scripts/bump_version.sh
View file

@ -131,7 +131,7 @@ cat include/mbedtls/build_info.h | \
sed -e "s/\(# *define *[A-Z]*_VERSION\)_PATCH .\{1,\}/\1_PATCH $PATCH/" | \ sed -e "s/\(# *define *[A-Z]*_VERSION\)_PATCH .\{1,\}/\1_PATCH $PATCH/" | \
sed -e "s/\(# *define *[A-Z]*_VERSION\)_NUMBER .\{1,\}/\1_NUMBER $VERSION_NR/" | \ sed -e "s/\(# *define *[A-Z]*_VERSION\)_NUMBER .\{1,\}/\1_NUMBER $VERSION_NR/" | \
sed -e "s/\(# *define *[A-Z]*_VERSION\)_STRING .\{1,\}/\1_STRING \"$VERSION\"/" | \ sed -e "s/\(# *define *[A-Z]*_VERSION\)_STRING .\{1,\}/\1_STRING \"$VERSION\"/" | \
sed -e "s/\(# *define *[A-Z]*_VERSION\)_STRING_FULL .\{1,\}/\1_STRING_FULL \"mbed TLS $VERSION\"/" \ sed -e "s/\(# *define *[A-Z]*_VERSION\)_STRING_FULL .\{1,\}/\1_STRING_FULL \"Mbed TLS $VERSION\"/" \
> tmp > tmp
mv tmp include/mbedtls/build_info.h mv tmp include/mbedtls/build_info.h

4
scripts/footprint.sh
View file

@ -17,7 +17,7 @@
# #
# Purpose # Purpose
# #
# This script determines ROM size (or code size) for the standard mbed TLS # This script determines ROM size (or code size) for the standard Mbed TLS
# configurations, when built for a Cortex M3/M4 target. # configurations, when built for a Cortex M3/M4 target.
# #
# Configurations included: # Configurations included:
@ -108,7 +108,7 @@ else
fi fi
log "" log ""
log "mbed TLS $MBEDTLS_VERSION$GIT_VERSION" log "Mbed TLS $MBEDTLS_VERSION$GIT_VERSION"
log "$( arm-none-eabi-gcc --version | head -n1 )" log "$( arm-none-eabi-gcc --version | head -n1 )"
log "CFLAGS=$ARMGCC_FLAGS" log "CFLAGS=$ARMGCC_FLAGS"

4
scripts/generate_features.pl
View file

@ -39,8 +39,8 @@ if( @ARGV ) {
my $feature_format_file = $data_dir.'/version_features.fmt'; my $feature_format_file = $data_dir.'/version_features.fmt';
my @sections = ( "System support", "mbed TLS modules", my @sections = ( "System support", "Mbed TLS modules",
"mbed TLS feature support" ); "Mbed TLS feature support" );
my $line_separator = $/; my $line_separator = $/;
undef $/; undef $/;

2
scripts/lcov.sh
View file

@ -51,7 +51,7 @@ lcov_library_report () {
lcov --rc lcov_branch_coverage=1 --add-tracefile Coverage/tmp/files.info --add-tracefile Coverage/tmp/tests.info -o Coverage/tmp/all.info lcov --rc lcov_branch_coverage=1 --add-tracefile Coverage/tmp/files.info --add-tracefile Coverage/tmp/tests.info -o Coverage/tmp/all.info
lcov --rc lcov_branch_coverage=1 --remove Coverage/tmp/all.info -o Coverage/tmp/final.info '*.h' lcov --rc lcov_branch_coverage=1 --remove Coverage/tmp/all.info -o Coverage/tmp/final.info '*.h'
gendesc tests/Descriptions.txt -o Coverage/tmp/descriptions gendesc tests/Descriptions.txt -o Coverage/tmp/descriptions
genhtml --title "mbed TLS" --description-file Coverage/tmp/descriptions --keep-descriptions --legend --branch-coverage -o Coverage Coverage/tmp/final.info genhtml --title "Mbed TLS" --description-file Coverage/tmp/descriptions --keep-descriptions --legend --branch-coverage -o Coverage Coverage/tmp/final.info
rm -f Coverage/tmp/*.info Coverage/tmp/descriptions rm -f Coverage/tmp/*.info Coverage/tmp/descriptions
echo "Coverage report in: Coverage/index.html" echo "Coverage report in: Coverage/index.html"
} }

4
tests/compat.sh
View file

@ -262,7 +262,7 @@ filter_ciphersuites()
{ {
if [ "X" != "X$FILTER" -o "X" != "X$EXCLUDE" ]; if [ "X" != "X$FILTER" -o "X" != "X$EXCLUDE" ];
then then
# Ciphersuite for mbed TLS # Ciphersuite for Mbed TLS
M_CIPHERS=$( filter "$M_CIPHERS" ) M_CIPHERS=$( filter "$M_CIPHERS" )
# Ciphersuite for OpenSSL # Ciphersuite for OpenSSL
@ -272,7 +272,7 @@ filter_ciphersuites()
G_CIPHERS=$( filter "$G_CIPHERS" ) G_CIPHERS=$( filter "$G_CIPHERS" )
fi fi
# For GnuTLS client -> mbed TLS server, # For GnuTLS client -> Mbed TLS server,
# we need to force IPv4 by connecting to 127.0.0.1 but then auth fails # we need to force IPv4 by connecting to 127.0.0.1 but then auth fails
if is_dtls "$MODE" && [ "X$VERIFY" = "XYES" ]; then if is_dtls "$MODE" && [ "X$VERIFY" = "XYES" ]; then
G_CIPHERS="" G_CIPHERS=""

2
tests/scripts/basic-build-test.sh
View file

@ -43,7 +43,7 @@
set -eu set -eu
if [ -d library -a -d include -a -d tests ]; then :; else if [ -d library -a -d include -a -d tests ]; then :; else
echo "Must be run from mbed TLS root" >&2 echo "Must be run from Mbed TLS root" >&2
exit 1 exit 1
fi fi

2
tests/scripts/check-doxy-blocks.pl
View file

@ -68,7 +68,7 @@ sub check_dir {
# Check that the script is being run from the project's root directory. # Check that the script is being run from the project's root directory.
for my $dir (@directories) { for my $dir (@directories) {
if (! -d $dir) { if (! -d $dir) {
die "This script must be run from the mbed TLS root directory"; die "This script must be run from the Mbed TLS root directory";
} else { } else {
check_dir($dir) check_dir($dir)
} }

2
tests/scripts/check-generated-files.sh
View file

@ -35,7 +35,7 @@ EOF
fi fi
if [ -d library -a -d include -a -d tests ]; then :; else if [ -d library -a -d include -a -d tests ]; then :; else
echo "Must be run from mbed TLS root" >&2 echo "Must be run from Mbed TLS root" >&2
exit 1 exit 1
fi fi

2
tests/scripts/doxygen.sh
View file

@ -21,7 +21,7 @@
set -eu set -eu
if [ -d library -a -d include -a -d tests ]; then :; else if [ -d library -a -d include -a -d tests ]; then :; else
echo "Must be run from mbed TLS root" >&2 echo "Must be run from Mbed TLS root" >&2
exit 1 exit 1
fi fi

2
tests/scripts/generate-afl-tests.sh
View file

@ -41,7 +41,7 @@ THIS_DIR=$(basename $PWD)
if [ -d ../library -a -d ../include -a -d ../tests -a $THIS_DIR == "tests" ]; if [ -d ../library -a -d ../include -a -d ../tests -a $THIS_DIR == "tests" ];
then :; then :;
else else
echo " [!] Must be run from mbed TLS tests directory" >&2 echo " [!] Must be run from Mbed TLS tests directory" >&2
exit 1 exit 1
fi fi

2
tests/suites/test_suite_ecp.function
View file

@ -166,7 +166,7 @@ void ecp_test_vect_restart(int id,
* MBEDTLS_ECP_WINDOW_SIZE, as well as implementation details that may * MBEDTLS_ECP_WINDOW_SIZE, as well as implementation details that may
* change in the future. A factor 2 is a minimum safety margin. * change in the future. A factor 2 is a minimum safety margin.
* *
* For reference, with mbed TLS 2.4 and default settings, for P-256: * For reference, with Mbed TLS 2.4 and default settings, for P-256:
* - Random point mult: ~3250M * - Random point mult: ~3250M
* - Cold base point mult: ~3300M * - Cold base point mult: ~3300M
* - Hot base point mult: ~1100M * - Hot base point mult: ~1100M

4
tests/suites/test_suite_version.function
View file

@ -20,7 +20,7 @@ void check_compiletime_version(char *version_str)
mbedtls_snprintf(build_str, 100, "%d.%d.%d", MBEDTLS_VERSION_MAJOR, mbedtls_snprintf(build_str, 100, "%d.%d.%d", MBEDTLS_VERSION_MAJOR,
MBEDTLS_VERSION_MINOR, MBEDTLS_VERSION_PATCH); MBEDTLS_VERSION_MINOR, MBEDTLS_VERSION_PATCH);
mbedtls_snprintf(build_str_full, 100, "mbed TLS %d.%d.%d", MBEDTLS_VERSION_MAJOR, mbedtls_snprintf(build_str_full, 100, "Mbed TLS %d.%d.%d", MBEDTLS_VERSION_MAJOR,
MBEDTLS_VERSION_MINOR, MBEDTLS_VERSION_PATCH); MBEDTLS_VERSION_MINOR, MBEDTLS_VERSION_PATCH);
build_int = MBEDTLS_VERSION_MAJOR << 24 | build_int = MBEDTLS_VERSION_MAJOR << 24 |
@ -56,7 +56,7 @@ void check_runtime_version(char *version_str)
(get_int >> 24) & 0xFF, (get_int >> 24) & 0xFF,
(get_int >> 16) & 0xFF, (get_int >> 16) & 0xFF,
(get_int >> 8) & 0xFF); (get_int >> 8) & 0xFF);
mbedtls_snprintf(build_str_full, 100, "mbed TLS %s", version_str); mbedtls_snprintf(build_str_full, 100, "Mbed TLS %s", version_str);
TEST_ASSERT(strcmp(build_str, version_str) == 0); TEST_ASSERT(strcmp(build_str, version_str) == 0);
TEST_ASSERT(strcmp(build_str_full, get_str_full) == 0); TEST_ASSERT(strcmp(build_str_full, get_str_full) == 0);

2
tests/suites/test_suite_x509parse.function
View file

@ -619,7 +619,7 @@ void x509_verify_restart(char *crt_file, char *ca_file,
/* /*
* See comments on ecp_test_vect_restart() for op count precision. * See comments on ecp_test_vect_restart() for op count precision.
* *
* For reference, with mbed TLS 2.6 and default settings: * For reference, with Mbed TLS 2.6 and default settings:
* - ecdsa_verify() for P-256: ~ 6700 * - ecdsa_verify() for P-256: ~ 6700
* - ecdsa_verify() for P-384: ~ 18800 * - ecdsa_verify() for P-384: ~ 18800
* - x509_verify() for server5 -> test-ca2: ~ 18800 * - x509_verify() for server5 -> test-ca2: ~ 18800