From 21174cddc31151ebf58640ca9346a6f3680e1f92 Mon Sep 17 00:00:00 2001 From: ka7 Date: Sat, 25 Feb 2017 14:21:10 +0100 Subject: [PATCH 1/2] Feature/spelling (#495) * spelling fixes (comments only) * spelling fixes (comments only) --- contrib/Findsodium.cmake | 2 +- m4/pkg.m4 | 2 +- .../crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/contrib/Findsodium.cmake b/contrib/Findsodium.cmake index 735584d5..ad7031e5 100644 --- a/contrib/Findsodium.cmake +++ b/contrib/Findsodium.cmake @@ -12,7 +12,7 @@ ######################################################################## # Tries to find the local libsodium installation. # -# On Windows the sodium_DIR enviroment variable is used as a default +# On Windows the sodium_DIR environment variable is used as a default # hint which can be overridden by setting the corresponding cmake variable. # # Once done the following variables will be defined: diff --git a/m4/pkg.m4 b/m4/pkg.m4 index c5b26b52..c0a8d3d7 100644 --- a/m4/pkg.m4 +++ b/m4/pkg.m4 @@ -53,7 +53,7 @@ fi[]dnl # to PKG_CHECK_MODULES(), but does not set variables or print errors. # # Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) -# only at the first occurence in configure.ac, so if the first place +# only at the first occurrence in configure.ac, so if the first place # it's called might be skipped (such as if it is within an "if", you # have to call PKG_CHECK_EXISTS manually # -------------------------------------------------------------- diff --git a/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c b/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c index 989c8650..2f2f084f 100644 --- a/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c +++ b/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c @@ -564,7 +564,7 @@ crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c, } \ } while(0) -/* remainder loop, with the slower GCM update to accomodate partial blocks */ +/* remainder loop, with the slower GCM update to accommodate partial blocks */ #define LOOPRMD128 \ do { \ const int iter = 8; \ From 76e87fb547cb694fbfc57a18d2046683c6496a9f Mon Sep 17 00:00:00 2001 From: ka7 Date: Sat, 25 Feb 2017 14:21:30 +0100 Subject: [PATCH 2/2] spelling fixes (touches code in tests) (#494) --- test/default/pwhash_scrypt_ll.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/default/pwhash_scrypt_ll.c b/test/default/pwhash_scrypt_ll.c index 3fc80dd5..c95a2ab2 100644 --- a/test/default/pwhash_scrypt_ll.c +++ b/test/default/pwhash_scrypt_ll.c @@ -30,13 +30,13 @@ test_vector(const char *password, const char *salt, uint64_t N, uint32_t r, size_t i; size_t olen = (sizeof data / sizeof data[0]); size_t passwordLength = strlen(password); - size_t saltLenght = strlen(salt); + size_t saltLength = strlen(salt); int lineitems = 0; int lineitemsLimit = 15; if (crypto_pwhash_scryptsalsa208sha256_ll( (const uint8_t *) password, passwordLength, (const uint8_t *) salt, - saltLenght, N, r, p, data, olen) != 0) { + saltLength, N, r, p, data, olen) != 0) { printf("pwhash_scryptsalsa208sha256_ll([%s],[%s]) failure\n", password, salt); return;