rbnacl-libsodium 1.0.6 → 1.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cdcde333b2b28626603200b223e474ce2039aef5
-  data.tar.gz: 1b2febc1624cd7f8e81feabdeb0b7c10bc1647f3
+  metadata.gz: de49dd8de2d2947416ceb29fb09ec74de8e2bec3
+  data.tar.gz: 95f084f30d80e724d8519041f65db259df0e6cab
 SHA512:
-  metadata.gz: 9e7039a422c1ec1d1b389c554f6a6f56c5f650717868c6fc7be1da0e969d26fc3793c8c9464e2bc7c48640279523382e02e6dbc38c9bbc4e274d2532a7cd1956
-  data.tar.gz: a337f4ff047d1aa001c27babd1bdd98eefbce5bd4143aa3071ec4f52a12be093e5b8af72ce2bbc62f38b5cde2f38250050130cc650220dd5d2138257d219748a
+  metadata.gz: 4e175929069435e846f23e67b7b8b5a1885f2569c023f4b08e6dd3b868f96acb5d3b8c790210c0ca24eb6921c4396997aaa99d9b03ad3a202c0b869351236205
+  data.tar.gz: e318a4946cdb63b18c6f961a8f13cb1d6e83cd77579616b6c448ce19c80fd3be2ff97cb4e25a838010f3714a2232c3d357ca38bb4e76b5b583448a0c316dc931

data/CHANGES.md

@@ -1,3 +1,7 @@
+1.0.7 (2015-12-08)
+------------------
+* Update to libsodium 1.0.7
+
 1.0.6 (2015-11-01)
 ------------------
 * Update to libsodium 1.0.6

data/lib/rbnacl/libsodium/version.rb

@@ -1,5 +1,5 @@
 module RbNaCl
   module Libsodium
-    VERSION = '1.0.6'
+    VERSION = '1.0.7'
   end
 end

data/vendor/libsodium/AUTHORS

@@ -8,7 +8,8 @@ blake2                                 Jean-Philippe Aumasson
                                        Zooko Wilcox-O'Hearn
 
 chacha20                               Daniel J. Bernstein
-salsa20
+
+salsa20                                Daniel J. Bernstein
 
 chacha20poly1305                       Adam Langley
 
@@ -56,6 +57,8 @@ crypto_scalarmult/curve25519/ref10     Daniel J. Bernstein
 
 crypto_scalarmult/curve25519/donna_c64 Adam Langley
 
+crypto_scalarmult/curve25519/sandy2x   Tung Chou
+
 crypto_secretbox/xsalsa20poly1305      Daniel J. Bernstein
 
 crypto_sign/ed25519                    Peter Schwabe
@@ -66,7 +69,9 @@ crypto_sign/ed25519                    Peter Schwabe
 
 crypto_stream/aes128ctr                Peter Schwabe
 
-crypto_stream/chacha20                 Daniel J. Bernstein
+crypto_stream/chacha20/ref             Daniel J. Bernstein
+
+crypto_stream/chacha20/vec             Ted Krovetz
 
 crypto_stream/salsa20                  Daniel J. Bernstein
 crypto_stream/salsa2012
@@ -81,7 +86,9 @@ crypto_generichash/blake2b             Jean-Philippe Aumasson
                                        Samuel Neves
                                        Zooko Wilcox-O'Hearn
 
-crypto_onetimeauth/poly1305/donna      Andrew "floodyberry" Moon.
+crypto_onetimeauth/poly1305/donna      Andrew "floodyberry" Moon
+
+crypto_onetimeauth/poly1305/sse2       Andrew "floodyberry" Moon
 
 crypto_pwhash/scryptsalsa208sha256     Colin Percival
                                        Alexander Peslyak

data/vendor/libsodium/ChangeLog

@@ -1,7 +1,25 @@
 
+* Version 1.0.7
+ - More functions whose return value should be checked have been
+tagged with `__attribute__ ((warn_unused_result))`: `crypto_box_easy()`,
+`crypto_box_detached()`, `crypto_box_beforenm()`, `crypto_box()`, and
+`crypto_scalarmult()`.
+ - Sandy2x, the fastest Curve25519 implementation ever, has been
+merged in, and is automatically used on CPUs supporting the AVX
+instructions set.
+ - An SSE2 optimized implementation of Poly1305 was added, and is
+twice as fast as the portable one.
+ - An SSSE3 optimized implementation of ChaCha20 was added, and is
+twice as fast as the portable one.
+ - Faster `sodium_increment()` for common nonce sizes.
+ - New helper functions have been added: `sodium_is_zero()` and
+ `sodium_add()`.
+ - `sodium_runtime_has_aesni()` now properly detects the CPU flag when
+ compiled using Visual Studio.
+
 * Version 1.0.6
  - Optimized implementations of Blake2 have been added for modern
-Intel platforms. crypto_generichash() is now faster than MD5 and SHA1
+Intel platforms. `crypto_generichash()` is now faster than MD5 and SHA1
 implementations while being far more secure.
  - Functions for which the return value should be checked have been
 tagged with `__attribute__ ((warn_unused_result))`. This will

data/vendor/libsodium/Makefile.in

@@ -288,6 +288,7 @@ EXEEXT = @EXEEXT@
 FGREP = @FGREP@
 GREP = @GREP@
 HAVE_AMD64_ASM_V = @HAVE_AMD64_ASM_V@
+HAVE_AVX_ASM_V = @HAVE_AVX_ASM_V@
 HAVE_CPUID_V = @HAVE_CPUID_V@
 HAVE_TI_MODE_V = @HAVE_TI_MODE_V@
 INSTALL = @INSTALL@

data/vendor/libsodium/README.markdown

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/jedisct1/libsodium.png?branch=master)](https://travis-ci.org/jedisct1/libsodium?branch=master)
+[![Build Status](https://travis-ci.org/jedisct1/libsodium.svg?branch=master)](https://travis-ci.org/jedisct1/libsodium?branch=master)
 [![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)

data/vendor/libsodium/THANKS

@@ -33,6 +33,7 @@ Project ArteMisc (@artemisc)
 Ruben De Visscher (@rubendv)
 Rudolf Von Krugstein (@rudolfvonkrugstein)
 Samuel Neves (@sneves)
+Scott Arciszewski (@paragonie-scott)
 Stefan Marsiske
 Stephan Touset (@stouset)
 Steve Gibson (@sggrc)

data/vendor/libsodium/autogen.sh

@@ -1,15 +1,35 @@
 #! /bin/sh
 
-if [ -x "`which autoreconf 2>/dev/null`" ] ; then
-  exec autoreconf -ivf
-fi
-
 if glibtoolize --version > /dev/null 2>&1; then
   LIBTOOLIZE='glibtoolize'
 else
   LIBTOOLIZE='libtoolize'
 fi
 
+if [ ! -x "`which $LIBTOOLIZE 2>/dev/null`" ] ; then
+  echo "libtool is required, but wasn't found on this system"
+  exit 1
+fi
+
+if [ ! -x "`which autoconf 2>/dev/null`" ] ; then
+  echo "autoconf is required, but wasn't found on this system"
+  exit 1
+fi
+
+if [ ! -x "`which automake 2>/dev/null`" ] ; then
+  echo "automake is required, but wasn't found on this system"
+  exit 1
+fi
+
+if [ ! -x "`which pkg-config 2>/dev/null`" ] ; then
+  echo "pkg-config is required, but wasn't found on this system"
+  exit 1
+fi
+
+if [ -x "`which autoreconf 2>/dev/null`" ] ; then
+  exec autoreconf -ivf
+fi
+
 $LIBTOOLIZE && \
 aclocal && \
 automake --add-missing --force-missing --include-deps && \

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.6.
+@%:@ Generated by GNU Autoconf 2.69 for libsodium 1.0.7.
 @%:@
 @%:@ 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.6'
-PACKAGE_STRING='libsodium 1.0.6'
+PACKAGE_VERSION='1.0.7'
+PACKAGE_STRING='libsodium 1.0.7'
 PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
 PACKAGE_URL='https://github.com/jedisct1/libsodium'
 
@@ -649,6 +649,9 @@ HAVE_CPUID_V
 HAVE_TI_MODE_V
 HAVE_TI_MODE_FALSE
 HAVE_TI_MODE_TRUE
+HAVE_AVX_ASM_V
+HAVE_AVX_ASM_FALSE
+HAVE_AVX_ASM_TRUE
 HAVE_AMD64_ASM_V
 HAVE_AMD64_ASM_FALSE
 HAVE_AMD64_ASM_TRUE
@@ -803,6 +806,7 @@ enable_blocking_random
 enable_minimal
 with_safecode
 enable_debug
+enable_opt
 enable_soname_versions
 enable_shared
 enable_static
@@ -1368,7 +1372,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.6 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1438,7 +1442,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of libsodium 1.0.6:";;
+     short | recursive ) echo "Configuration of libsodium 1.0.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1464,6 +1468,8 @@ Optional Features:
   --enable-minimal        Only compile the minimum set of functions required
                           for the high-level API
   --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-soname-versions 
                           enable soname versions (must be disabled for
                           Android) (default: enabled)
@@ -1571,7 +1577,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-libsodium configure 1.0.6
+libsodium configure 1.0.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1940,7 +1946,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.6, which was
+It was created by libsodium $as_me 1.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2876,7 +2882,7 @@ fi
 
 # Define the identity of the package.
  PACKAGE='libsodium'
- VERSION='1.0.6'
+ VERSION='1.0.7'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3171,10 +3177,10 @@ fi
 ISODATE=`date +%Y-%m-%d`
 
 
-SODIUM_LIBRARY_VERSION_MAJOR=8
+SODIUM_LIBRARY_VERSION_MAJOR=9
 SODIUM_LIBRARY_VERSION_MINOR=0
-DLL_VERSION=7
-SODIUM_LIBRARY_VERSION=17:0:0
+DLL_VERSION=8
+SODIUM_LIBRARY_VERSION=18:0:0
 #                       | | |
 #                +------+ | +---+
 #                |        |     |
@@ -3352,6 +3358,18 @@ fi
 fi
 
 
+@%:@ Check whether --enable-opt was given.
+if test "${enable_opt+set}" = set; then :
+  enableval=$enable_opt; 
+  if test "x$enableval" = "xyes"; then :
+  
+    CFLAGS="$CFLAGS -flto -march=native"
+    LDFLAGS="$LDFLAGS -flto -march=native"
+fi
+
+fi
+
+
 
 
 
@@ -15032,6 +15050,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 -mavx" >&5
+$as_echo_n "checking whether C compiler accepts -mavx... " >&6; }
+if ${ax_cv_check_cflags___mavx+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -mavx"
+  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___mavx=yes
+else
+  ax_cv_check_cflags___mavx=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___mavx" >&5
+$as_echo "$ax_cv_check_cflags___mavx" >&6; }
+if test "x$ax_cv_check_cflags___mavx" = xyes; then :
+  CFLAGS="$CFLAGS -mavx"
+else
+  :
+fi
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for AVX instructions set" >&5
+$as_echo_n "checking for AVX instructions set... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+#pragma GCC target("avx")
+#include <immintrin.h>
+
+int
+main ()
+{
+ _mm256_zeroall(); 
+  ;
+  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_AVXINTRIN_H 1" >>confdefs.h
+
+     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether C compiler accepts -mavx" >&5
+$as_echo_n "checking whether C compiler accepts -mavx... " >&6; }
+if ${ax_cv_check_cflags___mavx+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  
+  ax_check_save_flags=$CFLAGS
+  CFLAGS="$CFLAGS  -mavx"
+  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___mavx=yes
+else
+  ax_cv_check_cflags___mavx=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___mavx" >&5
+$as_echo "$ax_cv_check_cflags___mavx" >&6; }
+if test "x$ax_cv_check_cflags___mavx" = xyes; then :
+  CFLAGS_AVX="-mavx"
+else
+  :
+fi
+
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -15538,8 +15656,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 should use x86_64 asm code" >&5
-$as_echo_n "checking whether we should use x86_64 asm code... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can use x86_64 asm code" >&5
+$as_echo_n "checking whether we can use x86_64 asm code... " >&6; }
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -15556,7 +15674,13 @@ main ()
 #else
 # error !x86_64
 #endif
-__asm__("pxor %xmm12,%xmm6");
+unsigned char i = 0, o = 0, t;
+__asm__ __volatile__ ("pxor %%xmm12, %%xmm6 \n"
+                      "movb (%[i]), %[t] \n"
+                      "addb %[t], (%[o]) \n"
+                      : [t] "=&r"(t)
+                      : [o] "D"(&o), [i] "S"(&i)
+                      : "memory", "flags", "cc");
 
   ;
   return 0;
@@ -15586,27 +15710,83 @@ fi
 
 
 
+HAVE_AVX_ASM_V=0
+if test "$enable_asm" != "no"; then :
+  
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we can assemble AVX opcodes" >&5
+$as_echo_n "checking whether we can assemble AVX opcodes... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+  
+int
+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 !x86_64
+#endif
+__asm__ __volatile__ ("vpunpcklqdq %xmm0,%xmm13,%xmm0");
+
+  ;
+  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_AVX_ASM 1" >>confdefs.h
+
+   HAVE_AVX_ASM_V=1
+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
+
+fi
+ if test $HAVE_AVX_ASM_V = 1; then
+  HAVE_AVX_ASM_TRUE=
+  HAVE_AVX_ASM_FALSE='#'
+else
+  HAVE_AVX_ASM_TRUE='#'
+  HAVE_AVX_ASM_FALSE=
+fi
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for 128-bit arithmetic" >&5
 $as_echo_n "checking for 128-bit arithmetic... " >&6; }
 HAVE_TI_MODE_V=0
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-#ifndef __GNUC__
-# error mode(TI) is a gcc extension
+#if !defined(__GNUC__) && !defined(__SIZEOF_INT128__)
+# error mode(TI) is a gcc extension, and __int128 is not available
 #endif
 #if defined(__clang__) && !defined(__x86_64__)
-# error clang does not properly compile smult_curve25519_donna_c64.c
+# error clang does not properly handle the 128-bit type on 32-bit systems
 #endif
 #ifndef NATIVE_LITTLE_ENDIAN
-# error donna_c64 currently requires a little endian CPU
+# error libsodium currently expects a little endian CPU for the 128-bit type
 #endif
-#ifdef EMSCRIPTEN
+#ifdef __EMSCRIPTEN__
 # error emscripten currently supports only shift operations on integers \
 #       larger than 64 bits
 #endif
+#include <stddef.h>
 #include <stdint.h>
+#if defined(__SIZEOF_INT128__)
+typedef unsigned __int128 uint128_t;
+#else
 typedef unsigned uint128_t __attribute__((mode(TI)));
+#endif
 void fcontract(uint128_t *t) {
   *t += 0x8000000000000 - 1;
 }
@@ -15744,12 +15924,12 @@ esac
 if test "x$aligned_access_required" = "xyes"; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-   
-$as_echo "@%:@define CPU_ALIGNED_ACCESS_REQUIRED 1" >>confdefs.h
-
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
+   
+$as_echo "@%:@define CPU_UNALIGNED_ACCESS 1" >>confdefs.h
+
 fi
 
 
@@ -16356,6 +16536,10 @@ if test -z "${HAVE_AMD64_ASM_TRUE}" && test -z "${HAVE_AMD64_ASM_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_AMD64_ASM\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
+if test -z "${HAVE_AVX_ASM_TRUE}" && test -z "${HAVE_AVX_ASM_FALSE}"; then
+  as_fn_error $? "conditional \"HAVE_AVX_ASM\" was never defined.
+Usually this means the macro was only invoked conditionally." "$LINENO" 5
+fi
 if test -z "${HAVE_TI_MODE_TRUE}" && test -z "${HAVE_TI_MODE_FALSE}"; then
   as_fn_error $? "conditional \"HAVE_TI_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -16769,7 +16953,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.6, which was
+This file was extended by libsodium $as_me 1.0.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -16827,7 +17011,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.6
+libsodium config.status 1.0.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"