Skip to content

Commit

Permalink
Merge pull request wolfSSL#6994 from embhorn/gh6988
Browse files Browse the repository at this point in the history
Fix spelling warnings
  • Loading branch information
JacobBarthelmeh authored Nov 22, 2023
2 parents 2f920b5 + 7223b5a commit 0306d07
Show file tree
Hide file tree
Showing 34 changed files with 114 additions and 114 deletions.
2 changes: 1 addition & 1 deletion ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ NOTE: * --enable-heapmath is being deprecated and will be removed by 2024
* Added LMS/HSS and XMSS/XMSS^MT wolfcrypt hooks, both normal and verify-only options.
* Added support for the AES EAX mode of operation
* Port for use with Hitch (https://github.com/varnish/hitch) added
* Add XTS API's to handle multiple sectors in new port ot VeraCrypt
* Add XTS API's to handle multiple sectors in new port to VeraCrypt

## Enhancements and Optimizations

Expand Down
2 changes: 1 addition & 1 deletion IDE/CRYPTOCELL/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
/* wolfCrypt_Init/wolfCrypt_Cleanup to turn CryptoCell hardware on/off */
#include <wolfssl/wolfcrypt/wc_port.h>

/* SEGGER_RTT_Init, you can potential replace it with other serial terminal */
/* SEGGER_RTT_Init, you can potentially replace it with other serial terminal */
#include "SEGGER_RTT.h"

int main(void)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ else()
"\"${WOLFSSL_ROOT}/wolfcrypt/src\""
"\"${WOLFSSL_ROOT}/wolfcrypt/src/port/Espressif\""
"\"${WOLFSSL_ROOT}/wolfcrypt/src/port/atmel\""
# TODO: Make this a univeral makefile that detects if bechmark / test needed
# TODO: Make this a universal makefile that detects if benchmark / test needed
# Sometimes problematic with SM; consider gating detection.
#"\"${WOLFSSL_ROOT}/wolfcrypt/benchmark\"" # the benchmark application
#"\"${WOLFSSL_ROOT}/wolfcrypt/test\"" # the test application
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ else()
"\"${WOLFSSL_ROOT}/wolfcrypt/src\""
"\"${WOLFSSL_ROOT}/wolfcrypt/src/port/Espressif\""
"\"${WOLFSSL_ROOT}/wolfcrypt/src/port/atmel\""
# TODO: Make this a univeral makefile that detects if bechmark / test needed
# TODO: Make this a universal makefile that detects if benchmark / test needed
# Sometimes problematic with SM; consider gating detection.
#"\"${WOLFSSL_ROOT}/wolfcrypt/benchmark\"" # the benchmark application
#"\"${WOLFSSL_ROOT}/wolfcrypt/test\"" # the test application
Expand Down
2 changes: 1 addition & 1 deletion IDE/Espressif/ESP-IDF/examples/wolfssl_test/main/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,6 @@ void app_main(void)
#else
vTaskDelay(60000);
#endif
} /* done whle */
} /* done while */
#endif
}
2 changes: 1 addition & 1 deletion IDE/Renesas/cs+/Projects/t4_demo/README_en.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Setup process:
- Unzip wolfssl under the same directory

2. Set up wolfSSL
- open wolfssl\IDE\Renesas\cs+\Projec/wolfssl\lib.mtpj with CS+ and build
- open wolfssl\IDE\Renesas\cs+\Projects\wolfssl\lib.mtpj with CS+ and build
- open t4_demo.mtpj and build. This create demo program library.

3. Set up AlphaProject
Expand Down
16 changes: 8 additions & 8 deletions IDE/Renesas/e2studio/RZN2L/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ $./examples/server/server -b -d -i -v 4

+ For ECDSA sign and verify use,
Enable the `USE_CERT_BUFFER_256` macro in `wolfssl_demo.h`
Disble the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`
Disable the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`

+ launch server with the following option.
```
Expand Down Expand Up @@ -214,7 +214,7 @@ $./examples/server/server -b -d -i -v 3

+ For ECDSA sign and verify use,
Enable the `USE_CERT_BUFFER_256` macro in `wolfssl_demo.h`
Disble the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`
Disable the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`

+ launch server with the following option.
```
Expand Down Expand Up @@ -281,7 +281,7 @@ static const byte ucIPAddress[4] = { 192, 168, 11, 241 };

+ For ECDSA sign and verify use,
Enable the `USE_CERT_BUFFER_256` macro in `wolfssl_demo.h`
Disble the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`
Disable the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`

+ launch server from e2studio

Expand Down Expand Up @@ -311,7 +311,7 @@ Cleaning up socket and wolfSSL objects.
Waiting connection....
```

You will see the follwoing message on Linux terminal.
You will see the following message on Linux terminal.
```
$ ./examples/client/client -h 192.168.11.241 -p 11111 -v 4
SSL version is TLSv1.3
Expand All @@ -333,7 +333,7 @@ Received: hello wolfssl!
Cleaning up socket and wolfSSL objects.
Waiting connection....
```
You will see the follwoing message on Linux terminal.
You will see the following message on Linux terminal.
```
$ ./examples/client/client -h 192.168.11.241 -p 11111 -v 4 -A ./certs/ca-ecc-cert.pem -c ./certs/client-ecc-cert.pem -k ./cert
s/ecc-client-key.pem
Expand All @@ -359,7 +359,7 @@ static const byte ucIPAddress[4] = { 192, 168, 11, 241 };

+ For ECDSA sign and verify use,
Enable the `USE_CERT_BUFFER_256` macro in `wolfssl_demo.h`
Disble the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`
Disable the `USE_CERT_BUFFER_2048` macro in `wolfssl_demo.h`

+ launch server from e2studio

Expand Down Expand Up @@ -389,7 +389,7 @@ Cleaning up socket and wolfSSL objects.
Waiting connection....
```

You will see the follwoing message on Linux terminal.
You will see the following message on Linux terminal.
```
$ ./examples/client/client -h 192.168.11.241 -p 11111 -v 3
SSL version is TLSv1.2
Expand All @@ -411,7 +411,7 @@ Received: hello wolfssl!
Cleaning up socket and wolfSSL objects.
Waiting connection....
```
You will see the follwoing message on Linux terminal.
You will see the following message on Linux terminal.
```
$ ./examples/client/client -h 192.168.11.241 -p 11111 -v 3 -A ./certs/ca-ecc-cert.pem -c ./certs/client-ecc-cert.pem -k ./certs/ecc-client-key.pem
SSL version is TLSv1.2
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ void RSIP_KeyGeneration(FSPSM_ST *g)
}

/* only pointer sets to NULL */
/* onwer of keys should be freed */
/* owner of keys should be freed */
void Clr_CallbackCtx(FSPSM_ST *g)
{
(void) g;
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ NOTE: * --enable-heapmath is being deprecated and will be removed by 2024
* Added LMS/HSS and XMSS/XMSS^MT wolfcrypt hooks, both normal and verify-only options.
* Added support for the AES EAX mode of operation
* Port for use with Hitch (https://github.com/varnish/hitch) added
* Add XTS API's to handle multiple sectors in new port ot VeraCrypt
* Add XTS API's to handle multiple sectors in new port to VeraCrypt

## Enhancements and Optimizations

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ NOTE: * --enable-heapmath is being deprecated and will be removed by 2024
* Added LMS/HSS and XMSS/XMSS^MT wolfcrypt hooks, both normal and verify-only options.
* Added support for the AES EAX mode of operation
* Port for use with Hitch (https://github.com/varnish/hitch) added
* Add XTS API's to handle multiple sectors in new port ot VeraCrypt
* Add XTS API's to handle multiple sectors in new port to VeraCrypt
## Enhancements and Optimizations
Expand Down
2 changes: 1 addition & 1 deletion doc/dox_comments/header_files/aes.h
Original file line number Diff line number Diff line change
Expand Up @@ -1533,7 +1533,7 @@ WOLFSSL_API int wc_AesEaxEncryptFinal(AesEax* eax,
\ref wc_AesEaxInit. When done using the \c AesEax context structure, make
sure to free it using \ref wc_AesEaxFree.
\return 0 if data is authenticated succesfully
\return 0 if data is authenticated successfully
\return AES_EAX_AUTH_E if the authentication tag does not match the
supplied authentication code vector \c authIn
\return other error code on failure
Expand Down
2 changes: 1 addition & 1 deletion examples/server/server.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
THREAD_RETURN WOLFSSL_THREAD server_test(void* args);

/* Echo bytes using buffer of blockSize until [echoData] bytes are complete. */
/* If [bechmarkThroughput] set the statistcs will be output at the end */
/* If [benchmarkThroughput] set the statistics will be output at the end */
int ServerEchoData(WOLFSSL* ssl, int clientfd, int echoData, int blockSize,
size_t benchmarkThroughput);

Expand Down
2 changes: 1 addition & 1 deletion src/internal.c
Original file line number Diff line number Diff line change
Expand Up @@ -20394,7 +20394,7 @@ int ProcessReplyEx(WOLFSSL* ssl, int allowSocketErr)
case getRecordLayerHeader:

/* DTLSv1.3 record numbers in the header are encrypted, and AAD
* uses the unecrypted form. Because of this we need to modify the
* uses the unencrypted form. Because of this we need to modify the
* header, decrypting the numbers inside
* DtlsParseUnifiedRecordLayer(). This violates the const attribute
* of the buffer parameter of GetRecordHeader() used here. */
Expand Down
4 changes: 2 additions & 2 deletions src/ssl.c
Original file line number Diff line number Diff line change
Expand Up @@ -8432,7 +8432,7 @@ static int LoadSystemCaCertsWindows(WOLFSSL_CTX* ctx, byte* loaded)
* directly into wolfSSL "the old way".
*
* As of MacOS 14.0 we are still able to use this method to access system
* certificates. Accessiblity of this API is indicated by the presence of the
* certificates. Accessibility of this API is indicated by the presence of the
* Security/SecTrustSettings.h header. In the likely event that Apple removes
* access to this API on Macs, this function should be removed and the
* DoAppleNativeCertValidation() routine should be used for all devices.
Expand Down Expand Up @@ -8579,7 +8579,7 @@ int wolfSSL_CTX_load_system_CA_certs(WOLFSSL_CTX* ctx)
#if defined(HAVE_SECURITY_SECTRUSTSETTINGS_H) \
&& !defined(WOLFSSL_APPLE_NATIVE_CERT_VALIDATION)
/* As of MacOS 14.0 we are still able to access system certificates and
* load them manually into wolfSSL "the old way". Accessiblity of this API
* load them manually into wolfSSL "the old way". Accessibility of this API
* is indicated by the presence of the Security/SecTrustSettings.h header */
ret = LoadSystemCaCertsMac(ctx, &loaded);
#elif defined(WOLFSSL_APPLE_NATIVE_CERT_VALIDATION)
Expand Down
4 changes: 2 additions & 2 deletions src/ssl_crypto.c
Original file line number Diff line number Diff line change
Expand Up @@ -1616,8 +1616,8 @@ WOLFSSL_HMAC_CTX* wolfSSL_HMAC_CTX_new(void)
*
* Not an OpenSSL compatibility API.
*
* @param [in, out] ctx HMAC contect object.
* @return 1 inficating success.
* @param [in, out] ctx HMAC context object.
* @return 1 indicating success.
*/
int wolfSSL_HMAC_CTX_Init(WOLFSSL_HMAC_CTX* ctx)
{
Expand Down
2 changes: 1 addition & 1 deletion tests/api.c
Original file line number Diff line number Diff line change
Expand Up @@ -35690,7 +35690,7 @@ static int test_X509_STORE_untrusted(void)
NULL
};

/* Only immediate issuer in untrusted chaing. Fails since can't build chain
/* Only immediate issuer in untrusted chain. Fails since can't build chain
* to loaded CA. */
ExpectIntEQ(test_X509_STORE_untrusted_certs(untrusted1, 0,
X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT_LOCALLY, 1), TEST_SUCCESS);
Expand Down
6 changes: 3 additions & 3 deletions wolfcrypt/src/ext_lms.c
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ const char * wc_LmsKey_RcToStr(enum wc_LmsRc lmsEc)

/* Init an LMS key.
*
* Call this before setting the parms of an LMS key.
* Call this before setting the params of an LMS key.
*
* Returns 0 on success.
* */
Expand Down Expand Up @@ -404,7 +404,7 @@ int wc_LmsKey_SetParameters(LmsKey * key, int levels, int height,
key->lm_ots_type[i] = ots;
}

/* Move the state to parms set.
/* Move the state to params set.
* Key is ready for MakeKey or Reload. */
key->state = WC_LMS_STATE_PARMSET;

Expand Down Expand Up @@ -656,7 +656,7 @@ int wc_LmsKey_MakeKey(LmsKey* key, WC_RNG * rng)
return 0;
}

/* Reload a key that has been prepared with the appropriate parms and
/* Reload a key that has been prepared with the appropriate params and
* data. Use this if you wish to resume signing with an existing key.
*
* Write/read callbacks, and context data, must be set prior.
Expand Down
4 changes: 2 additions & 2 deletions wolfcrypt/src/ext_xmss.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ static int sha256_cb(const unsigned char *in, unsigned long long inlen,

/* Init an XMSS key.
*
* Call this before setting the parms of an XMSS key.
* Call this before setting the params of an XMSS key.
*
* key [in] The XMSS key to init.
* heap [in] Unused.
Expand Down Expand Up @@ -201,7 +201,7 @@ static int wc_XmssKey_SetOid(XmssKey * key, uint32_t oid, int is_xmssmt)

/* Set the XMSS key parameter string.
*
* The input string must be one of the supported parm set names in
* The input string must be one of the supported param set names in
* the "Name" section from the table in wolfssl/wolfcrypt/xmss.h,
* e.g. "XMSS-SHA2_10_256" or "XMSSMT-SHA2_20/4_256".
*
Expand Down
6 changes: 3 additions & 3 deletions wolfcrypt/src/port/Espressif/esp32_mp.c
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ int esp_mp_montgomery_init(MATH_INT_T* X, MATH_INT_T* Y, MATH_INT_T* M,
return MP_HW_FALLBACK;
}
if ((X == NULL) || (Y == NULL) || (M == NULL) ) {
/* if a bad oprand passed, we cannot use HW */
/* if a bad operand passed, we cannot use HW */
ESP_LOGE(TAG, "ERROR: Bad montgomery operand, falling back to SW");
return MP_HW_FALLBACK;
}
Expand Down Expand Up @@ -1437,10 +1437,10 @@ int esp_mp_mulmod(MATH_INT_T* X, MATH_INT_T* Y, MATH_INT_T* M, MATH_INT_T* Z)
SET_HW_VALIDATION;
reti = mp_mulmod(X2, Y2, M2, Z2);
if (reti == 0) {
ESP_LOGV(TAG, "wolfSSL mp_mulmod during vaidation success");
ESP_LOGV(TAG, "wolfSSL mp_mulmod during validation success");
}
else {
ESP_LOGE(TAG, "wolfSSL mp_mulmod during vaidation failed");
ESP_LOGE(TAG, "wolfSSL mp_mulmod during validation failed");
}
CLR_HW_VALIDATION;
}
Expand Down
6 changes: 3 additions & 3 deletions wolfcrypt/src/port/arm/armv8-aes.c
Original file line number Diff line number Diff line change
Expand Up @@ -1882,7 +1882,7 @@ static int Aes128GcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte counter[AES_BLOCK_SIZE];
byte scratch[AES_BLOCK_SIZE];
/* Noticed different optimization levels treated head of array different.
* Some cases was stack pointer plus offset others was a regester containing
* Some cases was stack pointer plus offset others was a register containing
* address. To make uniform for passing in to inline assembly code am using
* pointers to the head of each local array.
*/
Expand Down Expand Up @@ -3528,7 +3528,7 @@ static int Aes192GcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte counter[AES_BLOCK_SIZE];
byte scratch[AES_BLOCK_SIZE];
/* Noticed different optimization levels treated head of array different.
* Some cases was stack pointer plus offset others was a regester containing
* Some cases was stack pointer plus offset others was a register containing
* address. To make uniform for passing in to inline assembly code am using
* pointers to the head of each local array.
*/
Expand Down Expand Up @@ -5291,7 +5291,7 @@ static int Aes256GcmEncrypt(Aes* aes, byte* out, const byte* in, word32 sz,
byte counter[AES_BLOCK_SIZE];
byte scratch[AES_BLOCK_SIZE];
/* Noticed different optimization levels treated head of array different.
* Some cases was stack pointer plus offset others was a regester containing
* Some cases was stack pointer plus offset others was a register containing
* address. To make uniform for passing in to inline assembly code am using
* pointers to the head of each local array.
*/
Expand Down
2 changes: 1 addition & 1 deletion wolfcrypt/src/port/caam/wolfcaam_seco.c
Original file line number Diff line number Diff line change
Expand Up @@ -1228,7 +1228,7 @@ word32 wc_SECO_WrapKey(word32 keyId, byte* in, word32 inSz, byte* iv,
}


/* trasnlates the HSM error to wolfSSL error and does debug print out */
/* Translates the HSM error to wolfSSL error and does debug print out */
int wc_TranslateHSMError(int current, hsm_err_t err)
{
int ret = -1;
Expand Down
16 changes: 8 additions & 8 deletions wolfcrypt/src/sp_arm32.c
Original file line number Diff line number Diff line change
Expand Up @@ -79129,7 +79129,7 @@ int sp_ecc_verify_256_nb(sp_ecc_ctx_t* sp_ctx, const byte* hash,
#endif /* HAVE_ECC_VERIFY */

#ifdef HAVE_ECC_CHECK_KEY
/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* point EC point.
* heap Heap to use if dynamically allocating.
Expand Down Expand Up @@ -79185,7 +79185,7 @@ static int sp_256_ecc_is_point_8(const sp_point_256* point,
return err;
}

/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* pX X ordinate of EC point.
* pY Y ordinate of EC point.
Expand Down Expand Up @@ -97205,7 +97205,7 @@ int sp_ecc_verify_384_nb(sp_ecc_ctx_t* sp_ctx, const byte* hash,
#endif /* HAVE_ECC_VERIFY */

#ifdef HAVE_ECC_CHECK_KEY
/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* point EC point.
* heap Heap to use if dynamically allocating.
Expand Down Expand Up @@ -97261,7 +97261,7 @@ static int sp_384_ecc_is_point_12(const sp_point_384* point,
return err;
}

/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* pX X ordinate of EC point.
* pY Y ordinate of EC point.
Expand Down Expand Up @@ -126155,7 +126155,7 @@ int sp_ecc_verify_521_nb(sp_ecc_ctx_t* sp_ctx, const byte* hash,
#endif /* HAVE_ECC_VERIFY */

#ifdef HAVE_ECC_CHECK_KEY
/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* point EC point.
* heap Heap to use if dynamically allocating.
Expand Down Expand Up @@ -126211,7 +126211,7 @@ static int sp_521_ecc_is_point_17(const sp_point_521* point,
return err;
}

/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* pX X ordinate of EC point.
* pY Y ordinate of EC point.
Expand Down Expand Up @@ -156590,7 +156590,7 @@ static void sp_1024_from_bin(sp_digit* r, int size, const byte* a, int n)
}
}

/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* point EC point.
* heap Heap to use if dynamically allocating.
Expand Down Expand Up @@ -156650,7 +156650,7 @@ static int sp_1024_ecc_is_point_32(const sp_point_1024* point,
return err;
}

/* Check that the x and y oridinates are a valid point on the curve.
/* Check that the x and y ordinates are a valid point on the curve.
*
* pX X ordinate of EC point.
* pY Y ordinate of EC point.
Expand Down
Loading

0 comments on commit 0306d07

Please sign in to comment.