rbnacl-libsodium 1.0.13 → 1.0.15

data/vendor/libsodium/m4/ax_check_catchable_abrt.m4

@@ -0,0 +1,57 @@
+# SYNOPSIS
+#
+#   AX_CHECK_CATCHABLE_ABRT
+#
+# DESCRIPTION
+#
+#  Check whether SIGABRT can be caught using signal handlers.
+
+#serial 1
+
+AC_DEFUN([AX_CHECK_CATCHABLE_ABRT], [dnl
+    AC_PREREQ(2.64)
+    AS_VAR_PUSHDEF([CACHEVAR], [ax_cv_check_[]_AC_LANG_ABBREV[]CATCHABLE_ABRT])dnl
+    AC_CACHE_CHECK([whether SIGABRT can be caught when using the _AC_LANG compiler], CACHEVAR, [
+        AC_RUN_IFELSE([
+            AC_LANG_PROGRAM([[
+#include <signal.h>
+#include <stdlib.h>
+
+#ifndef SIGABRT
+# error SIGABRT is not defined
+#endif
+
+static void sigabrt_handler_3(int _)
+{
+    exit(0);
+}
+
+static void sigabrt_handler_2(int _)
+{
+    signal(SIGABRT, sigabrt_handler_3);
+    abort();
+    exit(1);
+}
+
+static void sigabrt_handler_1(int _)
+{
+    signal(SIGABRT, sigabrt_handler_2);
+    abort();
+    exit(1);
+}
+            ]], [[
+signal(SIGABRT, sigabrt_handler_1);
+abort();
+exit(1);
+            ]])],
+            [AS_VAR_SET(CACHEVAR, [yes])],
+            [AS_VAR_SET(CACHEVAR, [no])],
+            [AS_VAR_SET(CACHEVAR, [unknown])]
+        )
+    ])
+    AS_VAR_IF(CACHEVAR, yes,
+        [AC_DEFINE([HAVE_CATCHABLE_ABRT], [1], [Define if SIGABRT can be caught using signal handlers])],
+        [AC_MSG_WARN([On this platform, SIGABRT cannot be caught using signal handlers.])]
+    )
+    AS_VAR_POPDEF([CACHEVAR])dnl
+])

data/vendor/libsodium/m4/ax_check_gnu_make.m4

@@ -1,5 +1,5 @@
 # ===========================================================================
-#     http://www.gnu.org/software/autoconf-archive/ax_check_gnu_make.html
+#    https://www.gnu.org/software/autoconf-archive/ax_check_gnu_make.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -61,7 +61,7 @@
 #   and this notice are preserved. This file is offered as-is, without any
 #   warranty.
 
-#serial 8
+#serial 9
 
 AC_DEFUN([AX_CHECK_GNU_MAKE],dnl
   [AC_PROG_AWK

data/vendor/libsodium/m4/ax_pthread.m4

@@ -1,5 +1,5 @@
 # ===========================================================================
-#        http://www.gnu.org/software/autoconf-archive/ax_pthread.html
+#        https://www.gnu.org/software/autoconf-archive/ax_pthread.html
 # ===========================================================================
 #
 # SYNOPSIS
@@ -67,7 +67,7 @@
 #   Public License for more details.
 #
 #   You should have received a copy of the GNU General Public License along
-#   with this program. If not, see <http://www.gnu.org/licenses/>.
+#   with this program. If not, see <https://www.gnu.org/licenses/>.
 #
 #   As a special exception, the respective Autoconf Macro's copyright owner
 #   gives unlimited permission to copy, distribute and modify the configure

data/vendor/libsodium/msvc-scripts/process.bat

@@ -1,5 +1,5 @@
-cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.13/ < src\libsodium\include\sodium\version.h.in > tmp
-cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/9/ < tmp > tmp2
-cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/5/ < tmp2 > tmp3
+cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.15/ < src\libsodium\include\sodium\version.h.in > tmp
+cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/10/ < tmp > tmp2
+cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/0/ < tmp2 > tmp3
 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_MINIMAL_DEF@// < tmp3 > src\libsodium\include\sodium\version.h
 del tmp tmp2 tmp3

data/vendor/libsodium/packaging/dotnet-core/README.md

@@ -31,15 +31,15 @@ Version numbers for the packages for .NET Core consist of three components:
   It may be necessary to release more than one package for a libsodium version,
   e.g., when adding support for a new platform or if a release contains a broken
   binary. In this case, a package revision number is added as a fourth part to
-  the libsodium version, starting at `1`. For example, `1.0.13` is the initial
-  release of the package for libsodium 1.0.13 and `1.0.13.5` is the fifth
+  the libsodium version, starting at `1`. For example, `1.0.15` is the initial
+  release of the package for libsodium 1.0.15 and `1.0.15.5` is the fifth
   revision (sixth release) of that package.
 * *pre-release label*  
   If a package is a pre-release, a label is appended to the version number in
   `-preview-##` format where `##` is the number of the pre-release, starting at
-  `01`. For example, `1.0.13-preview-01` is the first pre-release of the package
-  for libsodium 1.0.13 and `1.0.13.5-preview-02` the second pre-release of the
-  fifth revision of the package for libsodium 1.0.13.
+  `01`. For example, `1.0.15-preview-01` is the first pre-release of the package
+  for libsodium 1.0.15 and `1.0.15.5-preview-02` the second pre-release of the
+  fifth revision of the package for libsodium 1.0.15.
 
 
 **Making a release**

data/vendor/libsodium/packaging/dotnet-core/libsodium.props

@@ -2,7 +2,7 @@
 <Project>
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard1.1;net46</TargetFrameworks>
+    <TargetFramework>netstandard1.1</TargetFramework>
     <DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
     <NoBuild>true</NoBuild>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -22,12 +22,15 @@
     <MinClientVersion>4.0</MinClientVersion>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.Platforms" Version="1.0.1" />
+  </ItemGroup>
+
   <ItemGroup>
     <Content Include="LICENSE" PackagePath="" />
     <Content Include="AUTHORS" PackagePath="" />
     <Content Include="ChangeLog" PackagePath="" />
     <Content Include="runtimes\**\*.*" PackagePath="runtimes\" />
-    <Content Include="build\**\*.*" PackagePath="build\" />
   </ItemGroup>
 
 </Project>

data/vendor/libsodium/packaging/dotnet-core/prepare.py

@@ -8,8 +8,8 @@ WINDOWS = [
   # --------------------- ----------------- #
   # Runtime ID            Platform          #
   # --------------------- ----------------- #
-  ( 'win7-x64',           'x64'             ),
-  ( 'win7-x86',           'Win32'           ),
+  ( 'win-x64',            'x64'             ),
+  ( 'win-x86',            'Win32'           ),
   # --------------------- ----------------- #
 ]
 
@@ -17,9 +17,7 @@ MACOS = [
   # --------------------- ----------------- #
   # Runtime ID            Codename          #
   # --------------------- ----------------- #
-  ( 'osx.10.10-x64',      'yosemite'        ),
-  ( 'osx.10.11-x64',      'el_capitan'      ),
-  ( 'osx.10.12-x64',      'sierra'          ),
+  ( 'osx-x64',            'sierra'          ),
   # --------------------- ----------------- #
 ]
 
@@ -27,22 +25,13 @@ LINUX = [
   # --------------------- ----------------- #
   # Runtime ID            Docker Image      #
   # --------------------- ----------------- #
-  ( 'centos.7-x64',       'centos:7.1.1503' ),
-  ( 'debian.8-x64',       'debian:8.2'      ),
-  ( 'fedora.24-x64',      'fedora:24'       ),
-  ( 'fedora.25-x64',      'fedora:25'       ),
-  ( 'fedora.26-x64',      'fedora:26'       ),
-  ( 'opensuse.42.1-x64',  'opensuse:42.1'   ),
-  ( 'ubuntu.14.04-x64',   'ubuntu:trusty'   ),
-  ( 'ubuntu.16.04-x64',   'ubuntu:xenial'   ),
-  ( 'ubuntu.16.10-x64',   'ubuntu:yakkety'  ),
+  ( 'linux-x64',          'debian:stretch'  ),
   # --------------------- ----------------- #
 ]
 
 EXTRAS = [ 'LICENSE', 'AUTHORS', 'ChangeLog' ]
 
 PROPSFILE = 'libsodium.props'
-DESKTOPTARGETSFILE = 'desktop.targets'
 MAKEFILE = 'Makefile'
 BUILDDIR = 'build'
 CACHEDIR = 'cache'
@@ -64,7 +53,6 @@ class Version:
     self.projfile = os.path.join(self.builddir, '{0}.{1}.pkgproj'.format(PACKAGE, package_version))
     self.propsfile = os.path.join(self.builddir, '{0}.props'.format(PACKAGE))
     self.pkgfile = os.path.join(BUILDDIR, '{0}.{1}.nupkg'.format(PACKAGE, package_version))
-    self.desktoptargetsfile = os.path.join(self.builddir, 'build', 'net46', '{0}.targets'.format(PACKAGE))
 
 class WindowsItem:
 
@@ -182,13 +170,13 @@ def main(args):
     print('       python3 prepare.py <version>')
     print()
     print('Examples:')
-    print('       python3 prepare.py 1.0.13-preview-01')
-    print('       python3 prepare.py 1.0.13-preview-02')
-    print('       python3 prepare.py 1.0.13-preview-03')
-    print('       python3 prepare.py 1.0.13')
-    print('       python3 prepare.py 1.0.13.1-preview-01')
-    print('       python3 prepare.py 1.0.13.1')
-    print('       python3 prepare.py 1.0.13.2')
+    print('       python3 prepare.py 1.0.15-preview-01')
+    print('       python3 prepare.py 1.0.15-preview-02')
+    print('       python3 prepare.py 1.0.15-preview-03')
+    print('       python3 prepare.py 1.0.15')
+    print('       python3 prepare.py 1.0.15.1-preview-01')
+    print('       python3 prepare.py 1.0.15.1')
+    print('       python3 prepare.py 1.0.15.2')
     return 1
 
   version = Version(m.group(2), m.group(0))
@@ -212,11 +200,6 @@ def main(args):
     for item in items:
       item.make(f)
 
-    f.write('\n')
-    f.write('{0}: {1}\n'.format(version.desktoptargetsfile, DESKTOPTARGETSFILE))
-    f.write('\t@mkdir -p $(dir $@)\n')
-    f.write('\tcp -f $< $@\n')
-
     f.write('\n')
     f.write('{0}: {1}\n'.format(version.propsfile, PROPSFILE))
     f.write('\t@mkdir -p $(dir $@)\n')
@@ -237,7 +220,6 @@ def main(args):
     f.write('{0}:'.format(version.pkgfile))
     f.write(' \\\n\t\t{0}'.format(version.projfile))
     f.write(' \\\n\t\t{0}'.format(version.propsfile))
-    f.write(' \\\n\t\t{0}'.format(version.desktoptargetsfile))
     for item in items:
       f.write(' \\\n\t\t{0}'.format(item.packfile))
     f.write('\n')
@@ -246,14 +228,14 @@ def main(args):
             '-v $(abspath recipes):/io/recipes ' +
             '-v $(abspath $(dir $<)):/io/input ' +
             '-v $(abspath $(dir $@)):/io/output ' +
-            '{0} sh -x -e /io/recipes/{1} {2}\n'.format('microsoft/dotnet:1.1-sdk', 'pack', os.path.relpath(version.projfile, version.builddir)))
+            '{0} sh -x -e /io/recipes/{1} {2}\n'.format('microsoft/dotnet:2.0-sdk', 'pack', os.path.relpath(version.projfile, version.builddir)))
 
     f.write('\n')
     f.write('test: {0}\n'.format(version.pkgfile))
     f.write('\t{0} run --rm '.format(DOCKER) +
             '-v $(abspath recipes):/io/recipes ' +
             '-v $(abspath $(dir $<)):/io/packages ' +
-            '{0} sh -x -e /io/recipes/{1} "{2}"\n'.format('microsoft/dotnet:1.1-sdk', 'test', version.package_version))
+            '{0} sh -x -e /io/recipes/{1} "{2}"\n'.format('microsoft/dotnet:2.0-sdk', 'test', version.package_version))
 
   print('prepared', MAKEFILE, 'to make', version.pkgfile, 'for libsodium', version.libsodium_version)
   return 0

data/vendor/libsodium/packaging/dotnet-core/recipes/linux-x64

@@ -0,0 +1,4 @@
+apt-get update
+apt-get install -y --no-install-recommends build-essential
+
+. $(dirname $0)/build

data/vendor/libsodium/packaging/nuget/package.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- These values are populated into the package.gsl templates by package.bat. -->
 <!-- The target attribute controls path and file name only, id controls package naming. -->
-<package id="libsodium_vc120" target="libsodium" version = "1.0.12.0" pathversion="1_0_12_0" platformtoolset="v120" />
+<package id="libsodium_vc120" target="libsodium" version = "1.0.15.0" pathversion="1_0_15_0" platformtoolset="v120" />

data/vendor/libsodium/src/libsodium/Makefile.am

@@ -62,6 +62,7 @@ libsodium_la_SOURCES = \
 	crypto_secretbox/crypto_secretbox.c \
 	crypto_secretbox/crypto_secretbox_easy.c \
 	crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c \
+	crypto_secretstream/xchacha20poly1305/secretstream_xchacha20poly1305.c \
 	crypto_shorthash/crypto_shorthash.c \
 	crypto_shorthash/siphash24/shorthash_siphash24.c \
 	crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c \
@@ -87,6 +88,7 @@ libsodium_la_SOURCES = \
 	include/sodium/private/mutex.h \
 	include/sodium/private/sse2_64_32.h \
 	randombytes/randombytes.c \
+	sodium/codecs.c \
 	sodium/core.c \
 	sodium/runtime.c \
 	sodium/utils.c \
@@ -167,16 +169,6 @@ libsodium_la_SOURCES += \
 	crypto_shorthash/siphash24/shorthash_siphashx24.c \
 	crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c \
 	crypto_sign/ed25519/ref10/obsolete.c \
-	crypto_stream/aes128ctr/nacl/afternm_aes128ctr.c \
-	crypto_stream/aes128ctr/nacl/beforenm_aes128ctr.c \
-	crypto_stream/aes128ctr/nacl/common.h \
-	crypto_stream/aes128ctr/nacl/consts.h \
-	crypto_stream/aes128ctr/nacl/consts_aes128ctr.c \
-	crypto_stream/aes128ctr/nacl/int128.h \
-	crypto_stream/aes128ctr/nacl/int128_aes128ctr.c \
-	crypto_stream/aes128ctr/nacl/stream_aes128ctr_nacl.c \
-	crypto_stream/aes128ctr/nacl/xor_afternm_aes128ctr.c \
-	crypto_stream/aes128ctr/stream_aes128ctr.c \
 	crypto_stream/salsa2012/ref/stream_salsa2012_ref.c \
 	crypto_stream/salsa2012/stream_salsa2012.c \
 	crypto_stream/salsa208/ref/stream_salsa208_ref.c \
@@ -206,8 +198,8 @@ endif
 SUBDIRS = \
 	include
 
-libsodium_la_LIBADD = libaesni.la libsse2.la libssse3.la libsse41.la libavx2.la
-noinst_LTLIBRARIES =  libaesni.la libsse2.la libssse3.la libsse41.la libavx2.la
+libsodium_la_LIBADD = libaesni.la libsse2.la libssse3.la libsse41.la libavx2.la libavx512f.la
+noinst_LTLIBRARIES =  libaesni.la libsse2.la libssse3.la libsse41.la libavx2.la libavx512f.la
 
 libaesni_la_LDFLAGS = $(libsodium_la_LDFLAGS)
 libaesni_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \
@@ -273,3 +265,10 @@ libavx2_la_SOURCES = \
 	crypto_stream/salsa20/xmm6int/u1.h \
 	crypto_stream/salsa20/xmm6int/u4.h \
 	crypto_stream/salsa20/xmm6int/u8.h
+
+libavx512f_la_LDFLAGS = $(libsodium_la_LDFLAGS)
+libavx512f_la_CPPFLAGS = $(libsodium_la_CPPFLAGS) \
+	@CFLAGS_SSE2@ @CFLAGS_SSSE3@ @CFLAGS_SSE41@ @CFLAGS_AVX@ @CFLAGS_AVX2@ @CFLAGS_AVX512F@
+libavx512f_la_SOURCES = \
+	crypto_pwhash/argon2/argon2-fill-block-avx512f.c \
+	crypto_pwhash/argon2/blamka-round-avx512f.h

data/vendor/libsodium/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c

@@ -10,6 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include "core.h"
 #include "crypto_aead_aes256gcm.h"
 #include "export.h"
 #include "private/common.h"
@@ -523,8 +524,8 @@ crypto_aead_aes256gcm_encrypt_detached_afternm(unsigned char *c,
 
     (void) nsec;
     memcpy(H, ctx->H, sizeof H);
-    if (mlen > 16ULL * ((1ULL << 32) - 2)) {
-        abort(); /* LCOV_EXCL_LINE */
+    if (mlen > crypto_aead_aes256gcm_MESSAGEBYTES_MAX) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
     }
     memcpy(&n2[0], npub, 3 * 4);
     n2[3] = 0x01000000;
@@ -661,8 +662,8 @@ crypto_aead_aes256gcm_decrypt_detached_afternm(unsigned char *m, unsigned char *
     CRYPTO_ALIGN(16) unsigned char fb[16];
 
     (void) nsec;
-    if (clen > 16ULL * (1ULL << 32)) {
-        abort(); /* LCOV_EXCL_LINE */
+    if (clen > crypto_aead_aes256gcm_MESSAGEBYTES_MAX) {
+        sodium_misuse(); /* LCOV_EXCL_LINE */
     }
     mlen = clen;
 
@@ -1057,6 +1058,12 @@ crypto_aead_aes256gcm_statebytes(void)
     return (sizeof(crypto_aead_aes256gcm_state) + (size_t) 15U) & ~(size_t) 15U;
 }
 
+size_t
+crypto_aead_aes256gcm_messagebytes_max(void)
+{
+    return crypto_aead_aes256gcm_MESSAGEBYTES_MAX;
+}
+
 void
 crypto_aead_aes256gcm_keygen(unsigned char k[crypto_aead_aes256gcm_KEYBYTES])
 {

data/vendor/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c

@@ -4,6 +4,7 @@
 #include <limits.h>
 #include <string.h>
 
+#include "core.h"
 #include "crypto_aead_chacha20poly1305.h"
 #include "crypto_onetimeauth_poly1305.h"
 #include "crypto_stream_chacha20.h"
@@ -69,8 +70,8 @@ crypto_aead_chacha20poly1305_encrypt(unsigned char *c,
     unsigned long long clen = 0ULL;
     int                ret;
 
-    if (mlen > UINT64_MAX - crypto_aead_chacha20poly1305_ABYTES) {
-        abort(); /* LCOV_EXCL_LINE */
+    if (mlen > crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX) {
+        sodium_misuse();
     }
     ret = crypto_aead_chacha20poly1305_encrypt_detached(c,
                                                         c + mlen, NULL,
@@ -144,8 +145,8 @@ crypto_aead_chacha20poly1305_ietf_encrypt(unsigned char *c,
     unsigned long long clen = 0ULL;
     int                ret;
 
-    if (mlen > UINT64_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES) {
-        abort(); /* LCOV_EXCL_LINE */
+    if (mlen > crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX) {
+        sodium_misuse();
     }
     ret = crypto_aead_chacha20poly1305_ietf_encrypt_detached(c,
                                                              c + mlen, NULL,
@@ -349,6 +350,12 @@ crypto_aead_chacha20poly1305_ietf_abytes(void)
     return crypto_aead_chacha20poly1305_ietf_ABYTES;
 }
 
+size_t
+crypto_aead_chacha20poly1305_ietf_messagebytes_max(void)
+{
+    return crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX;
+}
+
 void
 crypto_aead_chacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_chacha20poly1305_ietf_KEYBYTES])
 {
@@ -379,6 +386,12 @@ crypto_aead_chacha20poly1305_abytes(void)
     return crypto_aead_chacha20poly1305_ABYTES;
 }
 
+size_t
+crypto_aead_chacha20poly1305_messagebytes_max(void)
+{
+    return crypto_aead_chacha20poly1305_MESSAGEBYTES_MAX;
+}
+
 void
 crypto_aead_chacha20poly1305_keygen(unsigned char k[crypto_aead_chacha20poly1305_KEYBYTES])
 {

data/vendor/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c

@@ -4,6 +4,7 @@
 #include <limits.h>
 #include <string.h>
 
+#include "core.h"
 #include "crypto_aead_xchacha20poly1305.h"
 #include "crypto_aead_chacha20poly1305.h"
 #include "crypto_core_hchacha20.h"
@@ -53,7 +54,7 @@ crypto_aead_xchacha20poly1305_ietf_encrypt(unsigned char *c,
     int                ret;
 
     if (mlen > UINT64_MAX - crypto_aead_xchacha20poly1305_ietf_ABYTES) {
-        abort(); /* LCOV_EXCL_LINE */
+        sodium_misuse();
     }
     ret = crypto_aead_xchacha20poly1305_ietf_encrypt_detached
         (c, c + mlen, NULL, m, mlen, ad, adlen, nsec, npub, k);
@@ -146,6 +147,12 @@ crypto_aead_xchacha20poly1305_ietf_abytes(void)
     return crypto_aead_xchacha20poly1305_ietf_ABYTES;
 }
 
+size_t
+crypto_aead_xchacha20poly1305_ietf_messagebytes_max(void)
+{
+    return crypto_aead_xchacha20poly1305_ietf_MESSAGEBYTES_MAX;
+}
+
 void
 crypto_aead_xchacha20poly1305_ietf_keygen(unsigned char k[crypto_aead_xchacha20poly1305_ietf_KEYBYTES])
 {