Skip to content

Commit e820c0a

Browse files
Update spelling "mbed TLS" to "Mbed TLS"
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>
1 parent 4843278 commit e820c0a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+100
-100
lines changed

3rdparty/everest/include/everest/vs2013/inttypes.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* See the License for the specific language governing permissions and
1818
* limitations under the License.
1919
*
20-
* This file is part of mbed TLS (https://tls.mbed.org)
20+
* This file is part of Mbed TLS (https://tls.mbed.org)
2121
*/
2222

2323
#ifndef _INTTYPES_H_VS2010

3rdparty/everest/include/everest/vs2013/stdbool.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
* See the License for the specific language governing permissions and
1818
* limitations under the License.
1919
*
20-
* This file is part of mbed TLS (https://tls.mbed.org)
20+
* This file is part of Mbed TLS (https://tls.mbed.org)
2121
*/
2222

2323
#ifndef _STDBOOL_H_VS2010

3rdparty/everest/include/everest/x25519.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*
19-
* This file is part of mbed TLS (https://tls.mbed.org)
19+
* This file is part of Mbed TLS (https://tls.mbed.org)
2020
*/
2121

2222
#ifndef MBEDTLS_X25519_H

3rdparty/everest/library/Hacl_Curve25519_joined.c

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

3rdparty/everest/library/x25519.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
* See the License for the specific language governing permissions and
1717
* limitations under the License.
1818
*
19-
* This file is part of mbed TLS (https://tls.mbed.org)
19+
* This file is part of Mbed TLS (https://tls.mbed.org)
2020
*/
2121

2222
#include "common.h"

3rdparty/p256-m/p256-m_driver_entrypoints.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

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

CMakeLists.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,14 @@ cmake_policy(SET CMP0011 NEW)
3434
cmake_policy(SET CMP0012 NEW)
3535

3636
if(TEST_CPP)
37-
project("mbed TLS" LANGUAGES C CXX)
37+
project("Mbed TLS" LANGUAGES C CXX)
3838
else()
39-
project("mbed TLS" LANGUAGES C)
39+
project("Mbed TLS" LANGUAGES C)
4040
endif()
4141

4242
include(GNUInstallDirs)
4343

44-
# Determine if mbed TLS is being built as a subproject using add_subdirectory()
44+
# Determine if Mbed TLS is being built as a subproject using add_subdirectory()
4545
if(NOT DEFINED MBEDTLS_AS_SUBPROJECT)
4646
set(MBEDTLS_AS_SUBPROJECT ON)
4747
if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
@@ -52,7 +52,7 @@ endif()
5252
# Set the project root directory.
5353
set(MBEDTLS_DIR ${CMAKE_CURRENT_SOURCE_DIR})
5454

55-
option(ENABLE_PROGRAMS "Build mbed TLS programs." ON)
55+
option(ENABLE_PROGRAMS "Build Mbed TLS programs." ON)
5656

5757
option(UNSAFE_BUILD "Allow unsafe builds. These builds ARE NOT SECURE." OFF)
5858
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}")
7171

7272
# the test suites currently have compile errors with MSVC
7373
if(CMAKE_COMPILER_IS_MSVC)
74-
option(ENABLE_TESTING "Build mbed TLS tests." OFF)
74+
option(ENABLE_TESTING "Build Mbed TLS tests." OFF)
7575
else()
76-
option(ENABLE_TESTING "Build mbed TLS tests." ON)
76+
option(ENABLE_TESTING "Build Mbed TLS tests." ON)
7777
endif()
7878

7979
# Warning string - created as a list for compatibility with CMake 2.8

DartConfiguration.tcl

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
Site: localhost
2-
BuildName: mbed TLS-test
2+
BuildName: Mbed TLS-test
33
CoverageCommand: /usr/bin/gcov
44
MemoryCheckCommand: /usr/bin/valgrind

configs/README.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ them, you can pick one of the following methods:
2121
make
2222

2323
Note that the second method also works if you want to keep your custom
24-
configuration file outside the mbed TLS tree.
24+
configuration file outside the Mbed TLS tree.

configs/config-no-entropy.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#define MBEDTLS_HAVE_ASM
3434
#define MBEDTLS_HAVE_TIME
3535

36-
/* mbed TLS feature support */
36+
/* Mbed TLS feature support */
3737
#define MBEDTLS_CIPHER_MODE_CBC
3838
#define MBEDTLS_CIPHER_PADDING_PKCS7
3939
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
@@ -47,7 +47,7 @@
4747
#define MBEDTLS_SELF_TEST
4848
#define MBEDTLS_VERSION_FEATURES
4949

50-
/* mbed TLS modules */
50+
/* Mbed TLS modules */
5151
#define MBEDTLS_AES_C
5252
#define MBEDTLS_ASN1_PARSE_C
5353
#define MBEDTLS_ASN1_WRITE_C

configs/config-suite-b.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,13 @@
3737
#define MBEDTLS_HAVE_ASM
3838
#define MBEDTLS_HAVE_TIME
3939

40-
/* mbed TLS feature support */
40+
/* Mbed TLS feature support */
4141
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
4242
#define MBEDTLS_ECP_DP_SECP384R1_ENABLED
4343
#define MBEDTLS_KEY_EXCHANGE_ECDHE_ECDSA_ENABLED
4444
#define MBEDTLS_SSL_PROTO_TLS1_2
4545

46-
/* mbed TLS modules */
46+
/* Mbed TLS modules */
4747
#define MBEDTLS_AES_C
4848
#define MBEDTLS_ASN1_PARSE_C
4949
#define MBEDTLS_ASN1_WRITE_C

configs/config-thread.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
/* System support */
3636
#define MBEDTLS_HAVE_ASM
3737

38-
/* mbed TLS feature support */
38+
/* Mbed TLS feature support */
3939
#define MBEDTLS_AES_ROM_TABLES
4040
#define MBEDTLS_ECP_DP_SECP256R1_ENABLED
4141
#define MBEDTLS_ECP_NIST_OPTIM
@@ -46,7 +46,7 @@
4646
#define MBEDTLS_SSL_DTLS_ANTI_REPLAY
4747
#define MBEDTLS_SSL_DTLS_HELLO_VERIFY
4848

49-
/* mbed TLS modules */
49+
/* Mbed TLS modules */
5050
#define MBEDTLS_AES_C
5151
#define MBEDTLS_ASN1_PARSE_C
5252
#define MBEDTLS_ASN1_WRITE_C

doxygen/mbedtls.doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PROJECT_NAME = "mbed TLS v3.4.1"
1+
PROJECT_NAME = "Mbed TLS v3.4.1"
22
OUTPUT_DIRECTORY = ../apidoc/
33
FULL_PATH_NAMES = NO
44
OPTIMIZE_OUTPUT_FOR_C = YES

include/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
option(INSTALL_MBEDTLS_HEADERS "Install mbed TLS headers." ON)
1+
option(INSTALL_MBEDTLS_HEADERS "Install Mbed TLS headers." ON)
22

33
if(INSTALL_MBEDTLS_HEADERS)
44

include/mbedtls/build_info.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
*/
4848
#define MBEDTLS_VERSION_NUMBER 0x03040100
4949
#define MBEDTLS_VERSION_STRING "3.4.1"
50-
#define MBEDTLS_VERSION_STRING_FULL "mbed TLS 3.4.1"
50+
#define MBEDTLS_VERSION_STRING_FULL "Mbed TLS 3.4.1"
5151

5252
#if defined(_MSC_VER) && !defined(_CRT_SECURE_NO_DEPRECATE)
5353
#define _CRT_SECURE_NO_DEPRECATE 1

include/mbedtls/check_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
*/
3131
#include <limits.h>
3232
#if CHAR_BIT != 8
33-
#error "mbed TLS requires a platform with 8-bit chars"
33+
#error "Mbed TLS requires a platform with 8-bit chars"
3434
#endif
3535

3636
#include <stdint.h>

include/mbedtls/ecp.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ mbedtls_ecp_point;
175175

176176
#if !defined(MBEDTLS_ECP_ALT)
177177
/*
178-
* default mbed TLS elliptic curve arithmetic implementation
178+
* default Mbed TLS elliptic curve arithmetic implementation
179179
*
180180
* (in case MBEDTLS_ECP_ALT is defined then the developer has to provide an
181181
* alternative implementation for the whole module and it will replace this

include/mbedtls/error.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ static inline int mbedtls_error_add(int high, int low,
166166
}
167167

168168
/**
169-
* \brief Translate a mbed TLS error code into a string representation,
169+
* \brief Translate a Mbed TLS error code into a string representation,
170170
* Result is truncated if necessary and always includes a terminating
171171
* null byte.
172172
*

include/mbedtls/mbedtls_config.h

+22-22
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@
168168
*
169169
* Enable the memory allocation layer.
170170
*
171-
* By default mbed TLS uses the system-provided calloc() and free().
171+
* By default Mbed TLS uses the system-provided calloc() and free().
172172
* This allows different allocators (self-implemented or provided) to be
173173
* provided to the platform abstraction layer.
174174
*
@@ -241,10 +241,10 @@
241241
/**
242242
* \def MBEDTLS_PLATFORM_EXIT_ALT
243243
*
244-
* MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let mbed TLS support the
244+
* MBEDTLS_PLATFORM_XXX_ALT: Uncomment a macro to let Mbed TLS support the
245245
* function in the platform abstraction layer.
246246
*
247-
* Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, mbed TLS will
247+
* Example: In case you uncomment MBEDTLS_PLATFORM_PRINTF_ALT, Mbed TLS will
248248
* provide a function "mbedtls_platform_set_printf()" that allows you to set an
249249
* alternative printf function pointer.
250250
*
@@ -344,7 +344,7 @@
344344
/** \} name SECTION: System support */
345345

346346
/**
347-
* \name SECTION: mbed TLS feature support
347+
* \name SECTION: Mbed TLS feature support
348348
*
349349
* This section sets support for features that are or are not needed
350350
* within the modules that are enabled.
@@ -367,15 +367,15 @@
367367
/**
368368
* \def MBEDTLS_AES_ALT
369369
*
370-
* MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let mbed TLS use your
370+
* MBEDTLS__MODULE_NAME__ALT: Uncomment a macro to let Mbed TLS use your
371371
* alternate core implementation of a symmetric crypto, an arithmetic or hash
372372
* module (e.g. platform specific assembly optimized implementations). Keep
373373
* in mind that the function prototypes should remain the same.
374374
*
375375
* This replaces the whole module. If you only want to replace one of the
376376
* functions, use one of the MBEDTLS__FUNCTION_NAME__ALT flags.
377377
*
378-
* Example: In case you uncomment MBEDTLS_AES_ALT, mbed TLS will no longer
378+
* Example: In case you uncomment MBEDTLS_AES_ALT, Mbed TLS will no longer
379379
* provide the "struct mbedtls_aes_context" definition and omit the base
380380
* function declarations and implementations. "aes_alt.h" will be included from
381381
* "aes.h" to include the new function definitions.
@@ -423,14 +423,14 @@
423423
/**
424424
* \def MBEDTLS_SHA256_PROCESS_ALT
425425
*
426-
* MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use you
426+
* MBEDTLS__FUNCTION_NAME__ALT: Uncomment a macro to let Mbed TLS use you
427427
* alternate core implementation of symmetric crypto or hash function. Keep in
428428
* mind that function prototypes should remain the same.
429429
*
430-
* This replaces only one function. The header file from mbed TLS is still
430+
* This replaces only one function. The header file from Mbed TLS is still
431431
* used, in contrast to the MBEDTLS__MODULE_NAME__ALT flags.
432432
*
433-
* Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, mbed TLS will
433+
* Example: In case you uncomment MBEDTLS_SHA256_PROCESS_ALT, Mbed TLS will
434434
* no longer provide the mbedtls_sha1_process() function, but it will still provide
435435
* the other function (using your mbedtls_sha1_process() function) and the definition
436436
* of mbedtls_sha1_context, so your implementation of mbedtls_sha1_process must be compatible
@@ -480,11 +480,11 @@
480480
*
481481
* Expose a part of the internal interface of the Elliptic Curve Point module.
482482
*
483-
* MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let mbed TLS use your
483+
* MBEDTLS_ECP__FUNCTION_NAME__ALT: Uncomment a macro to let Mbed TLS use your
484484
* alternative core implementation of elliptic curve arithmetic. Keep in mind
485485
* that function prototypes should remain the same.
486486
*
487-
* This partially replaces one function. The header file from mbed TLS is still
487+
* This partially replaces one function. The header file from Mbed TLS is still
488488
* used, in contrast to the MBEDTLS_ECP_ALT flag. The original implementation
489489
* is still present and it is used for group structures not supported by the
490490
* alternative.
@@ -508,11 +508,11 @@
508508
* implement optimized set up and tear down instructions.
509509
*
510510
* Example: In case you set MBEDTLS_ECP_INTERNAL_ALT and
511-
* MBEDTLS_ECP_DOUBLE_JAC_ALT, mbed TLS will still provide the ecp_double_jac()
511+
* MBEDTLS_ECP_DOUBLE_JAC_ALT, Mbed TLS will still provide the ecp_double_jac()
512512
* function, but will use your mbedtls_internal_ecp_double_jac() if the group
513513
* for the operation is supported by your implementation (i.e. your
514514
* mbedtls_internal_ecp_grp_capable() function returns 1 for this group). If the
515-
* group is not supported by your implementation, then the original mbed TLS
515+
* group is not supported by your implementation, then the original Mbed TLS
516516
* implementation of ecp_double_jac() is used instead, unless this fallback
517517
* behaviour is disabled by setting MBEDTLS_ECP_NO_FALLBACK (in which case
518518
* ecp_double_jac() will return MBEDTLS_ERR_ECP_FEATURE_UNAVAILABLE).
@@ -543,7 +543,7 @@
543543
/**
544544
* \def MBEDTLS_ENTROPY_HARDWARE_ALT
545545
*
546-
* Uncomment this macro to let mbed TLS use your own implementation of a
546+
* Uncomment this macro to let Mbed TLS use your own implementation of a
547547
* hardware entropy collector.
548548
*
549549
* Your function must be called \c mbedtls_hardware_poll(), have the same
@@ -1491,7 +1491,7 @@
14911491
* \def MBEDTLS_SSL_ALL_ALERT_MESSAGES
14921492
*
14931493
* Enable sending of alert messages in case of encountered errors as per RFC.
1494-
* If you choose not to send the alert messages, mbed TLS can still communicate
1494+
* If you choose not to send the alert messages, Mbed TLS can still communicate
14951495
* with other servers, only debugging of failures is harder.
14961496
*
14971497
* The advantage of not sending alert messages, is that no information is given
@@ -2181,12 +2181,12 @@
21812181
* Comment this macro to disallow using RSASSA-PSS in certificates.
21822182
*/
21832183
#define MBEDTLS_X509_RSASSA_PSS_SUPPORT
2184-
/** \} name SECTION: mbed TLS feature support */
2184+
/** \} name SECTION: Mbed TLS feature support */
21852185

21862186
/**
2187-
* \name SECTION: mbed TLS modules
2187+
* \name SECTION: Mbed TLS modules
21882188
*
2189-
* This section enables or disables entire modules in mbed TLS
2189+
* This section enables or disables entire modules in Mbed TLS
21902190
* \{
21912191
*/
21922192

@@ -2882,7 +2882,7 @@
28822882
* Module: library/memory_buffer_alloc.c
28832883
*
28842884
* Requires: MBEDTLS_PLATFORM_C
2885-
* MBEDTLS_PLATFORM_MEMORY (to use it within mbed TLS)
2885+
* MBEDTLS_PLATFORM_MEMORY (to use it within Mbed TLS)
28862886
*
28872887
* Enable this module to enable the buffer memory allocator.
28882888
*/
@@ -3484,7 +3484,7 @@
34843484
* \def MBEDTLS_THREADING_C
34853485
*
34863486
* Enable the threading abstraction layer.
3487-
* By default mbed TLS assumes it is used in a non-threaded environment or that
3487+
* By default Mbed TLS assumes it is used in a non-threaded environment or that
34883488
* contexts are not shared between threads. If you do intend to use contexts
34893489
* between threads, you will need to enable this layer to prevent race
34903490
* conditions. See also our Knowledge Base article about threading:
@@ -3498,7 +3498,7 @@
34983498
* You will have to enable either MBEDTLS_THREADING_ALT or
34993499
* MBEDTLS_THREADING_PTHREAD.
35003500
*
3501-
* Enable this layer to allow use of mutexes within mbed TLS
3501+
* Enable this layer to allow use of mutexes within Mbed TLS
35023502
*/
35033503
//#define MBEDTLS_THREADING_C
35043504

@@ -3644,7 +3644,7 @@
36443644
*/
36453645
#define MBEDTLS_X509_CSR_WRITE_C
36463646

3647-
/** \} name SECTION: mbed TLS modules */
3647+
/** \} name SECTION: Mbed TLS modules */
36483648

36493649
/**
36503650
* \name SECTION: General configuration options

include/mbedtls/platform_time.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* \file platform_time.h
33
*
4-
* \brief mbed TLS Platform time abstraction
4+
* \brief Mbed TLS Platform time abstraction
55
*/
66
/*
77
* Copyright The Mbed TLS Contributors

include/mbedtls/ssl_ciphersuites.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/**
22
* \file ssl_ciphersuites.h
33
*
4-
* \brief SSL Ciphersuites for mbed TLS
4+
* \brief SSL Ciphersuites for Mbed TLS
55
*/
66
/*
77
* Copyright The Mbed TLS Contributors

include/mbedtls/threading.h

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

0 commit comments

Comments
 (0)