Skip to content

Commit c9d79ff

Browse files
README.md: Various small improvements
Signed-off-by: Ronald Cron <[email protected]>
1 parent e2d4684 commit c9d79ff

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

README.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Configuration options related to X.509 and TLS are available in `include/mbedtls
1010

1111
With the default platform options, Mbed TLS should build out of the box on most systems.
1212

13-
These configuration files can be edited manually, or programmatically using the Python 3 script scripts/config.py (run with --help for usage instructions).
13+
These configuration files can be edited manually, or programmatically using the Python 3 script `scripts/config.py` (run with --help for usage instructions).
1414

1515
We provide some non-standard configurations focused on specific use cases in the `configs/` directory. You can read more about those in `configs/README.txt`.
1616

@@ -38,7 +38,7 @@ We use CMake to configure and drive our build process. Three libraries are built
3838
You need the following tools to build the library from the main branch with the provided CMake files. Mbed TLS minimum tool version requirements are set based on the versions shipped in the latest or penultimate (depending on the release cadence) long-term support releases of major Linux distributions, namely at time of writing: Ubuntu 22.04, RHEL 9, and SLES 15 SP4.
3939

4040
* CMake 3.20.4 or later.
41-
* A build system that CMake supports.
41+
* A build system like Make or Ninja for which CMake can generate build files.
4242
* A C99 toolchain (compiler, linker, archiver). We actively test with GCC 5.4, Clang 3.8, Arm Compiler 6, IAR 8 and Visual Studio 2017. More recent versions should work. Slightly older versions may work.
4343
* Python 3.8 to generate the test code. Python is also needed to build the development branch (see next section).
4444
* Perl to run the tests, and to generate some source files in the development branch.
@@ -138,7 +138,7 @@ showing them as modified). In order to do so, from the Mbed TLS source
138138
directory, use:
139139
140140
cmake .
141-
make
141+
cmake --build .
142142
143143
If you want to change `CC` or `CFLAGS` afterwards, you will need to remove the
144144
CMake cache. This can be done with the following command using GNU find:
@@ -148,10 +148,10 @@ CMake cache. This can be done with the following command using GNU find:
148148
You can now make the desired change:
149149
150150
CC=your_cc cmake .
151-
make
151+
cmake --build .
152152
153153
Regarding variables, also note that if you set CFLAGS when invoking cmake,
154-
your value of CFLAGS doesn't override the content provided by cmake (depending
154+
your value of CFLAGS doesn't override the content provided by CMake (depending
155155
on the build mode as seen above), it's merely prepended to it.
156156
157157
#### Consuming Mbed TLS
@@ -196,13 +196,13 @@ Please note that the goal of these sample programs is to demonstrate specific fe
196196
Tests
197197
-----
198198
199-
Mbed TLS includes an elaborate test suite in `tests/` that initially requires Python to generate the tests files (e.g. `test\_suite\_ssl.c`). These files are generated from a `function file` (e.g. `suites/test\_suite\_ssl.function`) and a `data file` (e.g. `suites/test\_suite\_ssl.data`). The `function file` contains the test functions. The `data file` contains the test cases, specified as parameters that will be passed to the test function.
199+
Mbed TLS includes an elaborate test suite in `tests/` that initially requires Python to generate the tests files (e.g. `test_suite_ssl.c`). These files are generated from a `function file` (e.g. `suites/test_suite_ssl.function`) and a `data file` (e.g. `suites/test_suite_ssl.data`). The `function file` contains the test functions. The `data file` contains the test cases, specified as parameters that will be passed to the test function.
200200
201201
For machines with a Unix shell and OpenSSL (and optionally GnuTLS) installed, additional test scripts are available:
202202
203203
- `tests/ssl-opt.sh` runs integration tests for various TLS options (renegotiation, resumption, etc.) and tests interoperability of these options with other implementations.
204204
- `tests/compat.sh` tests interoperability of every ciphersuite with other implementations.
205-
- `tests/scripts/depends.py` test builds in configurations with a single curve, key exchange, hash, cipher, or pkalg on.
205+
- `tests/scripts/depends.py` tests builds in configurations with a single curve, key exchange, hash, cipher, or pkalg on.
206206
- `tests/scripts/all.sh` runs a combination of the above tests, plus some more, with various build options (such as ASan, full `mbedtls_config.h`, etc).
207207
208208
Instead of manually installing the required versions of all tools required for testing, it is possible to use the Docker images from our CI systems, as explained in [our testing infrastructure repository](https://github.com/Mbed-TLS/mbedtls-test/blob/main/README.md#quick-start).

0 commit comments

Comments
 (0)