rbnacl-libsodium 1.0.1 → 1.0.2

data/vendor/libsodium/dist-build/Makefile.am

@@ -2,6 +2,7 @@
 EXTRA_DIST = \
 	android-build.sh \
 	android-arm.sh \
+	android-armv7.sh \
 	android-x86.sh \
 	android-mips.sh \
 	emscripten.sh \

data/vendor/libsodium/dist-build/Makefile.in

@@ -190,6 +190,7 @@ SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
+TEST_LDFLAGS = @TEST_LDFLAGS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@
@@ -246,6 +247,7 @@ top_srcdir = @top_srcdir@
 EXTRA_DIST = \
 	android-build.sh \
 	android-arm.sh \
+	android-armv7.sh \
 	android-x86.sh \
 	android-mips.sh \
 	emscripten.sh \

data/vendor/libsodium/dist-build/emscripten.sh

@@ -1,14 +1,52 @@
 #! /bin/sh
 
+export MAKE_FLAGS='-j4'
 export PREFIX="$(pwd)/libsodium-js"
-export EXPORTED_FUNCTIONS='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_keybytes","_crypto_aead_chacha20poly1305_npubbytes","_crypto_aead_chacha20poly1305_nsecbytes","_crypto_auth","_crypto_auth_bytes","_crypto_auth_keybytes","_crypto_auth_verify","_crypto_box","_crypto_box_detached","_crypto_box_easy","_crypto_box_keypair","_crypto_box_macbytes","_crypto_box_noncebytes","_crypto_box_open","_crypto_box_open_detached","_crypto_box_open_easy","_crypto_box_publickeybytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_generichash","_crypto_generichash_bytes","_crypto_generichash_bytes_max","_crypto_generichash_bytes_min","_crypto_generichash_final","_crypto_generichash_init","_crypto_generichash_keybytes","_crypto_generichash_keybytes_max","_crypto_generichash_keybytes_min","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_scalarbytes","_crypto_secretbox","_crypto_secretbox_detached","_crypto_secretbox_easy","_crypto_secretbox_keybytes","_crypto_secretbox_macbytes","_crypto_secretbox_noncebytes","_crypto_secretbox_open","_crypto_secretbox_open_detached","_crypto_secretbox_open_easy","_crypto_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_randombytes","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_set_implementation","_randombytes_stir","_randombytes_sysrandom","_randombytes_sysrandom_buf","_randombytes_sysrandom_close","_randombytes_sysrandom_stir","_randombytes_sysrandom_uniform","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_memcmp","_sodium_memzero","_sodium_version_string"]'
+export EXPORTED_FUNCTIONS='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_keybytes","_crypto_aead_chacha20poly1305_npubbytes","_crypto_aead_chacha20poly1305_nsecbytes","_crypto_auth","_crypto_auth_bytes","_crypto_auth_keybytes","_crypto_auth_verify","_crypto_box_beforenm","_crypto_box_beforenmbytes","_crypto_box_detached","_crypto_box_detached_afternm","_crypto_box_easy","_crypto_box_easy_afternm","_crypto_box_keypair","_crypto_box_macbytes","_crypto_box_noncebytes","_crypto_box_open_detached","_crypto_box_open_detached_afternm","_crypto_box_open_easy","_crypto_box_open_easy_afternm","_crypto_box_publickeybytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_generichash","_crypto_generichash_bytes","_crypto_generichash_bytes_max","_crypto_generichash_bytes_min","_crypto_generichash_final","_crypto_generichash_init","_crypto_generichash_keybytes","_crypto_generichash_keybytes_max","_crypto_generichash_keybytes_min","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_pwhash_scryptsalsa208sha256","_crypto_pwhash_scryptsalsa208sha256_memlimit_interactive","_crypto_pwhash_scryptsalsa208sha256_memlimit_sensitive","_crypto_pwhash_scryptsalsa208sha256_opslimit_interactive","_crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive","_crypto_pwhash_scryptsalsa208sha256_saltbytes","_crypto_pwhash_scryptsalsa208sha256_str","_crypto_pwhash_scryptsalsa208sha256_str_verify","_crypto_pwhash_scryptsalsa208sha256_strbytes","_crypto_pwhash_scryptsalsa208sha256_strprefix","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_scalarbytes","_crypto_secretbox_detached","_crypto_secretbox_easy","_crypto_secretbox_keybytes","_crypto_secretbox_macbytes","_crypto_secretbox_noncebytes","_crypto_secretbox_open_detached","_crypto_secretbox_open_easy","_crypto_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_set_implementation","_randombytes_stir","_randombytes_sysrandom","_randombytes_sysrandom_buf","_randombytes_sysrandom_close","_randombytes_sysrandom_stir","_randombytes_sysrandom_uniform","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_memcmp","_sodium_memzero","_sodium_version_string"]'
 export TOTAL_MEMORY=33554432
-export OPTFLAGS="--llvm-lto 1 -Oz --emit-symbol-map"
-export CFLAGS="$OPTFLAGS --pre-js=test/default/pre.js "
-export LDFLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS} -s TOTAL_MEMORY=${TOTAL_MEMORY}"
-
-emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" && \
-emmake make clean &&
-emmake make install &&
-emcc --closure 1 $OPTFLAGS $LDFLAGS \
-  "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js"
+export JS_EXPORTS_FLAGS="-s EXPORTED_FUNCTIONS=${EXPORTED_FUNCTIONS}"
+export LDFLAGS="-s TOTAL_MEMORY=${TOTAL_MEMORY}"
+
+rm -f test/js.done
+
+emconfigure ./configure --enable-minimal --disable-shared --prefix="$PREFIX" \
+  CFLAGS="-O3" && \
+emmake make clean && \
+emmake make $MAKE_FLAGS install V=1 && \
+emcc -O3 --closure 1 --llvm-lto 1 $LDFLAGS $JS_EXPORTS_FLAGS \
+  "${PREFIX}/lib/libsodium.a" -o "${PREFIX}/lib/libsodium.js" || exit 1
+
+if test "x$NODE" = x; then
+  for candidate in iojs node nodejs; do
+    case $($candidate --version 2>&1) in #(
+      v*)
+        NODE=$candidate
+        break ;;
+    esac
+  done
+fi
+
+if test "x$NODE" = x; then
+  echo 'io.js / node.js not found - test suite skipped.' >&2
+  exit 1
+fi
+
+echo "Using [${NODE}] as a Javascript runtime."
+
+echo 'Compiling the test suite...' && \
+emmake make $MAKE_FLAGS check > /dev/null 2>&1
+
+echo 'Running the test suite.'
+echo 'sodium_utils2 and sodium_utils3 are expected to fail in Javascript.'
+(
+  cd test/default && \
+  for file in *.js; do
+    echo "#! /usr/bin/env ${NODE}" > "${file}.tmp"
+    fgrep -v '#! /usr/bin/env node' "$file" >> "${file}.tmp"
+    chmod +x "${file}.tmp"
+    mv -f "${file}.tmp" "$file"
+  done
+)
+make $MAKE_FLAGS check || exit 1
+echo 'Done.'
+touch -r "${PREFIX}/lib/libsodium.js" test/js.done

data/vendor/libsodium/dist-build/ios.sh

@@ -1,18 +1,70 @@
 #! /bin/sh
+#
+#  Step 1.
+#  Configure for base system so simulator is covered
+#  
+#  Step 2.
+#  Make for iOS armv7, armv7s and arm64
+#
+#  Step 3.
+#  Merge libs into final version for xcode import
 
+export PREFIX="$(pwd)/libsodium-ios"
+export IOS_PREFIX="$PREFIX/tmp/ios"
+export OSX32_PREFIX="$PREFIX/tmp/osx32"
+export OSX64_PREFIX="$PREFIX/tmp/osx64"
+
+mkdir -p $IOS_PREFIX $OSX32_PREFIX $OSX64_PREFIX || exit 1
+
+# Build for OSX32 First
+export CFLAGS="-Oz -arch i386"
+./configure --disable-shared \
+            --enable-minimal \
+            --prefix="$OSX32_PREFIX" || exit 1
+
+make clean > /dev/null && make -j3 check && make -j3 install || exit 1
+
+# Cleanup
+make distclean > /dev/null
+
+# Build for OSX64 Then
+export CFLAGS="-Oz -arch x86_64"
+./configure --disable-shared \
+            --enable-minimal \
+            --prefix="$OSX64_PREFIX"
+
+make clean > /dev/null && make -j3 check && make -j3 install || exit 1
+
+# Cleanup
+make distclean > /dev/null || exit 1
+
+# Build for iOS
 export XCODEDIR=$(xcode-select -p)
 export BASEDIR="${XCODEDIR}/Platforms/iPhoneOS.platform/Developer"
 export PATH="${BASEDIR}/usr/bin:$BASEDIR/usr/sbin:$PATH"
 export SDK="${BASEDIR}/SDKs/iPhoneOS.sdk"
-export IPHONEOS_VERSION_MIN="5.1.1"
-export CFLAGS="-Oz -mthumb -arch armv7 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
-export LDFLAGS="-mthumb -arch armv7 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
-export PREFIX="$(pwd)/libsodium-ios"
+export IPHONEOS_VERSION_MIN=${IPHONEOS_VERSION_MIN-"5.1.1"}
+export CFLAGS="-Oz -mthumb -arch armv7 -arch armv7s -arch arm64 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
+export LDFLAGS="-mthumb -arch armv7 -arch armv7s -arch arm64 -isysroot ${SDK} -miphoneos-version-min=${IPHONEOS_VERSION_MIN}"
 
 ./configure --host=arm-apple-darwin10 \
             --disable-shared \
             --enable-minimal \
-            --prefix="$PREFIX" && \
-make clean && \
-make -j3 install && \
+            --prefix="$IOS_PREFIX" || exit 1
+
+make clean > /dev/null && make -j3 install || exit 1
+
+# Create universal binary and include folder
+rm -fr -- "$PREFIX/include" "$PREFIX/libsodium.a" 2> /dev/null
+mkdir -p -- "$PREFIX"
+lipo -create "$IOS_PREFIX/lib/libsodium.a" "$OSX32_PREFIX/lib/libsodium.a" "$OSX64_PREFIX/lib/libsodium.a" -output "$PREFIX/libsodium.a"
+mv -f -- "$IOS_PREFIX/include" "$PREFIX/"
+
+echo
 echo "libsodium has been installed into $PREFIX"
+echo
+file -- "$PREFIX/libsodium.a"
+
+# Cleanup
+rm -rf -- "$PREFIX/tmp"
+make distclean > /dev/null

data/vendor/libsodium/libsodium-uninstalled.pc.in

@@ -0,0 +1,6 @@
+Name: @PACKAGE_NAME@
+Version: @PACKAGE_VERSION@
+Description: A portable, cross-compilable, installable, packageable fork of NaCl, with a compatible API.
+
+Libs: -L${pcfiledir}/src/libsodium -lsodium
+Cflags: -I${pcfiledir}/src/libsodium/include

data/vendor/libsodium/msvc-scripts/Makefile.in

@@ -190,6 +190,7 @@ SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
+TEST_LDFLAGS = @TEST_LDFLAGS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

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

@@ -1,4 +1,4 @@
-cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.1/ < src\libsodium\include\sodium\version.h.in > tmp
+cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.2/ < src\libsodium\include\sodium\version.h.in > tmp
 cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MAJOR@/7/ < tmp > tmp2
-cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/3/ < tmp2 > src\libsodium\include\sodium\version.h
+cscript msvc-scripts/rep.vbs //Nologo s/@SODIUM_LIBRARY_VERSION_MINOR@/4/ < tmp2 > src\libsodium\include\sodium\version.h
 del tmp tmp2

data/vendor/libsodium/msvc-scripts/sodium.props

@@ -12,13 +12,13 @@
       <PreprocessorDefinitions>inline=__inline;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <PreBuildEvent>
-      <Command>$(SolutionDir)/msvc-scripts/process.bat</Command>
+      <Command>"$(SolutionDir)/msvc-scripts/process.bat"</Command>
     </PreBuildEvent>
     <PreBuildEvent>
       <Message>Process .in files</Message>
     </PreBuildEvent>
     <PostBuildEvent>
-      <Command>$(SolutionDir)/test/default/wintest.bat $(Configuration) $(Platform)</Command>
+      <Command>"$(SolutionDir)/test/default/wintest.bat" $(Configuration) $(Platform)</Command>
     </PostBuildEvent>
     <PostBuildEvent>
       <Message>Run the test suite</Message>

data/vendor/libsodium/src/Makefile.in

@@ -250,6 +250,7 @@ SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
+TEST_LDFLAGS = @TEST_LDFLAGS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

data/vendor/libsodium/src/libsodium/Makefile.in

@@ -757,6 +757,7 @@ SODIUM_LIBRARY_VERSION = @SODIUM_LIBRARY_VERSION@
 SODIUM_LIBRARY_VERSION_MAJOR = @SODIUM_LIBRARY_VERSION_MAJOR@
 SODIUM_LIBRARY_VERSION_MINOR = @SODIUM_LIBRARY_VERSION_MINOR@
 STRIP = @STRIP@
+TEST_LDFLAGS = @TEST_LDFLAGS@
 VERSION = @VERSION@
 abs_builddir = @abs_builddir@
 abs_srcdir = @abs_srcdir@

data/vendor/libsodium/src/libsodium/crypto_box/crypto_box_easy.c

@@ -7,6 +7,14 @@
 #include "crypto_secretbox.h"
 #include "utils.h"
 
+int
+crypto_box_detached_afternm(unsigned char *c, unsigned char *mac,
+                            const unsigned char *m, unsigned long long mlen,
+                            const unsigned char *n, const unsigned char *k)
+{
+    return crypto_secretbox_detached(c, mac, m, mlen, n, k);
+}
+
 int
 crypto_box_detached(unsigned char *c, unsigned char *mac,
                     const unsigned char *m, unsigned long long mlen,
@@ -19,12 +27,24 @@ crypto_box_detached(unsigned char *c, unsigned char *mac,
     (void) sizeof(int[crypto_box_BEFORENMBYTES >=
                       crypto_secretbox_KEYBYTES ? 1 : -1]);
     crypto_box_beforenm(k, pk, sk);
-    ret = crypto_secretbox_detached(c, mac, m, mlen, n, k);
+    ret = crypto_box_detached_afternm(c, mac, m, mlen, n, k);
     sodium_memzero(k, sizeof k);
 
     return ret;
 }
 
+int
+crypto_box_easy_afternm(unsigned char *c, const unsigned char *m,
+                        unsigned long long mlen, const unsigned char *n,
+                        const unsigned char *k)
+{
+    if (mlen > SIZE_MAX - crypto_box_MACBYTES) {
+        return -1;
+    }
+    return crypto_box_detached_afternm(c + crypto_box_MACBYTES, c, m, mlen, n,
+                                       k);
+}
+
 int
 crypto_box_easy(unsigned char *c, const unsigned char *m,
                 unsigned long long mlen, const unsigned char *n,
@@ -37,22 +57,44 @@ crypto_box_easy(unsigned char *c, const unsigned char *m,
                                pk, sk);
 }
 
+int
+crypto_box_open_detached_afternm(unsigned char *m, const unsigned char *c,
+                                 const unsigned char *mac,
+                                 unsigned long long clen, const unsigned char *n,
+                                 const unsigned char *k)
+{
+    return crypto_secretbox_open_detached(m, c, mac, clen, n, k);
+}
+
 int
 crypto_box_open_detached(unsigned char *m, const unsigned char *c,
                          const unsigned char *mac,
-                              unsigned long long clen, const unsigned char *n,
-                              const unsigned char *pk, const unsigned char *sk)
+                         unsigned long long clen, const unsigned char *n,
+                         const unsigned char *pk, const unsigned char *sk)
 {
     unsigned char k[crypto_box_BEFORENMBYTES];
     int           ret;
 
     crypto_box_beforenm(k, pk, sk);
-    ret = crypto_secretbox_open_detached(m, c, mac, clen, n, k);
+    ret = crypto_box_open_detached_afternm(m, c, mac, clen, n, k);
     sodium_memzero(k, sizeof k);
 
     return ret;
 }
 
+int
+crypto_box_open_easy_afternm(unsigned char *m, const unsigned char *c,
+                             unsigned long long clen, const unsigned char *n,
+                             const unsigned char *k)
+{
+    if (clen < crypto_box_MACBYTES) {
+        return -1;
+    }
+    return crypto_box_open_detached_afternm(m, c + crypto_box_MACBYTES, c,
+                                            clen - crypto_box_MACBYTES,
+                                            n, k);
+}
+
 int
 crypto_box_open_easy(unsigned char *m, const unsigned char *c,
                      unsigned long long clen, const unsigned char *n,

data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c

@@ -1,4 +1,5 @@
 #include "api.h"
+#include "utils.h"
 
 int crypto_box(
   unsigned char *c,
@@ -9,8 +10,13 @@ int crypto_box(
 )
 {
   unsigned char k[crypto_box_BEFORENMBYTES];
+  int           ret;
+
   crypto_box_beforenm(k,pk,sk);
-  return crypto_box_afternm(c,m,mlen,n,k);
+  ret = crypto_box_afternm(c,m,mlen,n,k);
+  sodium_memzero(k, sizeof k);
+
+  return ret;
 }
 
 int crypto_box_open(
@@ -22,6 +28,11 @@ int crypto_box_open(
 )
 {
   unsigned char k[crypto_box_BEFORENMBYTES];
+  int           ret;
+
   crypto_box_beforenm(k,pk,sk);
-  return crypto_box_open_afternm(m,c,clen,n,k);
+  ret = crypto_box_open_afternm(m,c,clen,n,k);
+  sodium_memzero(k, sizeof k);
+
+  return ret;
 }

data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c

@@ -35,7 +35,7 @@ void *
 alloc_region(escrypt_region_t * region, size_t size)
 {
 	uint8_t * base, * aligned;
-#ifdef MAP_ANON
+#if defined(MAP_ANON) && defined(HAVE_MMAP)
 	if ((base = (uint8_t *) mmap(NULL, size, PROT_READ | PROT_WRITE,
 #ifdef MAP_NOCORE
 	    MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
@@ -75,7 +75,7 @@ int
 free_region(escrypt_region_t * region)
 {
 	if (region->base) {
-#ifdef MAP_ANON
+#if defined(MAP_ANON) && defined(HAVE_MMAP)
 		if (munmap(region->base, region->size))
 			return -1; /* LCOV_EXCL_LINE */
 #else

data/vendor/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c

@@ -29,7 +29,10 @@ crypto_secretbox_detached(unsigned char *c, unsigned char *mac,
 
     crypto_core_hsalsa20(subkey, n, k, sigma);
 
-    if (c - m < mlen || c - m > -mlen) {
+    if (((uintptr_t) c >= (uintptr_t) m &&
+         (uintptr_t) c - (uintptr_t) m < mlen) ||
+        ((uintptr_t) m >= (uintptr_t) c &&
+         (uintptr_t) m - (uintptr_t) c < mlen)) {
         memmove(c, m, mlen);
         m = c;
     }
@@ -95,7 +98,10 @@ crypto_secretbox_open_detached(unsigned char *m, const unsigned char *c,
         sodium_memzero(subkey, sizeof subkey);
         return -1;
     }
-    if (m - c < clen || m - c > -clen) {
+    if (((uintptr_t) c >= (uintptr_t) m &&
+         (uintptr_t) c - (uintptr_t) m < clen) ||
+        ((uintptr_t) m >= (uintptr_t) c &&
+         (uintptr_t) m - (uintptr_t) c < clen)) {
         memmove(m, c, clen);
         c = m;
     }

data/vendor/libsodium/src/libsodium/crypto_sign/crypto_sign.c

@@ -45,27 +45,27 @@ crypto_sign_keypair(unsigned char *pk, unsigned char *sk)
 }
 
 int
-crypto_sign(unsigned char *sm, unsigned long long *smlen,
+crypto_sign(unsigned char *sm, unsigned long long *smlen_p,
             const unsigned char *m, unsigned long long mlen,
             const unsigned char *sk)
 {
-    return crypto_sign_ed25519(sm, smlen, m, mlen, sk);
+    return crypto_sign_ed25519(sm, smlen_p, m, mlen, sk);
 }
 
 int
-crypto_sign_open(unsigned char *m, unsigned long long *mlen,
+crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
                  const unsigned char *sm, unsigned long long smlen,
                  const unsigned char *pk)
 {
-    return crypto_sign_ed25519_open(m, mlen, sm, smlen, pk);
+    return crypto_sign_ed25519_open(m, mlen_p, sm, smlen, pk);
 }
 
 int
-crypto_sign_detached(unsigned char *sig, unsigned long long *siglen,
+crypto_sign_detached(unsigned char *sig, unsigned long long *siglen_p,
                      const unsigned char *m, unsigned long long mlen,
                      const unsigned char *sk)
 {
-    return crypto_sign_ed25519_detached(sig, siglen, m, mlen, sk);
+    return crypto_sign_ed25519_detached(sig, siglen_p, m, mlen, sk);
 }
 
 int

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c

@@ -46,7 +46,9 @@ int crypto_sign_ed25519_pk_to_curve25519(unsigned char *curve25519_pk,
     fe    x;
     fe    one_minus_y;
 
-    ge_frombytes_negate_vartime(&A, ed25519_pk);
+    if (ge_frombytes_negate_vartime(&A, ed25519_pk) != 0) {
+        return -1;
+    }
     fe_1(one_minus_y);
     fe_sub(one_minus_y, one_minus_y, A.Y);
     fe_invert(one_minus_y, one_minus_y);

data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c

@@ -48,23 +48,30 @@ crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
 }
 
 int
-crypto_sign_open(unsigned char *m, unsigned long long *mlen,
+crypto_sign_open(unsigned char *m, unsigned long long *mlen_p,
                  const unsigned char *sm, unsigned long long smlen,
                  const unsigned char *pk)
 {
+    unsigned long long mlen;
+
     if (smlen < 64 || smlen > SIZE_MAX) {
         goto badsig;
     }
-    if (crypto_sign_verify_detached(sm, sm + 64, smlen - 64, pk) != 0) {
-        memset(m, 0, smlen - 64);
+    mlen = smlen - 64;
+    if (crypto_sign_verify_detached(sm, sm + 64, mlen, pk) != 0) {
+        memset(m, 0, mlen);
         goto badsig;
     }
-    *mlen = smlen - 64;
-    memmove(m, sm + 64, *mlen);
+    if (mlen_p != NULL) {
+        *mlen_p = mlen;
+    }
+    memmove(m, sm + 64, mlen);
 
     return 0;
 
 badsig:
-    *mlen = 0;
+    if (mlen_p != NULL) {
+        *mlen_p = 0;
+    }
     return -1;
 }