Merge branch 'master' of https://github.com/jedisct1/libsodium

* 'master' of https://github.com/jedisct1/libsodium:
  spelling fixes (touches code in tests) (#494)
  Feature/spelling (#495)

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:

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
 # --------------------------------------------------------------

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;                                  \

test/default/pwhash_scrypt_ll.c

@@ -28,7 +28,7 @@ tv(const char *passwd, const char *salt, uint64_t N, uint32_t r, uint32_t p)
     size_t  olen       = (sizeof data / sizeof data[0]);
     size_t  passwd_len = strlen(passwd);
     size_t  salt_len   = strlen(salt);
-    int     lineitems  = 0;
+    int     line_items  = 0;
 
     if (crypto_pwhash_scryptsalsa208sha256_ll(
             (const uint8_t *) passwd, passwd_len, (const uint8_t *) salt,
@@ -43,8 +43,8 @@ tv(const char *passwd, const char *salt, uint64_t N, uint32_t r, uint32_t p)
            (unsigned long) olen);
 
     for (i = 0; i < olen; i++) {
-        printf("%02x%c", data[i], lineitems < lineitemsLimit ? ' ' : '\n');
-        lineitems = lineitems < 15 ? lineitems + 1 : 0;
+        printf("%02x%c", data[i], line_items < line_itemsLimit ? ' ' : '\n');
+        line_items = line_items < 15 ? line_items + 1 : 0;
     }
 }