From 6152b0267cac48e897facb25f7d492d83ae8bbbe Mon Sep 17 00:00:00 2001 From: Paul Bakker Date: Tue, 14 Apr 2015 15:00:09 +0200 Subject: [PATCH] Fixed typos --- ChangeLog | 2 +- README.rst | 2 +- include/polarssl/ecp.h | 2 +- include/polarssl/platform.h | 2 +- programs/pkey/mpi_demo.c | 2 +- scripts/ecc-heap.sh | 2 +- tests/data_files/Readme-x509.txt | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3697f5310..b24b2d688 100644 --- a/ChangeLog +++ b/ChangeLog @@ -88,7 +88,7 @@ Features length of an X.509 verification chain. * Support for renegotiation can now be disabled at compile-time * Support for 1/n-1 record splitting, a countermeasure against BEAST. - * Certificate selection based on signature hash, prefering SHA-1 over SHA-2 + * Certificate selection based on signature hash, preferring SHA-1 over SHA-2 for pre-1.2 clients when multiple certificates are available. * Add support for getrandom() syscall on recent Linux kernels with Glibc or a compatible enough libc (eg uClibc). diff --git a/README.rst b/README.rst index ae335f88f..59ca2c67d 100644 --- a/README.rst +++ b/README.rst @@ -68,7 +68,7 @@ There are many different build modes available within the CMake buildsystem. Mos - ASanDbg. Same as ASan but slower, with debug information and better stack traces. - MemSan. - This intruments the code with MemorySanitizer to check for uninitialised + This instruments the code with MemorySanitizer to check for uninitialised memory reads. Experimental, needs recent clang on Linux/x86_64. - MemSanDbg. Same as ASan but slower, with debug information, better stack traces and diff --git a/include/polarssl/ecp.h b/include/polarssl/ecp.h index eef445fa1..ef99351c7 100644 --- a/include/polarssl/ecp.h +++ b/include/polarssl/ecp.h @@ -642,7 +642,7 @@ int ecp_gen_key( ecp_group_id grp_id, ecp_keypair *key, * \param pub Keypair structure holding a public key * \param prv Keypair structure holding a private (plus public) key * - * \return 0 if successfull (keys are valid and match), or + * \return 0 if successful (keys are valid and match), or * POLARSSL_ERR_ECP_BAD_INPUT_DATA, or * a POLARSSL_ERR_ECP_XXX or POLARSSL_ERR_MPI_XXX code. */ diff --git a/include/polarssl/platform.h b/include/polarssl/platform.h index 32d1c9f25..9095203e0 100644 --- a/include/polarssl/platform.h +++ b/include/polarssl/platform.h @@ -30,7 +30,7 @@ #include POLARSSL_CONFIG_FILE #endif -/* Temporary compability hack for to keep MEMORY_C working */ +/* Temporary compatibility hack for to keep MEMORY_C working */ #if defined(POLARSSL_MEMORY_C) && !defined(POLARSSL_PLATFORM_MEMORY) #define POLARSSL_PLATFORM_MEMORY #endif diff --git a/programs/pkey/mpi_demo.c b/programs/pkey/mpi_demo.c index c94fb9764..95267fccb 100644 --- a/programs/pkey/mpi_demo.c +++ b/programs/pkey/mpi_demo.c @@ -96,7 +96,7 @@ cleanup: if( ret != 0 ) { - polarssl_printf( "\nAn error occured.\n" ); + polarssl_printf( "\nAn error occurred.\n" ); ret = 1; } diff --git a/scripts/ecc-heap.sh b/scripts/ecc-heap.sh index 4f88a4422..8c53f0945 100755 --- a/scripts/ecc-heap.sh +++ b/scripts/ecc-heap.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Measure heap usage (and perfomance) of ECC operations with various values of +# Measure heap usage (and performance) of ECC operations with various values of # the relevant tunable compile-time parameters. # # Usage (preferably on a 32-bit platform): diff --git a/tests/data_files/Readme-x509.txt b/tests/data_files/Readme-x509.txt index 3022aae7c..2077f3a95 100644 --- a/tests/data_files/Readme-x509.txt +++ b/tests/data_files/Readme-x509.txt @@ -73,7 +73,7 @@ Certificate revocation lists Signing CA in parentheses (same meaning as certificates). - crl-ec-sha*: (2) server6.crt -- crl-future.pem: (2) server6.crt + unkown +- crl-future.pem: (2) server6.crt + unknown - crl-rsa-pss-*.pem: (1) server9{,badsign,with-ca}.crt + cert_sha384.crt + unknown - crl.pem, crl_expired.pem: (1) server1{,.cert_type,.key_usage,.v1}.crt + unknown - crl_md*.pem: crl_sha*.pem: (1) same as crl.pem