rbnacl-libsodium 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b43a97a68f14245c79b2657108fb3dd0c0843a81
-  data.tar.gz: 8bf405595200e0b7d1a9dac2ebd317fe76d2613f
+  metadata.gz: b56580328c4cb767702ac03dcb1479b879bcea2c
+  data.tar.gz: 3e590ea6f1acb52f7c29bbd11191bdc4e8c39823
 SHA512:
-  metadata.gz: 327f5c5d03ccab99de68b7878f9b0110697cba7a8360529bb4d86272df162dc07da29f79f6a625ae91551193670a2eabcac15231ae6be1f37ef22986efba959d
-  data.tar.gz: c0694f8097587a398fa60e998fa403e3be85045ad33c609784f02ae9d2f491c50a6e90649c0196ddfeabdf7253ef1c6fa075aa469c6aaaa16286f14a782d3383
+  metadata.gz: 114181ce4c5f580a48ab16e6f64f38cfe3e56fc55c49f0fb157600b3cf068a01d531ef7df39a3f185dcdebcfd44af14882b560438330a4f65dd638c7cd41eacd
+  data.tar.gz: f0d5b3c4bd6b427052c2f80fbc85bcd440552eb1793492a19f12ce44f9deb762a023acce871bfbde0eccdd422b2fe37c7595468b2d7415e37b3a8f3278a4cfae

data/.travis.yml

@@ -0,0 +1,23 @@
+language: ruby
+sudo: false
+
+rvm:
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
+  - ruby-head
+  - jruby
+  - jruby-9.0.4.0
+  - jruby-head
+  - rbx-2
+
+matrix:
+  fast_finish: true
+  allow_failures:
+    - rvm: ruby-head
+    - rvm: jruby-head
+    - rvm: rbx-2
+
+notifications:
+  irc: "irc.freenode.org#cryptosphere"

data/CHANGES.md

@@ -1,3 +1,8 @@
+1.0.9 (2015-04-02)
+------------------
+* Update to libsodium 1.0.9
+* Windows support fixups
+
 1.0.8 (2015-12-26)
 ------------------
 * Update to libsodium 1.0.8

data/Gemfile

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
+gemspec
+
 gem "rbnacl", github: 'cryptosphere/rbnacl'
 
-# Specify your gem's dependencies in rbnacl-libsodium.gemspec
-gemspec
+group :development, :test do
+  gem "rspec", "~> 3"
+end

data/Rakefile

@@ -1 +1,6 @@
 require "bundler/gem_tasks"
+require "rspec/core/rake_task"
+
+RSpec::Core::RakeTask.new
+
+task default: :spec

data/ext/rbnacl/extconf.rb

@@ -19,7 +19,8 @@ LIBSODIUM_DIR = File.expand_path(File.join(CWD, '..', '..', 'vendor', 'libsodium
 MAKE = ENV['MAKE'] || ENV['make'] || "make"
 
 Dir.chdir(LIBSODIUM_DIR) do
-  sys("./configure --prefix=#{LIBSODIUM_DIR}/dist")
+  # sh is required to run configure on Windows
+  sys("sh -c \"./configure --prefix=#{LIBSODIUM_DIR}/dist\"")
   sys(MAKE)
   sys("#{MAKE} install")
 end

data/lib/rbnacl/libsodium.rb

@@ -2,8 +2,14 @@ require "rbnacl/libsodium/version"
 
 module RbNaCl
   module Libsodium
-    sodiumlib_dir = File.expand_path(File.join(File.dirname(__FILE__), "../../vendor/libsodium/dist/lib/"))
-    sodiumlib_filename = RUBY_DESCRIPTION =~ /darwin/ ? "libsodium.dylib" : "libsodium.so"
+    sodiumlib_dir = File.expand_path("../../../vendor/libsodium/dist/lib/", __FILE__)
+
+    sodiumlib_filename = case RUBY_DESCRIPTION
+    when /darwin/ then "libsodium.dylib"
+    when /Windows|(win|mingw)32/ then "libsodium.dll"
+    else "libsodium.so"
+    end
+
     ::RBNACL_LIBSODIUM_GEM_LIB_PATH = File.join(sodiumlib_dir, sodiumlib_filename)
   end
 end

data/lib/rbnacl/libsodium/version.rb

@@ -1,5 +1,5 @@
 module RbNaCl
   module Libsodium
-    VERSION = '1.0.8'
+    VERSION = '1.0.9'
   end
 end

data/vendor/libsodium/AUTHORS

@@ -2,6 +2,10 @@
 Designers
 =========
 
+argon2                                 Alex Biryukov
+                                       Daniel Dinu
+                                       Dmitry Khovratovich
+
 blake2                                 Jean-Philippe Aumasson
                                        Christian Winnerlein
                                        Samuel Neves
@@ -38,8 +42,12 @@ crypto_aead/aes256gcm/aesni            Romain Dolbeau
 
 crypto_aead/chacha20poly1305           Frank Denis
 
+crypto_core/curve25519                 Daniel J. Bernstein
+
 crypto_box/curve25519xsalsa20poly1305  Daniel J. Bernstein
 
+crypto_core/hchacha20                  Frank Denis
+
 crypto_core/hsalsa20                   Daniel J. Bernstein
 crypto_core/salsa20
 crypto_core/salsa2012
@@ -90,5 +98,11 @@ crypto_onetimeauth/poly1305/donna      Andrew "floodyberry" Moon
 
 crypto_onetimeauth/poly1305/sse2       Andrew "floodyberry" Moon
 
+crypto_pwhash/argon2                   Samuel Neves
+                                       Dmitry Khovratovich
+                                       Jean-Philippe Aumasson
+                                       Daniel Dinu
+                                       Thomas Pornin
+
 crypto_pwhash/scryptsalsa208sha256     Colin Percival
                                        Alexander Peslyak

data/vendor/libsodium/ChangeLog

@@ -1,4 +1,30 @@
 
+* Version 1.0.9
+ - The Javascript target now includes a `--sumo` option to include all
+the symbols of the original C library.
+ - A detached API was added to the ChaCha20-Poly1305 and AES256-GCM
+implementations.
+ - The Argon2i password hashing function was added, and is accessible
+directly and through a new, high-level `crypto_pwhash` API. The scrypt
+function remains available as well.
+ - A speed-record AVX2 implementation of BLAKE2b was added (thanks to
+Samuel Neves).
+ - The library can now be compiled using C++Builder (thanks to @jcolli44)
+ - Countermeasures for Ed25519 signatures malleability have been added
+to match the irtf-cfrg-eddsa draft (note that malleability is irrelevant to
+the standard definition of signature security). Signatures with a small-order
+`R` point are now also rejected.
+ - Some implementations are now slightly faster when using the Clang
+compiler.
+ - The HChaCha20 core function was implemented (`crypto_core_hchacha20()`).
+ - No-op stubs were added for all AES256-GCM public functions even when
+compiled on non-Intel platforms.
+ - `crypt_generichash_blake2b_statebytes()` was added.
+ - New macros were added for the IETF variant of the ChaCha20-Poly1305
+construction.
+ - The library can now be compiled on Minix.
+ - HEASLR is now enabled on MinGW builds.
+
 * Version 1.0.8
  - Handle the case where the CPU supports AVX, but we are running
 on an hypervisor with AVX disabled/not supported.

data/vendor/libsodium/LICENSE

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015
+ * Copyright (c) 2013-2016
  * Frank Denis <j at pureftpd dot org>
  *
  * Permission to use, copy, modify, and/or distribute this software for any

data/vendor/libsodium/Makefile.am

@@ -17,5 +17,6 @@ SUBDIRS = \
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = @PACKAGE_NAME@.pc
+
 DISTCLEANFILES = $(pkgconfig_DATA)
 

data/vendor/libsodium/Makefile.in

@@ -93,6 +93,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
+	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
 	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
@@ -264,6 +265,8 @@ CCASFLAGS = @CCASFLAGS@
 CCDEPMODE = @CCDEPMODE@
 CFLAGS = @CFLAGS@
 CFLAGS_AESNI = @CFLAGS_AESNI@
+CFLAGS_AVX = @CFLAGS_AVX@
+CFLAGS_AVX2 = @CFLAGS_AVX2@
 CFLAGS_MMX = @CFLAGS_MMX@
 CFLAGS_PCLMUL = @CFLAGS_PCLMUL@
 CFLAGS_SSE2 = @CFLAGS_SSE2@
@@ -336,6 +339,12 @@ SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
 TEST_LDFLAGS = @TEST_LDFLAGS@
+VALGRIND = @VALGRIND@
+VALGRIND_ENABLED = @VALGRIND_ENABLED@
+VALGRIND_HAVE_TOOL_drd = @VALGRIND_HAVE_TOOL_drd@
+VALGRIND_HAVE_TOOL_exp_sgcheck = @VALGRIND_HAVE_TOOL_exp_sgcheck@
+VALGRIND_HAVE_TOOL_helgrind = @VALGRIND_HAVE_TOOL_helgrind@
+VALGRIND_HAVE_TOOL_memcheck = @VALGRIND_HAVE_TOOL_memcheck@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

data/vendor/libsodium/README.markdown

@@ -1,4 +1,5 @@
 [![Build Status](https://travis-ci.org/jedisct1/libsodium.svg?branch=master)](https://travis-ci.org/jedisct1/libsodium?branch=master)
+[![Windows build status](https://ci.appveyor.com/api/projects/status/fu8s2elx25il98hj?svg=true)](https://ci.appveyor.com/project/jedisct1/libsodium)
 [![Coverity Scan Build Status](https://scan.coverity.com/projects/2397/badge.svg)](https://scan.coverity.com/projects/2397)
 
 ![libsodium](https://raw.github.com/jedisct1/libsodium/master/logo.png)
@@ -27,6 +28,12 @@ online, requires Javascript.
 * [offline documentation](https://www.gitbook.com/book/jedisct1/libsodium/details)
 in PDF, MOBI and ePUB formats.
 
+## Integrity Checking
+
+The integrity checking instructions (including the signing key for libsodium)
+are available in the [installation](https://download.libsodium.org/doc/installation/index.html#integrity-checking)
+section of the documentation.
+
 ## Community
 
 A mailing-list is available to discuss libsodium.

data/vendor/libsodium/aclocal.m4

@@ -1209,6 +1209,7 @@ AC_SUBST([am__untar])
 m4_include([m4/ax_check_compile_flag.m4])
 m4_include([m4/ax_check_define.m4])
 m4_include([m4/ax_check_link_flag.m4])
+m4_include([m4/ax_valgrind_check.m4])
 m4_include([m4/ld-output-def.m4])
 m4_include([m4/libtool.m4])
 m4_include([m4/ltoptions.m4])

data/vendor/libsodium/appveyor.yml

@@ -0,0 +1,25 @@
+version: 1.0.9.{build}
+
+os: Visual Studio 2015
+
+environment:
+  matrix:
+    - platform: Win32
+      configuration: Debug
+    - platform: Win32
+      configuration: Release
+    - platform: x64
+      configuration: Debug
+    - platform: x64
+      configuration: Release
+
+matrix:
+  fast_finish: false
+
+init:
+  msbuild /version
+
+build:
+  parallel: true
+  project: libsodium.vcxproj
+  verbosity: minimal

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 1.0.8.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.9.
 @%:@
 @%:@ 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='1.0.8'
-PACKAGE_STRING='libsodium 1.0.8'
+PACKAGE_VERSION='1.0.9'
+PACKAGE_STRING='libsodium 1.0.9'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -657,6 +657,8 @@ HAVE_AMD64_ASM_FALSE
 HAVE_AMD64_ASM_TRUE
 CFLAGS_PCLMUL
 CFLAGS_AESNI
+CFLAGS_AVX2
+CFLAGS_AVX
 CFLAGS_SSE41
 CFLAGS_SSSE3
 CFLAGS_SSE3
@@ -705,6 +707,15 @@ CPPFLAGS
 LDFLAGS
 CFLAGS
 CC
+VALGRIND_CHECK_RULES
+VALGRIND_HAVE_TOOL_exp_sgcheck
+VALGRIND_HAVE_TOOL_drd
+VALGRIND_HAVE_TOOL_helgrind
+VALGRIND_HAVE_TOOL_memcheck
+VALGRIND_ENABLED
+VALGRIND_ENABLED_FALSE
+VALGRIND_ENABLED_TRUE
+VALGRIND
 SAFECODE_HOME
 MINIMAL_FALSE
 MINIMAL_TRUE
@@ -807,6 +818,7 @@ enable_minimal
 with_safecode
 enable_debug
 enable_opt
+enable_valgrind
 enable_soname_versions
 enable_shared
 enable_static
@@ -1372,7 +1384,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 1.0.8 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.9 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1442,7 +1454,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.8:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.9:";;
    esac
   cat <<\_ACEOF
 
@@ -1470,6 +1482,8 @@ Optional Features:
   --enable-debug          For maintainers only - please do not use
   --enable-opt            Optimize for the native CPU - The resulting library
                           will be faster but not portable
+  --enable-valgrind       Whether to enable Valgrind on the unit tests
+                          (requires GNU make)
   --enable-soname-versions 
                           enable soname versions (must be disabled for
                           Android) (default: enabled)
@@ -1577,7 +1591,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.8
+libsodium configure 1.0.9
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1946,7 +1960,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 1.0.8, which was
+It was created by libsodium $as_me 1.0.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2882,7 +2896,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.8'
+ VERSION='1.0.9'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3178,9 +3192,9 @@ ISODATE=`date +%Y-%m-%d`
 
 
 SODIUM_LIBRARY_VERSION_MAJOR=9
-SODIUM_LIBRARY_VERSION_MINOR=1
+SODIUM_LIBRARY_VERSION_MINOR=2
 DLL_VERSION=8
-SODIUM_LIBRARY_VERSION=18:1:0
+SODIUM_LIBRARY_VERSION=19:0:1
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3363,8 +3377,8 @@ if test "${enable_opt+set}" = set; then :
   enableval=$enable_opt; 
   if test "x$enableval" = "xyes"; then :
   
-    CFLAGS="$CFLAGS -march=native -save-temps"
-    LDFLAGS="$LDFLAGS -march=native"
+    CFLAGS="$CFLAGS -O3 -march=native"
+    LDFLAGS="$LDFLAGS -O3 -march=native"
 fi
 
 fi
@@ -3373,6 +3387,276 @@ fi
 
 
 
+		@%:@ Check whether --enable-valgrind was given.
+if test "${enable_valgrind+set}" = set; then :
+  enableval=$enable_valgrind; enable_valgrind=$enableval
+else
+  enable_valgrind=no
+fi
+
+
+	if test "$enable_valgrind" != "no"; then :
+  
+		# Check for Valgrind.
+		# Extract the first word of "valgrind", so it can be a program name with args.
+set dummy valgrind; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_VALGRIND+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$VALGRIND"; then
+  ac_cv_prog_VALGRIND="$VALGRIND" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_VALGRIND="valgrind"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+VALGRIND=$ac_cv_prog_VALGRIND
+if test -n "$VALGRIND"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $VALGRIND" >&5
+$as_echo "$VALGRIND" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+		if test "$VALGRIND" = ""; then :
+  
+			if test "$enable_valgrind" = "yes"; then :
+  
+				as_fn_error $? "Could not find valgrind; either install it or reconfigure with --disable-valgrind" "$LINENO" 5
+			
+else
+  
+				enable_valgrind=no
+			
+fi
+		
+else
+  
+			enable_valgrind=yes
+		
+fi
+	
+fi
+
+	 if test "$enable_valgrind" = "yes"; then
+  VALGRIND_ENABLED_TRUE=
+  VALGRIND_ENABLED_FALSE='#'
+else
+  VALGRIND_ENABLED_TRUE='#'
+  VALGRIND_ENABLED_FALSE=
+fi
+
+	VALGRIND_ENABLED=$enable_valgrind
+
+
+	# Check for Valgrind tools we care about.
+	
+
+	if test "$VALGRIND" != ""; then :
+  
+		
+			
+			
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool memcheck" >&5
+$as_echo_n "checking for Valgrind tool memcheck... " >&6; }
+if ${ax_cv_valgrind_tool_memcheck+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+				ax_cv_valgrind_tool_memcheck=
+				if `$VALGRIND --tool=memcheck --help >/dev/null 2>&1`; then :
+  
+					ax_cv_valgrind_tool_memcheck="memcheck"
+				
+fi
+			
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_memcheck" >&5
+$as_echo "$ax_cv_valgrind_tool_memcheck" >&6; }
+
+			VALGRIND_HAVE_TOOL_memcheck=$ax_cv_valgrind_tool_memcheck
+
+		
+			
+			
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool helgrind" >&5
+$as_echo_n "checking for Valgrind tool helgrind... " >&6; }
+if ${ax_cv_valgrind_tool_helgrind+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+				ax_cv_valgrind_tool_helgrind=
+				if `$VALGRIND --tool=helgrind --help >/dev/null 2>&1`; then :
+  
+					ax_cv_valgrind_tool_helgrind="helgrind"
+				
+fi
+			
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_helgrind" >&5
+$as_echo "$ax_cv_valgrind_tool_helgrind" >&6; }
+
+			VALGRIND_HAVE_TOOL_helgrind=$ax_cv_valgrind_tool_helgrind
+
+		
+			
+			
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool drd" >&5
+$as_echo_n "checking for Valgrind tool drd... " >&6; }
+if ${ax_cv_valgrind_tool_drd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+				ax_cv_valgrind_tool_drd=
+				if `$VALGRIND --tool=drd --help >/dev/null 2>&1`; then :
+  
+					ax_cv_valgrind_tool_drd="drd"
+				
+fi
+			
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_drd" >&5
+$as_echo "$ax_cv_valgrind_tool_drd" >&6; }
+
+			VALGRIND_HAVE_TOOL_drd=$ax_cv_valgrind_tool_drd
+
+		
+			
+			
+			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Valgrind tool exp-sgcheck" >&5
+$as_echo_n "checking for Valgrind tool exp-sgcheck... " >&6; }
+if ${ax_cv_valgrind_tool_exp_sgcheck+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+				ax_cv_valgrind_tool_exp_sgcheck=
+				if `$VALGRIND --tool=exp-sgcheck --help >/dev/null 2>&1`; then :
+  
+					ax_cv_valgrind_tool_exp_sgcheck="exp-sgcheck"
+				
+fi
+			
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_valgrind_tool_exp_sgcheck" >&5
+$as_echo "$ax_cv_valgrind_tool_exp_sgcheck" >&6; }
+
+			VALGRIND_HAVE_TOOL_exp_sgcheck=$ax_cv_valgrind_tool_exp_sgcheck
+
+		
+	
+fi
+
+VALGRIND_CHECK_RULES='
+# Valgrind check
+#
+# Optional:
+#  - VALGRIND_SUPPRESSIONS_FILES: Space-separated list of Valgrind suppressions
+#    files to load. (Default: empty)
+#  - VALGRIND_FLAGS: General flags to pass to all Valgrind tools.
+#    (Default: --num-callers=30)
+#  - VALGRIND_$toolname_FLAGS: Flags to pass to Valgrind $toolname (one of:
+#    memcheck, helgrind, drd, sgcheck). (Default: various)
+
+# Optional variables
+VALGRIND_SUPPRESSIONS ?= $(addprefix --suppressions=,$(VALGRIND_SUPPRESSIONS_FILES))
+VALGRIND_FLAGS ?= --num-callers=30
+VALGRIND_memcheck_FLAGS ?= --leak-check=full --show-reachable=no
+VALGRIND_helgrind_FLAGS ?= --history-level=approx
+VALGRIND_drd_FLAGS ?=
+VALGRIND_sgcheck_FLAGS ?=
+
+# Internal use
+valgrind_tools = memcheck helgrind drd sgcheck
+valgrind_log_files = $(addprefix test-suite-,$(addsuffix .log,$(valgrind_tools)))
+
+valgrind_memcheck_flags = --tool=memcheck $(VALGRIND_memcheck_FLAGS)
+valgrind_helgrind_flags = --tool=helgrind $(VALGRIND_helgrind_FLAGS)
+valgrind_drd_flags = --tool=drd $(VALGRIND_drd_FLAGS)
+valgrind_sgcheck_flags = --tool=exp-sgcheck $(VALGRIND_sgcheck_FLAGS)
+
+valgrind_quiet = $(valgrind_quiet_$(V))
+valgrind_quiet_ = $(valgrind_quiet_$(AM_DEFAULT_VERBOSITY))
+valgrind_quiet_0 = --quiet
+
+# Support running with and without libtool.
+ifneq ($(LIBTOOL),)
+valgrind_lt = $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=execute
+else
+valgrind_lt =
+endif
+
+# Use recursive makes in order to ignore errors during check
+check-valgrind:
+ifeq ($(VALGRIND_ENABLED),yes)
+	-$(foreach tool,$(valgrind_tools), \
+		$(if $(VALGRIND_HAVE_TOOL_$(tool))$(VALGRIND_HAVE_TOOL_exp_$(tool)), \
+			$(MAKE) $(AM_MAKEFLAGS) -k check-valgrind-tool VALGRIND_TOOL=$(tool); \
+		) \
+	)
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+# Valgrind running
+VALGRIND_TESTS_ENVIRONMENT = \
+	$(TESTS_ENVIRONMENT) \
+	env VALGRIND=$(VALGRIND) \
+	G_SLICE=always-malloc,debug-blocks \
+	G_DEBUG=fatal-warnings,fatal-criticals,gc-friendly
+
+VALGRIND_LOG_COMPILER = \
+	$(valgrind_lt) \
+	$(VALGRIND) $(VALGRIND_SUPPRESSIONS) --error-exitcode=1 $(VALGRIND_FLAGS)
+
+check-valgrind-tool:
+ifeq ($(VALGRIND_ENABLED),yes)
+	$(MAKE) check-TESTS \
+		TESTS_ENVIRONMENT="$(VALGRIND_TESTS_ENVIRONMENT)" \
+		LOG_COMPILER="$(VALGRIND_LOG_COMPILER)" \
+		LOG_FLAGS="$(valgrind_$(VALGRIND_TOOL)_flags)" \
+		TEST_SUITE_LOG=test-suite-$(VALGRIND_TOOL).log
+else
+	@echo "Need to reconfigure with --enable-valgrind"
+endif
+
+A''M_DISTCHECK_CONFIGURE_FLAGS ?=
+A''M_DISTCHECK_CONFIGURE_FLAGS += --disable-valgrind
+
+MOSTLYCLEANFILES ?=
+MOSTLYCLEANFILES += $(valgrind_log_files)
+
+.PHONY: check-valgrind check-valgrind-tool
+'
+
+	if test "$enable_valgrind" != "yes"; then :
+  
+VALGRIND_CHECK_RULES='
+check-valgrind:
+	@echo "Need to use GNU make and reconfigure with --enable-valgrind"'
+
+fi
+	
+	
+
+
+
 DEPDIR="${am__leading_dot}deps"
 
 ac_config_commands="$ac_config_commands depfiles"
@@ -5611,6 +5895,70 @@ fi
 fi
 
 
+if test "$GCC" = "yes" ; then :
+  
+  case $host_cpu in @%:@(
+  i?86|amd64|x86_64) :
+    
+      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#if !defined(__clang__) && defined(__GNUC__) && ((__GNUC__ << 8) | __GNUC_MINOR__) < 0x403
+# error old gcc
+#endif
+int main(void) { return 0; }
+         
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  
+else
+  
+          { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -flax-vector-conversions" >&5
+$as_echo_n "checking whether C compiler accepts -flax-vector-conversions... " >&6; }
+if ${ax_cv_check_cflags___flax_vector_conversions+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -flax-vector-conversions"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___flax_vector_conversions=yes
+else
+  ax_cv_check_cflags___flax_vector_conversions=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___flax_vector_conversions" >&5
+$as_echo "$ax_cv_check_cflags___flax_vector_conversions" >&6; }
+if test "x$ax_cv_check_cflags___flax_vector_conversions" = xyes; then :
+  CFLAGS="$CFLAGS -flax-vector-conversions"
+else
+  :
+fi
+
+        
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+      
+     ;; @%:@(
+  *) :
+     ;;
+esac
+  
+fi
+
 LIBTOOL_OLD_FLAGS="$LIBTOOL_EXTRA_FLAGS"
 LIBTOOL_EXTRA_FLAGS="$LIBTOOL_EXTRA_FLAGS -version-info $SODIUM_LIBRARY_VERSION"
 @%:@ Check whether --enable-soname-versions was given.
@@ -5665,6 +6013,42 @@ else
   :
 fi
 
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--high-entropy-va" >&5
+$as_echo_n "checking whether the linker accepts -Wl,--high-entropy-va... " >&6; }
+if ${ax_cv_check_ldflags___Wl___high_entropy_va+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$LDFLAGS
+  LDFLAGS="$LDFLAGS  -Wl,--high-entropy-va"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U];if (fgets(x,1000,stdin)) puts(x)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ax_cv_check_ldflags___Wl___high_entropy_va=yes
+else
+  ax_cv_check_ldflags___Wl___high_entropy_va=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+  LDFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_ldflags___Wl___high_entropy_va" >&5
+$as_echo "$ax_cv_check_ldflags___Wl___high_entropy_va" >&6; }
+if test "x$ax_cv_check_ldflags___Wl___high_entropy_va" = xyes; then :
+  LDFLAGS="$LDFLAGS -Wl,--high-entropy-va"
+else
+  :
+fi
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the linker accepts -Wl,--nxcompat" >&5
 $as_echo_n "checking whether the linker accepts -Wl,--nxcompat... " >&6; }
 if ${ax_cv_check_ldflags___Wl___nxcompat+:} false; then :
@@ -5794,41 +6178,6 @@ esac
 
 fi
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Winit-self" >&5
-$as_echo_n "checking whether C compiler accepts -Winit-self... " >&6; }
-if ${ax_cv_check_cflags___Winit_self+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  -Winit-self"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  ax_cv_check_cflags___Winit_self=yes
-else
-  ax_cv_check_cflags___Winit_self=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___Winit_self" >&5
-$as_echo "$ax_cv_check_cflags___Winit_self" >&6; }
-if test "x$ax_cv_check_cflags___Winit_self" = xyes; then :
-  CFLAGS="$CFLAGS -Winit-self"
-else
-  :
-fi
-
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -Wwrite-strings" >&5
 $as_echo_n "checking whether C compiler accepts -Wwrite-strings... " >&6; }
 if ${ax_cv_check_cflags___Wwrite_strings+:} false; then :
@@ -6188,15 +6537,15 @@ else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wchar-subscripts" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wchar-subscripts" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wchar-subscripts... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wduplicated-cond" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wduplicated-cond" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wduplicated-cond... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wchar-subscripts"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wduplicated-cond"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6220,44 +6569,7 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wchar-subscripts"
-else
-  :
-fi
-
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wcomment" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wcomment" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wcomment... " >&6; }
-if eval \${$as_CACHEVAR+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  
-  ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wcomment"
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <stdio.h>
-int
-main ()
-{
-char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-  eval "$as_CACHEVAR=yes"
-else
-  eval "$as_CACHEVAR=no"
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  CFLAGS=$ax_check_save_flags
-fi
-eval ac_res=\$$as_CACHEVAR
-	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
-$as_echo "$ac_res" >&6; }
-if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wcomment"
+  CWFLAGS="$CWFLAGS -Wduplicated-cond"
 else
   :
 fi
@@ -6336,15 +6648,15 @@ else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wimplicit" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wimplicit" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wimplicit... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wmissing-declarations" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wmissing-declarations" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wmissing-declarations... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wimplicit"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wmissing-declarations"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6368,20 +6680,20 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wimplicit"
+  CWFLAGS="$CWFLAGS -Wmissing-declarations"
 else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wmissing-declarations" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wmissing-declarations" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wmissing-declarations... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wmissing-prototypes" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wmissing-prototypes" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wmissing-prototypes... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wmissing-declarations"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wmissing-prototypes"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6405,20 +6717,20 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wmissing-declarations"
+  CWFLAGS="$CWFLAGS -Wmissing-prototypes"
 else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wmissing-prototypes" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wmissing-prototypes" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wmissing-prototypes... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wnested-externs" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wnested-externs" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wnested-externs... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wmissing-prototypes"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wnested-externs"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6442,20 +6754,20 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wmissing-prototypes"
+  CWFLAGS="$CWFLAGS -Wnested-externs"
 else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wnormalized=id" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wnormalized=id" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wnormalized=id... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wno-unknown-pragmas" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wno-unknown-pragmas" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wno-unknown-pragmas... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wnormalized=id"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wno-unknown-pragmas"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6479,20 +6791,20 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wnormalized=id"
+  CWFLAGS="$CWFLAGS -Wno-unknown-pragmas"
 else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Woverride-init" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Woverride-init" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Woverride-init... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wnormalized=id" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wnormalized=id" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wnormalized=id... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Woverride-init"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wnormalized=id"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6516,20 +6828,20 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Woverride-init"
+  CWFLAGS="$CWFLAGS -Wnormalized=id"
 else
   :
 fi
 
-as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wparentheses" | $as_tr_sh`
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wparentheses" >&5
-$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wparentheses... " >&6; }
+as_CACHEVAR=`$as_echo "ax_cv_check_cflags__$CWFLAGS -Wnull-dereference" | $as_tr_sh`
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts $CWFLAGS -Wnull-dereference" >&5
+$as_echo_n "checking whether C compiler accepts $CWFLAGS -Wnull-dereference... " >&6; }
 if eval \${$as_CACHEVAR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   
   ax_check_save_flags=$CFLAGS
-  CFLAGS="$CFLAGS  $CWFLAGS -Wparentheses"
+  CFLAGS="$CFLAGS  $CWFLAGS -Wnull-dereference"
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 #include <stdio.h>
@@ -6553,7 +6865,7 @@ eval ac_res=\$$as_CACHEVAR
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 if eval test \"x\$"$as_CACHEVAR"\" = x"yes"; then :
-  CWFLAGS="$CWFLAGS -Wparentheses"
+  CWFLAGS="$CWFLAGS -Wnull-dereference"
 else
   :
 fi
@@ -14703,7 +15015,8 @@ fi
 int
 main ()
 {
- __m128d x = _mm_setzero_pd(); 
+ __m128d x = _mm_setzero_pd();
+       __m128i y = _mm_srli_epi64(_mm_setzero_si128(), 26); 
   ;
   return 0;
 }
@@ -15150,6 +15463,106 @@ else
   :
 fi
 
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS="$oldcflags"
+
+  oldcflags="$CFLAGS"
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx2" >&5
+$as_echo_n "checking whether C compiler accepts -mavx2... " >&6; }
+if ${ax_cv_check_cflags___mavx2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -mavx2"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___mavx2=yes
+else
+  ax_cv_check_cflags___mavx2=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx2" >&5
+$as_echo "$ax_cv_check_cflags___mavx2" >&6; }
+if test "x$ax_cv_check_cflags___mavx2" = xyes; then :
+  CFLAGS="$CFLAGS -mavx2"
+else
+  :
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX2 instructions set" >&5
+$as_echo_n "checking for AVX2 instructions set... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#pragma GCC target("avx2")
+#include <immintrin.h>
+
+int
+main ()
+{
+ __m256i x = _mm256_abs_epi8(_mm256_setzero_si256()); 
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+     
+$as_echo "@%:@define HAVE_AVX2INTRIN_H 1" >>confdefs.h
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx2" >&5
+$as_echo_n "checking whether C compiler accepts -mavx2... " >&6; }
+if ${ax_cv_check_cflags___mavx2+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -mavx2"
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <stdio.h>
+int
+main ()
+{
+char x[42U], fodder = 0;if (fodder > -1000 && fgets(x,1000,stdin)) puts(x)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ax_cv_check_cflags___mavx2=yes
+else
+  ax_cv_check_cflags___mavx2=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  CFLAGS=$ax_check_save_flags
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ax_cv_check_cflags___mavx2" >&5
+$as_echo "$ax_cv_check_cflags___mavx2" >&6; }
+if test "x$ax_cv_check_cflags___mavx2" = xyes; then :
+  CFLAGS_AVX="-mavx2"
+else
+  :
+fi
+
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15341,6 +15754,8 @@ fi
 
 
 
+
+
 for ac_header in sys/mman.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "sys/mman.h" "ac_cv_header_sys_mman_h" "$ac_includes_default"
@@ -15397,6 +15812,13 @@ _ACEOF
     ;;
 esac
 
+case $host_cpu in @%:@(
+  i?86|amd64|x86_64) :
+    ac_cv_c_bigendian=no
+ ;; @%:@(
+  *) :
+     ;;
+esac
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether byte ordering is bigendian" >&5
 $as_echo_n "checking whether byte ordering is bigendian... " >&6; }
 if ${ac_cv_c_bigendian+:} false; then :
@@ -15615,11 +16037,11 @@ $as_echo "@%:@define NATIVE_BIG_ENDIAN 1" >>confdefs.h
 $as_echo "@%:@define NATIVE_LITTLE_ENDIAN 1" >>confdefs.h
  ;; #(
    universal)
-     as_fn_error $? "universal endianess is not supported - compile separately and use lipo(1)" "$LINENO" 5
+     as_fn_error $? "universal endianness is not supported - compile separately and use lipo(1)" "$LINENO" 5
 
      ;; #(
    *)
-     as_fn_error $? "unknown endianess" "$LINENO" 5 ;;
+     as_fn_error $? "unknown endianness" "$LINENO" 5 ;;
  esac
 
 
@@ -15861,6 +16283,94 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
 fi
 
 
+asm_hide_symbol="unsupported"
+if test "$enable_asm" != "no"; then :
+  
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the .private_extern asm directive is supported" >&5
+$as_echo_n "checking if the .private_extern asm directive is supported... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ 
+int
+main ()
+{
+
+__asm__ __volatile__ (".private_extern dummy_symbol \n"
+                      ".private_extern _dummy_symbol \n"
+                      ".globl dummy_symbol \n"
+                      ".globl _dummy_symbol \n"
+                      "dummy_symbol: \n"
+                      "_dummy_symbol: \n"
+                      "    nop \n"
+);
+  
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+   asm_hide_symbol=".private_extern"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the .hidden asm directive is supported" >&5
+$as_echo_n "checking if the .hidden asm directive is supported... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+ 
+int
+main ()
+{
+
+__asm__ __volatile__ (".hidden dummy_symbol \n"
+                      ".hidden _dummy_symbol \n"
+                      ".globl dummy_symbol \n"
+                      ".globl _dummy_symbol \n"
+                      "dummy_symbol: \n"
+                      "_dummy_symbol: \n"
+                      "    nop \n"
+);
+  
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+   if test "$asm_hide_symbol" = "unsupported"; then :
+  asm_hide_symbol=".hidden"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: unable to reliably tag symbols as private" >&5
+$as_echo "$as_me: unable to reliably tag symbols as private" >&6;}
+           asm_hide_symbol="unsupported"
+fi
+  
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+
+  if test "$asm_hide_symbol" != "unsupported"; then :
+  
+    
+cat >>confdefs.h <<_ACEOF
+@%:@define ASM_HIDE_SYMBOL $asm_hide_symbol
+_ACEOF
+
+  
+fi
+
+fi
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if weak symbols are supported" >&5
 $as_echo_n "checking if weak symbols are supported... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15895,7 +16405,7 @@ rm -f core conftest.err conftest.$ac_objext \
 $as_echo_n "checking if data alignment is required... " >&6; }
 aligned_access_required=yes
 case $host_cpu in @%:@(
-  i*86 | x86_64 | powerpc* | s390*) :
+  i?86|amd64|x86_64|powerpc*|s390*) :
     aligned_access_required=no ;; @%:@(
   arm*) :
     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -15980,7 +16490,7 @@ TEST_LDFLAGS=''
 if test "x$EMSCRIPTEN" != "x"; then :
   
   EXEEXT=.js
-  TEST_LDFLAGS='--memory-init-file 0 --pre-js pre.js.inc -s NO_BROWSER=1 -s RESERVED_FUNCTION_POINTERS=8'
+  TEST_LDFLAGS='--memory-init-file 0 --pre-js pre.js.inc -s RESERVED_FUNCTION_POINTERS=8'
 
 fi
 
@@ -16524,6 +17034,10 @@ if test -z "${MINIMAL_TRUE}" && test -z "${MINIMAL_FALSE}"; then
   as_fn_error $? "conditional \"MINIMAL\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${VALGRIND_ENABLED_TRUE}" && test -z "${VALGRIND_ENABLED_FALSE}"; then
+  as_fn_error $? "conditional \"VALGRIND_ENABLED\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16953,7 +17467,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 1.0.8, which was
+This file was extended by libsodium $as_me 1.0.9, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -17011,7 +17525,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 1.0.8
+libsodium config.status 1.0.9
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"