rbnacl-libsodium 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f59ba5b4931d1cb679567d42c1388a331d7b5a
-  data.tar.gz: 57149f5038ea1a184159427d80dcf4fc4e1abbeb
+  metadata.gz: 9c4ff372aaa915d80d470c81a1464d465b6a1d44
+  data.tar.gz: 1e74053ea9c43c91bf1865385ca7747b5eefcc6f
 SHA512:
-  metadata.gz: f6f31b2fdc4698918c4e6452f217502748b119c0b57e53babdbc0626d38f593c82d2d44ad2932e702cd013233fedd9f3ffc1b556b51b722c66489d0e13bf49a6
-  data.tar.gz: 68f498072fff068079a2f5b0c1ad3cb409e14782adde88f7fd6ba2ffd3ac4cdc6602736c513192d1232fa3a4609725866c32273d22268708c066b62289819a81
+  metadata.gz: 5738d866d6c3a8d3df818e18de77bd21bcf39b1d949c8706dfde9ea1443553ed25f36384af63d3895403daafeb7adeb789c1eedd7ee79f1cee44cb44bcadd5a7
+  data.tar.gz: cddb7a365337a3de5a45057b268e3a89b6859c71a03047974958bf405287cfb80483eb2306396fc8c8c8901185fd264f7533475064a181961a63a3e260c4beb2

data/CHANGES.md

@@ -1,3 +1,7 @@
+0.7.0 (2014-08-24)
+------------------
+* Update to libsodium 0.7.0
+
 0.6.1 (2014-07-19)
 ------------------
 * Update to libsodium 0.6.1

data/lib/rbnacl/libsodium/version.rb

@@ -1,5 +1,5 @@
 module RbNaCl
   module Libsodium
-    VERSION = "0.6.1"
+    VERSION = "0.7.0"
   end
 end

data/vendor/libsodium/AUTHORS

@@ -63,9 +63,6 @@ crypto_sign/ed25519                    Peter Schwabe
 
 crypto_stream/aes128ctr                Peter Schwabe
 
-crypto_stream/aes256estream            Hongjun Wu
-                                       Frank Denis
-
 crypto_stream/chacha20                 Daniel J. Bernstein
 
 crypto_stream/salsa20                  Daniel J. Bernstein

data/vendor/libsodium/ChangeLog

@@ -1,4 +1,28 @@
 
+* Version 0.7.0 (1.0 RC1)
+ - Allocating memory to store sensitive data can now be done using
+sodium_malloc() and sodium_allocarray(). These functions add guard
+pages around the protected data to make it less likely to be
+accessible in a heartbleed-like scenario. In addition, the protection
+for memory regions allocated that way can be changed using
+sodium_mprotect_noaccess(), sodium_mprotect_readonly() and
+sodium_mprotect_readwrite().
+ - ed25519 keys can be converted to curve25519 keys with
+crypto_sign_ed25519_pk_to_curve25519() and
+crypto_sign_ed25519_sk_to_curve25519(). This allows using the same
+keys for signature and encryption.
+ - The seed and the public key can be extracted from an ed25519 key
+using crypto_sign_ed25519_sk_to_seed() and crypto_sign_ed25519_sk_to_pk().
+ - aes256 was removed. A timing-attack resistant implementation might
+be added later, but not before version 1.0 is tagged.
+ - The crypto_pwhash_scryptxsalsa208sha256_* compatibility layer was
+removed. Use crypto_pwhash_scryptsalsa208sha256_*.
+ - The compatibility layer for implementation-specific functions was
+removed.
+ - Compilation issues with Mingw64 on MSYS (not MSYS2) were fixed.
+ - crypto_pwhash_scryptsalsa208sha256_STRPREFIX was added: it contains
+the prefix produced by crypto_pwhash_scryptsalsa208sha256_str()
+
 * Version 0.6.1
  - Important bug fix: when crypto_sign_open() was given a signed
 message too short to even contain a signature, it was putting an

data/vendor/libsodium/THANKS

@@ -14,11 +14,13 @@ Eric Voskuil (@evoskuil)
 Gabriel Handford (@gabriel)
 Jachym Holecek (@freza)
 Jan de Muijnck-Hughes (@jfdm)
+Jason McCampbell (@jasonmccampbell)
 Jeroen Habraken (@VeXocide)
 Joseph Abrahamson (@tel)
 Kenneth Ballenegger (@kballenegger)
 Michael Gorlick (@mgorlick)
 Michael Gregorowicz (@mgregoro)
+Omar Ayub (@electricFeel)
 Pedro Paixao (@paixaop)
 Ruben De Visscher (@rubendv)
 Samuel Neves (@sneves)

data/vendor/libsodium/autom4te.cache/output.1

@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for libsodium 0.6.1.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 0.7.0.
 @%:@
 @%:@ Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='0.6.1'
-PACKAGE_STRING='libsodium 0.6.1'
+PACKAGE_VERSION='0.7.0'
+PACKAGE_STRING='libsodium 0.7.0'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -1353,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libsodium 0.6.1 to adapt to many kinds of systems.
+\`configure' configures libsodium 0.7.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1423,7 +1423,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 0.6.1:";;
+     short | recursive ) echo "Configuration of libsodium 0.7.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1550,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 0.6.1
+libsodium configure 0.7.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libsodium $as_me 0.6.1, which was
+It was created by libsodium $as_me 0.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2855,7 +2855,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='0.6.1'
+ VERSION='0.7.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3149,10 +3149,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=6
-SODIUM_LIBRARY_VERSION_MINOR=1
-DLL_VERSION=5
-SODIUM_LIBRARY_VERSION=12:0:2
+SODIUM_LIBRARY_VERSION_MAJOR=7
+SODIUM_LIBRARY_VERSION_MINOR=0
+DLL_VERSION=6
+SODIUM_LIBRARY_VERSION=13:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3220,13 +3220,6 @@ $as_echo "$as_me: WARNING: compiling to javascript - asm implementations disable
 
 fi
 
-case $host in @%:@(
-  x86_64-*-mingw* | x86_64-*-cygwin*) :
-    enable_asm="no" ;; @%:@(
-  *) :
-     ;;
-esac
-
 @%:@ Check whether --enable-pie was given.
 if test "${enable_pie+set}" = set; then :
   enableval=$enable_pie; enable_pie=$enableval
@@ -3236,7 +3229,7 @@ fi
 
 
 case $host_os in @%:@(
-  mingw*) :
+  mingw*|cygwin*|msys) :
     enable_pie="no" ;; @%:@(
   *) :
      ;;
@@ -5160,7 +5153,12 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIC" >&5
+case $host_os in @%:@(
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
+      ;; @%:@(
+  *) :
+    
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIC" >&5
 $as_echo_n "checking whether C compiler accepts -fPIC... " >&6; }
 if ${ax_cv_check_cflags___fPIC+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5191,7 +5189,7 @@ fi
 $as_echo "$ax_cv_check_cflags___fPIC" >&6; }
 if test x"$ax_cv_check_cflags___fPIC" = xyes; then :
   
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
 $as_echo_n "checking whether the linker accepts -fPIC... " >&6; }
 if ${ax_cv_check_ldflags___fPIC+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5223,16 +5221,18 @@ fi
 $as_echo "$ax_cv_check_ldflags___fPIC" >&6; }
 if test x"$ax_cv_check_ldflags___fPIC" = xyes; then :
   CFLAGS="$CFLAGS -fPIC"
-  
+    
 else
   :
 fi
 
-
+  
 else
   :
 fi
 
+ ;;
+esac
 
 if test "$enable_pie" != "no"; then :
   
@@ -5470,7 +5470,7 @@ fi
 
 
 case $host_os in @%:@(
-  cygwin* | mingw* | pw32* | cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
     
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--dynamicbase" >&5
 $as_echo_n "checking whether the linker accepts -Wl,--dynamicbase... " >&6; }
@@ -5553,7 +5553,7 @@ if test "x$enable_ssp" != "xno"; then :
   
 
 case $host_os in @%:@(
-  cygwin* | mingw* | pw32* | cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
       ;; @%:@(
   dragonfly*) :
     
@@ -14415,8 +14415,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 HAVE_AMD64_ASM_V=0
 if test "$enable_asm" != "no"; then :
   
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can assemble basic amd64 code" >&5
-$as_echo_n "checking whether we can assemble basic amd64 code... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should use x86_64 asm code" >&5
+$as_echo_n "checking whether we should use x86_64 asm code... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14426,9 +14426,12 @@ main ()
 {
 
 #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+#  error Windows x86_64 calling conventions are not supported yet
+# endif
 /* neat */
 #else
-# error !amd64
+# error !x86_64
 #endif
 __asm__("pxor %xmm12,%xmm6");
 
@@ -14601,109 +14604,6 @@ $as_echo "@%:@define CPU_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
 esac
 
 
-ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = xyes; then :
-  
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_rt_clock_gettime=yes
-else
-  ac_cv_lib_rt_clock_gettime=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBRT 1
-_ACEOF
-
-  LIBS="-lrt $LIBS"
-
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "fegetenv" "ac_cv_func_fegetenv"
-if test "x$ac_cv_func_fegetenv" = xyes; then :
-  
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fegetenv in -lm" >&5
-$as_echo_n "checking for fegetenv in -lm... " >&6; }
-if ${ac_cv_lib_m_fegetenv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char fegetenv ();
-int
-main ()
-{
-return fegetenv ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_fegetenv=yes
-else
-  ac_cv_lib_m_fegetenv=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fegetenv" >&5
-$as_echo "$ac_cv_lib_m_fegetenv" >&6; }
-if test "x$ac_cv_lib_m_fegetenv" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-fi
-
-
 if test "x$EMSCRIPTEN" = "x"; then :
   
   for ac_func in arc4random arc4random_buf
@@ -14720,19 +14620,7 @@ done
 
 
 fi
-for ac_func in mlock VirtualLock
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-for ac_func in SecureZeroMemory explicit_bzero posix_memalign
+for ac_func in mlock mprotect explicit_bzero posix_memalign
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15692,7 +15580,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libsodium $as_me 0.6.1, which was
+This file was extended by libsodium $as_me 0.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15750,7 +15638,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libsodium config.status 0.6.1
+libsodium config.status 0.7.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

data/vendor/libsodium/autom4te.cache/output.3

@@ -1,6 +1,6 @@
 @%:@! /bin/sh
 @%:@ Guess values for system-dependent variables and create Makefiles.
-@%:@ Generated by GNU Autoconf 2.69 for libsodium 0.6.1.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 0.7.0.
 @%:@
 @%:@ Report bugs to <https://github.com/jedisct1/libsodium/issues>.
 @%:@ 
@@ -590,8 +590,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='libsodium'
 PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='0.6.1'
-PACKAGE_STRING='libsodium 0.6.1'
+PACKAGE_VERSION='0.7.0'
+PACKAGE_STRING='libsodium 0.7.0'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -1353,7 +1353,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures libsodium 0.6.1 to adapt to many kinds of systems.
+\`configure' configures libsodium 0.7.0 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1423,7 +1423,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 0.6.1:";;
+     short | recursive ) echo "Configuration of libsodium 0.7.0:";;
    esac
   cat <<\_ACEOF
 
@@ -1550,7 +1550,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 0.6.1
+libsodium configure 0.7.0
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1919,7 +1919,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by libsodium $as_me 0.6.1, which was
+It was created by libsodium $as_me 0.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2855,7 +2855,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='0.6.1'
+ VERSION='0.7.0'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3149,10 +3149,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=6
-SODIUM_LIBRARY_VERSION_MINOR=1
-DLL_VERSION=5
-SODIUM_LIBRARY_VERSION=12:0:2
+SODIUM_LIBRARY_VERSION_MAJOR=7
+SODIUM_LIBRARY_VERSION_MINOR=0
+DLL_VERSION=6
+SODIUM_LIBRARY_VERSION=13:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3220,13 +3220,6 @@ $as_echo "$as_me: WARNING: compiling to javascript - asm implementations disable
 
 fi
 
-case $host in @%:@(
-  x86_64-*-mingw* | x86_64-*-cygwin*) :
-    enable_asm="no" ;; @%:@(
-  *) :
-     ;;
-esac
-
 @%:@ Check whether --enable-pie was given.
 if test "${enable_pie+set}" = set; then :
   enableval=$enable_pie; enable_pie=$enableval
@@ -3236,7 +3229,7 @@ fi
 
 
 case $host_os in @%:@(
-  mingw*) :
+  mingw*|cygwin*|msys) :
     enable_pie="no" ;; @%:@(
   *) :
      ;;
@@ -5160,7 +5153,12 @@ else
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIC" >&5
+case $host_os in @%:@(
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
+      ;; @%:@(
+  *) :
+    
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -fPIC" >&5
 $as_echo_n "checking whether C compiler accepts -fPIC... " >&6; }
 if ${ax_cv_check_cflags___fPIC+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5191,7 +5189,7 @@ fi
 $as_echo "$ax_cv_check_cflags___fPIC" >&6; }
 if test x"$ax_cv_check_cflags___fPIC" = xyes; then :
   
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -fPIC" >&5
 $as_echo_n "checking whether the linker accepts -fPIC... " >&6; }
 if ${ax_cv_check_ldflags___fPIC+:} false; then :
   $as_echo_n "(cached) " >&6
@@ -5223,16 +5221,18 @@ fi
 $as_echo "$ax_cv_check_ldflags___fPIC" >&6; }
 if test x"$ax_cv_check_ldflags___fPIC" = xyes; then :
   CFLAGS="$CFLAGS -fPIC"
-  
+    
 else
   :
 fi
 
-
+  
 else
   :
 fi
 
+ ;;
+esac
 
 if test "$enable_pie" != "no"; then :
   
@@ -5470,7 +5470,7 @@ fi
 
 
 case $host_os in @%:@(
-  cygwin* | mingw* | pw32* | cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
     
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--dynamicbase" >&5
 $as_echo_n "checking whether the linker accepts -Wl,--dynamicbase... " >&6; }
@@ -5553,7 +5553,7 @@ if test "x$enable_ssp" != "xno"; then :
   
 
 case $host_os in @%:@(
-  cygwin* | mingw* | pw32* | cegcc*) :
+  cygwin*|mingw*|msys|pw32*|cegcc*) :
       ;; @%:@(
   dragonfly*) :
     
@@ -14415,8 +14415,8 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 HAVE_AMD64_ASM_V=0
 if test "$enable_asm" != "no"; then :
   
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can assemble basic amd64 code" >&5
-$as_echo_n "checking whether we can assemble basic amd64 code... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we should use x86_64 asm code" >&5
+$as_echo_n "checking whether we should use x86_64 asm code... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -14426,9 +14426,12 @@ main ()
 {
 
 #if defined(__amd64) || defined(__amd64__) || defined(__x86_64__)
+# if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__MINGW64__) || defined(_WIN32) || defined(_WIN64)
+#  error Windows x86_64 calling conventions are not supported yet
+# endif
 /* neat */
 #else
-# error !amd64
+# error !x86_64
 #endif
 __asm__("pxor %xmm12,%xmm6");
 
@@ -14601,109 +14604,6 @@ $as_echo "@%:@define CPU_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
 esac
 
 
-ac_fn_c_check_func "$LINENO" "clock_gettime" "ac_cv_func_clock_gettime"
-if test "x$ac_cv_func_clock_gettime" = xyes; then :
-  
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for clock_gettime in -lrt" >&5
-$as_echo_n "checking for clock_gettime in -lrt... " >&6; }
-if ${ac_cv_lib_rt_clock_gettime+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lrt  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char clock_gettime ();
-int
-main ()
-{
-return clock_gettime ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_rt_clock_gettime=yes
-else
-  ac_cv_lib_rt_clock_gettime=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_rt_clock_gettime" >&5
-$as_echo "$ac_cv_lib_rt_clock_gettime" >&6; }
-if test "x$ac_cv_lib_rt_clock_gettime" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBRT 1
-_ACEOF
-
-  LIBS="-lrt $LIBS"
-
-fi
-
-fi
-
-ac_fn_c_check_func "$LINENO" "fegetenv" "ac_cv_func_fegetenv"
-if test "x$ac_cv_func_fegetenv" = xyes; then :
-  
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fegetenv in -lm" >&5
-$as_echo_n "checking for fegetenv in -lm... " >&6; }
-if ${ac_cv_lib_m_fegetenv+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char fegetenv ();
-int
-main ()
-{
-return fegetenv ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_m_fegetenv=yes
-else
-  ac_cv_lib_m_fegetenv=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_m_fegetenv" >&5
-$as_echo "$ac_cv_lib_m_fegetenv" >&6; }
-if test "x$ac_cv_lib_m_fegetenv" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-@%:@define HAVE_LIBM 1
-_ACEOF
-
-  LIBS="-lm $LIBS"
-
-fi
-
-fi
-
-
 if test "x$EMSCRIPTEN" = "x"; then :
   
   for ac_func in arc4random arc4random_buf
@@ -14720,19 +14620,7 @@ done
 
 
 fi
-for ac_func in mlock VirtualLock
-do :
-  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
-ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-@%:@define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
- 
-fi
-done
-
-for ac_func in SecureZeroMemory explicit_bzero posix_memalign
+for ac_func in mlock mprotect explicit_bzero posix_memalign
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -15692,7 +15580,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by libsodium $as_me 0.6.1, which was
+This file was extended by libsodium $as_me 0.7.0, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15750,7 +15638,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-libsodium config.status 0.6.1
+libsodium config.status 0.7.0
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"