Hello community,
here is the log from the commit of package libsodium for openSUSE:Factory checked in at 2016-04-12 19:32:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/libsodium (Old)
and /work/SRC/openSUSE:Factory/.libsodium.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libsodium"
Changes:
--------
--- /work/SRC/openSUSE:Factory/libsodium/libsodium.changes 2016-04-03 23:07:33.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.libsodium.new/libsodium.changes 2016-04-12 19:32:33.000000000 +0200
@@ -1,0 +2,6 @@
+Tue Apr 5 13:14:08 UTC 2016 - idonmez@suse.com
+
+- Update to version 1.0.10
+ * Compile fix update for older GCCs
+
+-------------------------------------------------------------------
Old:
----
libsodium-1.0.9.tar.gz
New:
----
libsodium-1.0.10.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libsodium.spec ++++++
--- /var/tmp/diff_new_pack.3Cpfg1/_old 2016-04-12 19:32:34.000000000 +0200
+++ /var/tmp/diff_new_pack.3Cpfg1/_new 2016-04-12 19:32:34.000000000 +0200
@@ -18,7 +18,7 @@
%define lname libsodium18
Name: libsodium
-Version: 1.0.9
+Version: 1.0.10
Release: 0
Summary: Portable NaCl-based crypto library
License: ISC
++++++ libsodium-1.0.9.tar.gz -> libsodium-1.0.10.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/ChangeLog new/libsodium-1.0.10/ChangeLog
--- old/libsodium-1.0.9/ChangeLog 2016-04-02 16:43:57.000000000 +0200
+++ new/libsodium-1.0.10/ChangeLog 2016-04-04 21:47:06.000000000 +0200
@@ -1,4 +1,8 @@
+* Version 1.0.10
+ - This release only fixes a compilation issue reported with some older
+gcc versions. There are no functional changes over the previous release.
+
* Version 1.0.9
- The Javascript target now includes a `--sumo` option to include all
the symbols of the original C library.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/configure new/libsodium-1.0.10/configure
--- old/libsodium-1.0.9/configure 2016-04-02 16:46:45.000000000 +0200
+++ new/libsodium-1.0.10/configure 2016-04-04 21:45:40.000000000 +0200
@@ -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.9.
+# Generated by GNU Autoconf 2.69 for libsodium 1.0.10.
#
# Report bugs to https://github.com/jedisct1/libsodium/issues.
#
@@ -590,8 +590,8 @@
# Identity of this package.
PACKAGE_NAME='libsodium'
PACKAGE_TARNAME='libsodium'
-PACKAGE_VERSION='1.0.9'
-PACKAGE_STRING='libsodium 1.0.9'
+PACKAGE_VERSION='1.0.10'
+PACKAGE_STRING='libsodium 1.0.10'
PACKAGE_BUGREPORT='https://github.com/jedisct1/libsodium/issues'
PACKAGE_URL='https://github.com/jedisct1/libsodium'
@@ -1384,7 +1384,7 @@
# 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.9 to adapt to many kinds of systems.
+\`configure' configures libsodium 1.0.10 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1454,7 +1454,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of libsodium 1.0.9:";;
+ short | recursive ) echo "Configuration of libsodium 1.0.10:";;
esac
cat <<\_ACEOF
@@ -1591,7 +1591,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-libsodium configure 1.0.9
+libsodium configure 1.0.10
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1960,7 +1960,7 @@
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.9, which was
+It was created by libsodium $as_me 1.0.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2896,7 +2896,7 @@
# Define the identity of the package.
PACKAGE='libsodium'
- VERSION='1.0.9'
+ VERSION='1.0.10'
cat >>confdefs.h <<_ACEOF
@@ -15563,6 +15563,34 @@
:
fi
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking if _mm256_broadcastsi128_si256 is correctly defined" >&5
+$as_echo_n "checking if _mm256_broadcastsi128_si256 is correctly defined... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h. */
+
+#pragma GCC target("avx2")
+#include
+
+int
+main ()
+{
+ __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128());
+ ;
+ 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; }
+else
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+$as_echo "#define _mm256_broadcastsi128_si256 _mm_broadcastsi128_si256" >>confdefs.h
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
else
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
$as_echo "no" >&6; }
@@ -17467,7 +17495,7 @@
# 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.9, which was
+This file was extended by libsodium $as_me 1.0.10, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -17525,7 +17553,7 @@
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.9
+libsodium config.status 1.0.10
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/configure.ac new/libsodium-1.0.10/configure.ac
--- old/libsodium-1.0.9/configure.ac 2016-04-02 16:43:57.000000000 +0200
+++ new/libsodium-1.0.10/configure.ac 2016-04-04 21:39:09.000000000 +0200
@@ -1,5 +1,5 @@
AC_PREREQ([2.65])
-AC_INIT([libsodium],[1.0.9],
+AC_INIT([libsodium],[1.0.10],
[https://github.com/jedisct1/libsodium/issues],
[libsodium],
[https://github.com/jedisct1/libsodium])
@@ -379,7 +379,17 @@
]], [[ __m256i x = _mm256_abs_epi8(_mm256_setzero_si256()); ]])],
[AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_AVX2INTRIN_H], [1], [AVX2 is available])
- AX_CHECK_COMPILE_FLAG([-mavx2], [CFLAGS_AVX="-mavx2"])],
+ AX_CHECK_COMPILE_FLAG([-mavx2], [CFLAGS_AVX="-mavx2"])
+ AC_MSG_CHECKING(if _mm256_broadcastsi128_si256 is correctly defined)
+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#pragma GCC target("avx2")
+#include
+ ]], [[ __m256i y = _mm256_broadcastsi128_si256(_mm_setzero_si128()); ]])],
+ [AC_MSG_RESULT(yes)],
+ [AC_MSG_RESULT(no)
+ AC_DEFINE([_mm256_broadcastsi128_si256], [_mm_broadcastsi128_si256],
+ [Define to the local name of _mm256_broadcastsi128_si256])])
+ ],
[AC_MSG_RESULT(no)])
CFLAGS="$oldcflags"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/dist-build/emscripten.sh new/libsodium-1.0.10/dist-build/emscripten.sh
--- old/libsodium-1.0.9/dist-build/emscripten.sh 2016-04-01 21:32:55.000000000 +0200
+++ new/libsodium-1.0.10/dist-build/emscripten.sh 2016-04-04 15:30:59.000000000 +0200
@@ -4,7 +4,7 @@
export PREFIX="$(pwd)/libsodium-js"
export EXPORTED_FUNCTIONS_STANDARD='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_decrypt_detached","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_abytes","_crypto_aead_chacha20poly1305_ietf_decrypt","_crypto_aead_chacha20poly1305_ietf_decrypt_detached","_crypto_aead_chacha20poly1305_ietf_encrypt","_crypto_aead_chacha20poly1305_ietf_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_keybytes","_crypto_aead_chacha20poly1305_ietf_npubbytes","_crypto_aead_chacha20poly1305_ietf_nsecbytes","_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_seal","_crypto_box_seal_open","_crypto_box_sealbytes","_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_primitive","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_pwhash","_crypto_pwhash_alg_argon2i13","_crypto_pwhash_alg_default","_crypto_pwhash_memlimit_interactive","_crypto_pwhash_memlimit_moderate","_crypto_pwhash_memlimit_sensitive","_crypto_pwhash_opslimit_interactive","_crypto_pwhash_opslimit_moderate","_crypto_pwhash_opslimit_sensitive","_crypto_pwhash_saltbytes","_crypto_pwhash_scryptsalsa208sha256","_crypto_pwhash_scryptsalsa208sha256_ll","_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_pwhash_str","_crypto_pwhash_str_verify","_crypto_pwhash_strbytes","_crypto_pwhash_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","_randombytes_buf","_randombytes_close","_randombytes_random","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_version_string"]'
export EXPORTED_FUNCTIONS_SUMO='["_crypto_aead_chacha20poly1305_abytes","_crypto_aead_chacha20poly1305_decrypt","_crypto_aead_chacha20poly1305_decrypt_detached","_crypto_aead_chacha20poly1305_encrypt","_crypto_aead_chacha20poly1305_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_abytes","_crypto_aead_chacha20poly1305_ietf_decrypt","_crypto_aead_chacha20poly1305_ietf_decrypt_detached","_crypto_aead_chacha20poly1305_ietf_encrypt","_crypto_aead_chacha20poly1305_ietf_encrypt_detached","_crypto_aead_chacha20poly1305_ietf_keybytes","_crypto_aead_chacha20poly1305_ietf_npubbytes","_crypto_aead_chacha20poly1305_ietf_nsecbytes","_crypto_aead_chacha20poly1305_keybytes","_crypto_aead_chacha20poly1305_npubbytes","_crypto_aead_chacha20poly1305_nsecbytes","_crypto_auth","_crypto_auth_bytes","_crypto_auth_hmacsha256","_crypto_auth_hmacsha256_bytes","_crypto_auth_hmacsha256_final","_crypto_auth_hmacsha256_init","_crypto_auth_hmacsha256_keybytes","_crypto_auth_hmacsha256_statebytes","_crypto_auth_hmacsha256_update","_crypto_auth_hmacsha256_verify","_crypto_auth_hmacsha512","_crypto_auth_hmacsha512256","_crypto_auth_hmacsha512256_bytes","_crypto_auth_hmacsha512256_final","_crypto_auth_hmacsha512256_init","_crypto_auth_hmacsha512256_keybytes","_crypto_auth_hmacsha512256_statebytes","_crypto_auth_hmacsha512256_update","_crypto_auth_hmacsha512256_verify","_crypto_auth_hmacsha512_bytes","_crypto_auth_hmacsha512_final","_crypto_auth_hmacsha512_init","_crypto_auth_hmacsha512_keybytes","_crypto_auth_hmacsha512_statebytes","_crypto_auth_hmacsha512_update","_crypto_auth_hmacsha512_verify","_crypto_auth_keybytes","_crypto_auth_verify","_crypto_box","_crypto_box_afternm","_crypto_box_beforenm","_crypto_box_beforenmbytes","_crypto_box_boxzerobytes","_crypto_box_curve25519xsalsa20poly1305","_crypto_box_curve25519xsalsa20poly1305_afternm","_crypto_box_curve25519xsalsa20poly1305_beforenm","_crypto_box_curve25519xsalsa20poly1305_beforenmbytes","_crypto_box_curve25519xsalsa20poly1305_boxzerobytes","_crypto_box_curve25519xsalsa20poly1305_keypair","_crypto_box_curve25519xsalsa20poly1305_macbytes","_crypto_box_curve25519xsalsa20poly1305_noncebytes","_crypto_box_curve25519xsalsa20poly1305_open","_crypto_box_curve25519xsalsa20poly1305_open_afternm","_crypto_box_curve25519xsalsa20poly1305_publickeybytes","_crypto_box_curve25519xsalsa20poly1305_secretkeybytes","_crypto_box_curve25519xsalsa20poly1305_seed_keypair","_crypto_box_curve25519xsalsa20poly1305_seedbytes","_crypto_box_curve25519xsalsa20poly1305_zerobytes","_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","_crypto_box_open_afternm","_crypto_box_open_detached","_crypto_box_open_detached_afternm","_crypto_box_open_easy","_crypto_box_open_easy_afternm","_crypto_box_primitive","_crypto_box_publickeybytes","_crypto_box_seal","_crypto_box_seal_open","_crypto_box_sealbytes","_crypto_box_secretkeybytes","_crypto_box_seed_keypair","_crypto_box_seedbytes","_crypto_box_zerobytes","_crypto_core_hsalsa20","_crypto_core_hsalsa20_constbytes","_crypto_core_hsalsa20_inputbytes","_crypto_core_hsalsa20_keybytes","_crypto_core_hsalsa20_outputbytes","_crypto_core_salsa20","_crypto_core_salsa20_constbytes","_crypto_core_salsa20_inputbytes","_crypto_core_salsa20_keybytes","_crypto_core_salsa20_outputbytes","_crypto_generichash","_crypto_generichash_blake2b","_crypto_generichash_blake2b_bytes","_crypto_generichash_blake2b_bytes_max","_crypto_generichash_blake2b_bytes_min","_crypto_generichash_blake2b_final","_crypto_generichash_blake2b_init","_crypto_generichash_blake2b_init_salt_personal","_crypto_generichash_blake2b_keybytes","_crypto_generichash_blake2b_keybytes_max","_crypto_generichash_blake2b_keybytes_min","_crypto_generichash_blake2b_personalbytes","_crypto_generichash_blake2b_salt_personal","_crypto_generichash_blake2b_saltbytes","_crypto_generichash_blake2b_statebytes","_crypto_generichash_blake2b_update","_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_primitive","_crypto_generichash_statebytes","_crypto_generichash_update","_crypto_hash","_crypto_hash_bytes","_crypto_hash_primitive","_crypto_hash_sha256","_crypto_hash_sha256_bytes","_crypto_hash_sha256_final","_crypto_hash_sha256_init","_crypto_hash_sha256_statebytes","_crypto_hash_sha256_update","_crypto_hash_sha512","_crypto_hash_sha512_bytes","_crypto_hash_sha512_final","_crypto_hash_sha512_init","_crypto_hash_sha512_statebytes","_crypto_hash_sha512_update","_crypto_onetimeauth","_crypto_onetimeauth_bytes","_crypto_onetimeauth_final","_crypto_onetimeauth_init","_crypto_onetimeauth_keybytes","_crypto_onetimeauth_poly1305","_crypto_onetimeauth_poly1305_bytes","_crypto_onetimeauth_poly1305_final","_crypto_onetimeauth_poly1305_init","_crypto_onetimeauth_poly1305_keybytes","_crypto_onetimeauth_poly1305_update","_crypto_onetimeauth_poly1305_verify","_crypto_onetimeauth_primitive","_crypto_onetimeauth_statebytes","_crypto_onetimeauth_update","_crypto_onetimeauth_verify","_crypto_pwhash","_crypto_pwhash_alg_argon2i13","_crypto_pwhash_alg_default","_crypto_pwhash_argon2i","_crypto_pwhash_argon2i_alg_argon2i13","_crypto_pwhash_argon2i_memlimit_interactive","_crypto_pwhash_argon2i_memlimit_moderate","_crypto_pwhash_argon2i_memlimit_sensitive","_crypto_pwhash_argon2i_opslimit_interactive","_crypto_pwhash_argon2i_opslimit_moderate","_crypto_pwhash_argon2i_opslimit_sensitive","_crypto_pwhash_argon2i_saltbytes","_crypto_pwhash_argon2i_str","_crypto_pwhash_argon2i_str_verify","_crypto_pwhash_argon2i_strbytes","_crypto_pwhash_argon2i_strprefix","_crypto_pwhash_memlimit_interactive","_crypto_pwhash_memlimit_moderate","_crypto_pwhash_memlimit_sensitive","_crypto_pwhash_opslimit_interactive","_crypto_pwhash_opslimit_moderate","_crypto_pwhash_opslimit_sensitive","_crypto_pwhash_primitive","_crypto_pwhash_saltbytes","_crypto_pwhash_scryptsalsa208sha256","_crypto_pwhash_scryptsalsa208sha256_ll","_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_pwhash_str","_crypto_pwhash_str_verify","_crypto_pwhash_strbytes","_crypto_pwhash_strprefix","_crypto_scalarmult","_crypto_scalarmult_base","_crypto_scalarmult_bytes","_crypto_scalarmult_curve25519","_crypto_scalarmult_curve25519_base","_crypto_scalarmult_curve25519_bytes","_crypto_scalarmult_curve25519_scalarbytes","_crypto_scalarmult_primitive","_crypto_scalarmult_scalarbytes","_crypto_secretbox","_crypto_secretbox_boxzerobytes","_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_secretbox_primitive","_crypto_secretbox_xsalsa20poly1305","_crypto_secretbox_xsalsa20poly1305_boxzerobytes","_crypto_secretbox_xsalsa20poly1305_keybytes","_crypto_secretbox_xsalsa20poly1305_macbytes","_crypto_secretbox_xsalsa20poly1305_noncebytes","_crypto_secretbox_xsalsa20poly1305_open","_crypto_secretbox_xsalsa20poly1305_zerobytes","_crypto_secretbox_zerobytes","_crypto_shorthash","_crypto_shorthash_bytes","_crypto_shorthash_keybytes","_crypto_shorthash_primitive","_crypto_shorthash_siphash24","_crypto_shorthash_siphash24_bytes","_crypto_shorthash_siphash24_keybytes","_crypto_sign","_crypto_sign_bytes","_crypto_sign_detached","_crypto_sign_ed25519","_crypto_sign_ed25519_bytes","_crypto_sign_ed25519_detached","_crypto_sign_ed25519_keypair","_crypto_sign_ed25519_open","_crypto_sign_ed25519_pk_to_curve25519","_crypto_sign_ed25519_publickeybytes","_crypto_sign_ed25519_secretkeybytes","_crypto_sign_ed25519_seed_keypair","_crypto_sign_ed25519_seedbytes","_crypto_sign_ed25519_sk_to_curve25519","_crypto_sign_ed25519_sk_to_pk","_crypto_sign_ed25519_sk_to_seed","_crypto_sign_ed25519_verify_detached","_crypto_sign_keypair","_crypto_sign_open","_crypto_sign_primitive","_crypto_sign_publickeybytes","_crypto_sign_secretkeybytes","_crypto_sign_seed_keypair","_crypto_sign_seedbytes","_crypto_sign_verify_detached","_crypto_stream","_crypto_stream_chacha20","_crypto_stream_chacha20_ietf","_crypto_stream_chacha20_ietf_noncebytes","_crypto_stream_chacha20_ietf_xor","_crypto_stream_chacha20_ietf_xor_ic","_crypto_stream_chacha20_keybytes","_crypto_stream_chacha20_noncebytes","_crypto_stream_chacha20_xor","_crypto_stream_chacha20_xor_ic","_crypto_stream_keybytes","_crypto_stream_noncebytes","_crypto_stream_primitive","_crypto_stream_salsa20","_crypto_stream_salsa20_keybytes","_crypto_stream_salsa20_noncebytes","_crypto_stream_salsa20_xor","_crypto_stream_salsa20_xor_ic","_crypto_stream_xor","_crypto_stream_xsalsa20","_crypto_stream_xsalsa20_keybytes","_crypto_stream_xsalsa20_noncebytes","_crypto_stream_xsalsa20_xor","_crypto_stream_xsalsa20_xor_ic","_crypto_verify_16","_crypto_verify_16_bytes","_crypto_verify_32","_crypto_verify_32_bytes","_crypto_verify_64","_crypto_verify_64_bytes","_randombytes","_randombytes_buf","_randombytes_close","_randombytes_implementation_name","_randombytes_random","_randombytes_stir","_randombytes_uniform","_sodium_bin2hex","_sodium_hex2bin","_sodium_init","_sodium_library_version_major","_sodium_library_version_minor","_sodium_version_string"]'
-export TOTAL_MEMORY=33554432
+export TOTAL_MEMORY=50000000
export LDFLAGS="-s TOTAL_MEMORY=${TOTAL_MEMORY} -s RESERVED_FUNCTION_POINTERS=8 -s NO_DYNAMIC_EXECUTION=1 -s RUNNING_JS_OPTS=1"
export EXPORTED_FUNCTIONS="$EXPORTED_FUNCTIONS_STANDARD"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/msvc-scripts/process.bat new/libsodium-1.0.10/msvc-scripts/process.bat
--- old/libsodium-1.0.9/msvc-scripts/process.bat 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/msvc-scripts/process.bat 2016-04-04 21:39:09.000000000 +0200
@@ -1,4 +1,4 @@
-cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.9/ < src\libsodium\include\sodium\version.h.in > tmp
+cscript msvc-scripts/rep.vbs //Nologo s/@VERSION@/1.0.10/ < 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@/2/ < tmp2 > src\libsodium\include\sodium\version.h
del tmp tmp2
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/Makefile.am new/libsodium-1.0.10/src/libsodium/Makefile.am
--- old/libsodium-1.0.9/src/libsodium/Makefile.am 2016-04-01 17:19:40.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/Makefile.am 2016-04-04 18:23:28.000000000 +0200
@@ -24,7 +24,6 @@
crypto_core/curve25519/ref10/base.h \
crypto_core/curve25519/ref10/base2.h \
crypto_core/curve25519/ref10/curve25519_ref10.c \
- crypto_core/curve25519/ref10/curve25519_ref10.h \
crypto_core/hsalsa20/ref2/core_hsalsa20.c \
crypto_core/hsalsa20/core_hsalsa20_api.c \
crypto_core/salsa20/ref/core_salsa20.c \
@@ -51,7 +50,6 @@
crypto_onetimeauth/poly1305/donna/poly1305_donna32.h \
crypto_onetimeauth/poly1305/donna/poly1305_donna64.h \
crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
- crypto_pwhash/crypto_pwhash.c \
crypto_pwhash/argon2/argon2-core.c \
crypto_pwhash/argon2/argon2-core.h \
crypto_pwhash/argon2/argon2-encoding.c \
@@ -64,6 +62,7 @@
crypto_pwhash/argon2/blake2b-long.h \
crypto_pwhash/argon2/blamka-round-ref.h \
crypto_pwhash/argon2/pwhash_argon2i.c \
+ crypto_pwhash/crypto_pwhash.c \
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \
@@ -86,11 +85,11 @@
crypto_sign/ed25519/ref10/keypair.c \
crypto_sign/ed25519/ref10/open.c \
crypto_sign/ed25519/ref10/sign.c \
- crypto_stream/crypto_stream.c \
crypto_stream/chacha20/stream_chacha20.c \
crypto_stream/chacha20/stream_chacha20.h \
crypto_stream/chacha20/ref/stream_chacha20_ref.h \
crypto_stream/chacha20/ref/stream_chacha20_ref.c \
+ crypto_stream/crypto_stream.c \
crypto_stream/salsa20/stream_salsa20_api.c \
crypto_stream/xsalsa20/stream_xsalsa20_api.c \
crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
@@ -101,8 +100,9 @@
crypto_verify/32/ref/verify_32.c \
crypto_verify/64/verify_64_api.c \
crypto_verify/64/ref/verify_64.c \
+ include/sodium/private/common.h \
+ include/sodium/private/curve25519_ref10.h \
randombytes/randombytes.c \
- sodium/common.h \
sodium/core.c \
sodium/runtime.c \
sodium/utils.c \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/Makefile.in new/libsodium-1.0.10/src/libsodium/Makefile.in
--- old/libsodium-1.0.9/src/libsodium/Makefile.in 2016-04-02 16:46:47.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/Makefile.in 2016-04-04 21:45:42.000000000 +0200
@@ -243,7 +243,6 @@
crypto_core/curve25519/ref10/base.h \
crypto_core/curve25519/ref10/base2.h \
crypto_core/curve25519/ref10/curve25519_ref10.c \
- crypto_core/curve25519/ref10/curve25519_ref10.h \
crypto_core/hsalsa20/ref2/core_hsalsa20.c \
crypto_core/hsalsa20/core_hsalsa20_api.c \
crypto_core/salsa20/ref/core_salsa20.c \
@@ -269,7 +268,6 @@
crypto_onetimeauth/poly1305/donna/poly1305_donna32.h \
crypto_onetimeauth/poly1305/donna/poly1305_donna64.h \
crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
- crypto_pwhash/crypto_pwhash.c \
crypto_pwhash/argon2/argon2-core.c \
crypto_pwhash/argon2/argon2-core.h \
crypto_pwhash/argon2/argon2-encoding.c \
@@ -281,6 +279,7 @@
crypto_pwhash/argon2/blake2b-long.h \
crypto_pwhash/argon2/blamka-round-ref.h \
crypto_pwhash/argon2/pwhash_argon2i.c \
+ crypto_pwhash/crypto_pwhash.c \
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \
@@ -302,11 +301,12 @@
crypto_sign/ed25519/sign_ed25519_api.c \
crypto_sign/ed25519/ref10/keypair.c \
crypto_sign/ed25519/ref10/open.c \
- crypto_sign/ed25519/ref10/sign.c crypto_stream/crypto_stream.c \
+ crypto_sign/ed25519/ref10/sign.c \
crypto_stream/chacha20/stream_chacha20.c \
crypto_stream/chacha20/stream_chacha20.h \
crypto_stream/chacha20/ref/stream_chacha20_ref.h \
crypto_stream/chacha20/ref/stream_chacha20_ref.c \
+ crypto_stream/crypto_stream.c \
crypto_stream/salsa20/stream_salsa20_api.c \
crypto_stream/xsalsa20/stream_xsalsa20_api.c \
crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
@@ -316,9 +316,11 @@
crypto_verify/32/verify_32_api.c \
crypto_verify/32/ref/verify_32.c \
crypto_verify/64/verify_64_api.c \
- crypto_verify/64/ref/verify_64.c randombytes/randombytes.c \
- sodium/common.h sodium/core.c sodium/runtime.c sodium/utils.c \
- sodium/version.c \
+ crypto_verify/64/ref/verify_64.c \
+ include/sodium/private/common.h \
+ include/sodium/private/curve25519_ref10.h \
+ randombytes/randombytes.c sodium/core.c sodium/runtime.c \
+ sodium/utils.c sodium/version.c \
randombytes/salsa20/randombytes_salsa20_random.c \
randombytes/nativeclient/randombytes_nativeclient.c \
randombytes/sysrandom/randombytes_sysrandom.c \
@@ -434,13 +436,13 @@
crypto_onetimeauth/libsodium_la-crypto_onetimeauth.lo \
crypto_onetimeauth/poly1305/libsodium_la-onetimeauth_poly1305.lo \
crypto_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo \
- crypto_pwhash/libsodium_la-crypto_pwhash.lo \
crypto_pwhash/argon2/libsodium_la-argon2-core.lo \
crypto_pwhash/argon2/libsodium_la-argon2-encoding.lo \
crypto_pwhash/argon2/libsodium_la-argon2-fill-block-ref.lo \
crypto_pwhash/argon2/libsodium_la-argon2.lo \
crypto_pwhash/argon2/libsodium_la-blake2b-long.lo \
crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo \
+ crypto_pwhash/libsodium_la-crypto_pwhash.lo \
crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo \
crypto_pwhash/scryptsalsa208sha256/libsodium_la-scrypt_platform.lo \
crypto_pwhash/scryptsalsa208sha256/libsodium_la-pbkdf2-sha256.lo \
@@ -460,9 +462,9 @@
crypto_sign/ed25519/ref10/libsodium_la-keypair.lo \
crypto_sign/ed25519/ref10/libsodium_la-open.lo \
crypto_sign/ed25519/ref10/libsodium_la-sign.lo \
- crypto_stream/libsodium_la-crypto_stream.lo \
crypto_stream/chacha20/libsodium_la-stream_chacha20.lo \
crypto_stream/chacha20/ref/libsodium_la-stream_chacha20_ref.lo \
+ crypto_stream/libsodium_la-crypto_stream.lo \
crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo \
crypto_stream/xsalsa20/libsodium_la-stream_xsalsa20_api.lo \
crypto_stream/xsalsa20/ref/libsodium_la-stream_xsalsa20.lo \
@@ -799,7 +801,6 @@
crypto_core/curve25519/ref10/base.h \
crypto_core/curve25519/ref10/base2.h \
crypto_core/curve25519/ref10/curve25519_ref10.c \
- crypto_core/curve25519/ref10/curve25519_ref10.h \
crypto_core/hsalsa20/ref2/core_hsalsa20.c \
crypto_core/hsalsa20/core_hsalsa20_api.c \
crypto_core/salsa20/ref/core_salsa20.c \
@@ -825,7 +826,6 @@
crypto_onetimeauth/poly1305/donna/poly1305_donna32.h \
crypto_onetimeauth/poly1305/donna/poly1305_donna64.h \
crypto_onetimeauth/poly1305/donna/poly1305_donna.c \
- crypto_pwhash/crypto_pwhash.c \
crypto_pwhash/argon2/argon2-core.c \
crypto_pwhash/argon2/argon2-core.h \
crypto_pwhash/argon2/argon2-encoding.c \
@@ -837,6 +837,7 @@
crypto_pwhash/argon2/blake2b-long.h \
crypto_pwhash/argon2/blamka-round-ref.h \
crypto_pwhash/argon2/pwhash_argon2i.c \
+ crypto_pwhash/crypto_pwhash.c \
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c \
crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h \
crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c \
@@ -858,11 +859,12 @@
crypto_sign/ed25519/sign_ed25519_api.c \
crypto_sign/ed25519/ref10/keypair.c \
crypto_sign/ed25519/ref10/open.c \
- crypto_sign/ed25519/ref10/sign.c crypto_stream/crypto_stream.c \
+ crypto_sign/ed25519/ref10/sign.c \
crypto_stream/chacha20/stream_chacha20.c \
crypto_stream/chacha20/stream_chacha20.h \
crypto_stream/chacha20/ref/stream_chacha20_ref.h \
crypto_stream/chacha20/ref/stream_chacha20_ref.c \
+ crypto_stream/crypto_stream.c \
crypto_stream/salsa20/stream_salsa20_api.c \
crypto_stream/xsalsa20/stream_xsalsa20_api.c \
crypto_stream/xsalsa20/ref/stream_xsalsa20.c \
@@ -872,12 +874,14 @@
crypto_verify/32/verify_32_api.c \
crypto_verify/32/ref/verify_32.c \
crypto_verify/64/verify_64_api.c \
- crypto_verify/64/ref/verify_64.c randombytes/randombytes.c \
- sodium/common.h sodium/core.c sodium/runtime.c sodium/utils.c \
- sodium/version.c $(am__append_1) $(am__append_2) \
- $(am__append_3) $(am__append_4) $(am__append_5) \
- $(am__append_6) $(am__append_7) $(am__append_8) \
- $(am__append_9)
+ crypto_verify/64/ref/verify_64.c \
+ include/sodium/private/common.h \
+ include/sodium/private/curve25519_ref10.h \
+ randombytes/randombytes.c sodium/core.c sodium/runtime.c \
+ sodium/utils.c sodium/version.c $(am__append_1) \
+ $(am__append_2) $(am__append_3) $(am__append_4) \
+ $(am__append_5) $(am__append_6) $(am__append_7) \
+ $(am__append_8) $(am__append_9)
noinst_HEADERS = \
crypto_scalarmult/curve25519/sandy2x/consts.S \
crypto_scalarmult/curve25519/sandy2x/fe51_mul.S \
@@ -1312,15 +1316,6 @@
crypto_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo: \
crypto_onetimeauth/poly1305/donna/$(am__dirstamp) \
crypto_onetimeauth/poly1305/donna/$(DEPDIR)/$(am__dirstamp)
-crypto_pwhash/$(am__dirstamp):
- @$(MKDIR_P) crypto_pwhash
- @: > crypto_pwhash/$(am__dirstamp)
-crypto_pwhash/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) crypto_pwhash/$(DEPDIR)
- @: > crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
-crypto_pwhash/libsodium_la-crypto_pwhash.lo: \
- crypto_pwhash/$(am__dirstamp) \
- crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
crypto_pwhash/argon2/$(am__dirstamp):
@$(MKDIR_P) crypto_pwhash/argon2
@: > crypto_pwhash/argon2/$(am__dirstamp)
@@ -1345,6 +1340,15 @@
crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo: \
crypto_pwhash/argon2/$(am__dirstamp) \
crypto_pwhash/argon2/$(DEPDIR)/$(am__dirstamp)
+crypto_pwhash/$(am__dirstamp):
+ @$(MKDIR_P) crypto_pwhash
+ @: > crypto_pwhash/$(am__dirstamp)
+crypto_pwhash/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) crypto_pwhash/$(DEPDIR)
+ @: > crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
+crypto_pwhash/libsodium_la-crypto_pwhash.lo: \
+ crypto_pwhash/$(am__dirstamp) \
+ crypto_pwhash/$(DEPDIR)/$(am__dirstamp)
crypto_pwhash/scryptsalsa208sha256/$(am__dirstamp):
@$(MKDIR_P) crypto_pwhash/scryptsalsa208sha256
@: > crypto_pwhash/scryptsalsa208sha256/$(am__dirstamp)
@@ -1479,15 +1483,6 @@
crypto_sign/ed25519/ref10/libsodium_la-sign.lo: \
crypto_sign/ed25519/ref10/$(am__dirstamp) \
crypto_sign/ed25519/ref10/$(DEPDIR)/$(am__dirstamp)
-crypto_stream/$(am__dirstamp):
- @$(MKDIR_P) crypto_stream
- @: > crypto_stream/$(am__dirstamp)
-crypto_stream/$(DEPDIR)/$(am__dirstamp):
- @$(MKDIR_P) crypto_stream/$(DEPDIR)
- @: > crypto_stream/$(DEPDIR)/$(am__dirstamp)
-crypto_stream/libsodium_la-crypto_stream.lo: \
- crypto_stream/$(am__dirstamp) \
- crypto_stream/$(DEPDIR)/$(am__dirstamp)
crypto_stream/chacha20/$(am__dirstamp):
@$(MKDIR_P) crypto_stream/chacha20
@: > crypto_stream/chacha20/$(am__dirstamp)
@@ -1506,6 +1501,15 @@
crypto_stream/chacha20/ref/libsodium_la-stream_chacha20_ref.lo: \
crypto_stream/chacha20/ref/$(am__dirstamp) \
crypto_stream/chacha20/ref/$(DEPDIR)/$(am__dirstamp)
+crypto_stream/$(am__dirstamp):
+ @$(MKDIR_P) crypto_stream
+ @: > crypto_stream/$(am__dirstamp)
+crypto_stream/$(DEPDIR)/$(am__dirstamp):
+ @$(MKDIR_P) crypto_stream/$(DEPDIR)
+ @: > crypto_stream/$(DEPDIR)/$(am__dirstamp)
+crypto_stream/libsodium_la-crypto_stream.lo: \
+ crypto_stream/$(am__dirstamp) \
+ crypto_stream/$(DEPDIR)/$(am__dirstamp)
crypto_stream/salsa20/$(am__dirstamp):
@$(MKDIR_P) crypto_stream/salsa20
@: > crypto_stream/salsa20/$(am__dirstamp)
@@ -2488,13 +2492,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_onetimeauth/poly1305/donna/libsodium_la-poly1305_donna.lo `test -f 'crypto_onetimeauth/poly1305/donna/poly1305_donna.c' || echo '$(srcdir)/'`crypto_onetimeauth/poly1305/donna/poly1305_donna.c
-crypto_pwhash/libsodium_la-crypto_pwhash.lo: crypto_pwhash/crypto_pwhash.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_pwhash/libsodium_la-crypto_pwhash.lo -MD -MP -MF crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo -c -o crypto_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_pwhash/crypto_pwhash.c' object='crypto_pwhash/libsodium_la-crypto_pwhash.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
-
crypto_pwhash/argon2/libsodium_la-argon2-core.lo: crypto_pwhash/argon2/argon2-core.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_pwhash/argon2/libsodium_la-argon2-core.lo -MD -MP -MF crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Tpo -c -o crypto_pwhash/argon2/libsodium_la-argon2-core.lo `test -f 'crypto_pwhash/argon2/argon2-core.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/argon2-core.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Tpo crypto_pwhash/argon2/$(DEPDIR)/libsodium_la-argon2-core.Plo
@@ -2537,6 +2534,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_pwhash/argon2/libsodium_la-pwhash_argon2i.lo `test -f 'crypto_pwhash/argon2/pwhash_argon2i.c' || echo '$(srcdir)/'`crypto_pwhash/argon2/pwhash_argon2i.c
+crypto_pwhash/libsodium_la-crypto_pwhash.lo: crypto_pwhash/crypto_pwhash.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_pwhash/libsodium_la-crypto_pwhash.lo -MD -MP -MF crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo -c -o crypto_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Tpo crypto_pwhash/$(DEPDIR)/libsodium_la-crypto_pwhash.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_pwhash/crypto_pwhash.c' object='crypto_pwhash/libsodium_la-crypto_pwhash.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_pwhash/libsodium_la-crypto_pwhash.lo `test -f 'crypto_pwhash/crypto_pwhash.c' || echo '$(srcdir)/'`crypto_pwhash/crypto_pwhash.c
+
crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo: crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo -MD -MP -MF crypto_pwhash/scryptsalsa208sha256/$(DEPDIR)/libsodium_la-crypto_scrypt-common.Tpo -c -o crypto_pwhash/scryptsalsa208sha256/libsodium_la-crypto_scrypt-common.lo `test -f 'crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c' || echo '$(srcdir)/'`crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_pwhash/scryptsalsa208sha256/$(DEPDIR)/libsodium_la-crypto_scrypt-common.Tpo crypto_pwhash/scryptsalsa208sha256/$(DEPDIR)/libsodium_la-crypto_scrypt-common.Plo
@@ -2670,13 +2674,6 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_sign/ed25519/ref10/libsodium_la-sign.lo `test -f 'crypto_sign/ed25519/ref10/sign.c' || echo '$(srcdir)/'`crypto_sign/ed25519/ref10/sign.c
-crypto_stream/libsodium_la-crypto_stream.lo: crypto_stream/crypto_stream.c
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/libsodium_la-crypto_stream.lo -MD -MP -MF crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo -c -o crypto_stream/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
-@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_stream/crypto_stream.c' object='crypto_stream/libsodium_la-crypto_stream.lo' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
-
crypto_stream/chacha20/libsodium_la-stream_chacha20.lo: crypto_stream/chacha20/stream_chacha20.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/chacha20/libsodium_la-stream_chacha20.lo -MD -MP -MF crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20.Tpo -c -o crypto_stream/chacha20/libsodium_la-stream_chacha20.lo `test -f 'crypto_stream/chacha20/stream_chacha20.c' || echo '$(srcdir)/'`crypto_stream/chacha20/stream_chacha20.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20.Tpo crypto_stream/chacha20/$(DEPDIR)/libsodium_la-stream_chacha20.Plo
@@ -2691,6 +2688,13 @@
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/chacha20/ref/libsodium_la-stream_chacha20_ref.lo `test -f 'crypto_stream/chacha20/ref/stream_chacha20_ref.c' || echo '$(srcdir)/'`crypto_stream/chacha20/ref/stream_chacha20_ref.c
+crypto_stream/libsodium_la-crypto_stream.lo: crypto_stream/crypto_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/libsodium_la-crypto_stream.lo -MD -MP -MF crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo -c -o crypto_stream/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
+@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Tpo crypto_stream/$(DEPDIR)/libsodium_la-crypto_stream.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='crypto_stream/crypto_stream.c' object='crypto_stream/libsodium_la-crypto_stream.lo' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o crypto_stream/libsodium_la-crypto_stream.lo `test -f 'crypto_stream/crypto_stream.c' || echo '$(srcdir)/'`crypto_stream/crypto_stream.c
+
crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo: crypto_stream/salsa20/stream_salsa20_api.c
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libsodium_la_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo -MD -MP -MF crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Tpo -c -o crypto_stream/salsa20/libsodium_la-stream_salsa20_api.lo `test -f 'crypto_stream/salsa20/stream_salsa20_api.c' || echo '$(srcdir)/'`crypto_stream/salsa20/stream_salsa20_api.c
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Tpo crypto_stream/salsa20/$(DEPDIR)/libsodium_la-stream_salsa20_api.Plo
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c new/libsodium-1.0.10/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c
--- old/libsodium-1.0.9/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c 2016-04-02 12:17:59.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c 2016-04-04 17:09:37.000000000 +0200
@@ -10,7 +10,7 @@
#include "crypto_verify_16.h"
#include "utils.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
static const unsigned char _pad0[16] = { 0 };
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c new/libsodium-1.0.10/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c
--- old/libsodium-1.0.9/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c 2016-04-04 18:23:28.000000000 +0200
@@ -1,8 +1,8 @@
#include
#include
#include
-#include "curve25519_ref10.h"
#include "crypto_verify_32.h"
+#include "private/curve25519_ref10.h"
static uint64_t load_3(const unsigned char *in)
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h new/libsodium-1.0.10/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h
--- old/libsodium-1.0.9/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,160 +0,0 @@
-#ifndef CURVE25519_REF10_H
-#define CURVE25519_REF10_H
-
-#include
-#include
-
-#define fe crypto_core_curve25519_ref10_fe
-typedef int32_t fe[10];
-
-/*
- fe means field element.
- Here the field is \Z/(2^255-19).
- An element t, entries t[0]...t[9], represents the integer
- t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9].
- Bounds on each t[i] vary depending on context.
- */
-
-#define fe_frombytes crypto_core_curve25519_ref10_fe_frombytes
-#define fe_tobytes crypto_core_curve25519_ref10_fe_tobytes
-#define fe_copy crypto_core_curve25519_ref10_fe_copy
-#define fe_isnonzero crypto_core_curve25519_ref10_fe_isnonzero
-#define fe_isnegative crypto_core_curve25519_ref10_fe_isnegative
-#define fe_0 crypto_core_curve25519_ref10_fe_0
-#define fe_1 crypto_core_curve25519_ref10_fe_1
-#define fe_cmov crypto_core_curve25519_ref10_fe_cmov
-#define fe_add crypto_core_curve25519_ref10_fe_add
-#define fe_sub crypto_core_curve25519_ref10_fe_sub
-#define fe_neg crypto_core_curve25519_ref10_fe_neg
-#define fe_mul crypto_core_curve25519_ref10_fe_mul
-#define fe_sq crypto_core_curve25519_ref10_fe_sq
-#define fe_sq2 crypto_core_curve25519_ref10_fe_sq2
-#define fe_invert crypto_core_curve25519_ref10_fe_invert
-#define fe_pow22523 crypto_core_curve25519_ref10_fe_pow22523
-
-extern void fe_frombytes(fe,const unsigned char *);
-extern void fe_tobytes(unsigned char *,const fe);
-
-extern void fe_copy(fe,const fe);
-extern int fe_isnonzero(const fe);
-extern int fe_isnegative(const fe);
-extern void fe_0(fe);
-extern void fe_1(fe);
-extern void fe_cmov(fe,const fe,unsigned int);
-extern void fe_add(fe,const fe,const fe);
-extern void fe_sub(fe,const fe,const fe);
-extern void fe_neg(fe,const fe);
-extern void fe_mul(fe,const fe,const fe);
-extern void fe_sq(fe,const fe);
-extern void fe_sq2(fe,const fe);
-extern void fe_invert(fe,const fe);
-extern void fe_pow22523(fe,const fe);
-
-/*
- ge means group element.
- *
- Here the group is the set of pairs (x,y) of field elements (see fe.h)
- satisfying -x^2 + y^2 = 1 + d x^2y^2
- where d = -121665/121666.
- *
- Representations:
- ge_p2 (projective): (X:Y:Z) satisfying x=X/Z, y=Y/Z
- ge_p3 (extended): (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
- ge_p1p1 (completed): ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
- ge_precomp (Duif): (y+x,y-x,2dxy)
- */
-
-#define ge_p2 crypto_core_curve25519_ref10_ge_p2
-typedef struct {
- fe X;
- fe Y;
- fe Z;
-} ge_p2;
-
-#define ge_p3 crypto_core_curve25519_ref10_ge_p3
-typedef struct {
- fe X;
- fe Y;
- fe Z;
- fe T;
-} ge_p3;
-
-#define ge_p1p1 crypto_core_curve25519_ref10_ge_p1p1
-typedef struct {
- fe X;
- fe Y;
- fe Z;
- fe T;
-} ge_p1p1;
-
-#define ge_precomp crypto_core_curve25519_ref10_ge_precomp
-typedef struct {
- fe yplusx;
- fe yminusx;
- fe xy2d;
-} ge_precomp;
-
-#define ge_cached crypto_core_curve25519_ref10_ge_cached
-typedef struct {
- fe YplusX;
- fe YminusX;
- fe Z;
- fe T2d;
-} ge_cached;
-
-#define ge_frombytes_negate_vartime crypto_core_curve25519_ref10_ge_frombytes_negate_vartime
-#define ge_tobytes crypto_core_curve25519_ref10_ge_tobytes
-#define ge_p3_tobytes crypto_core_curve25519_ref10_ge_p3_tobytes
-
-#define ge_p2_0 crypto_core_curve25519_ref10_ge_p2_0
-#define ge_p3_0 crypto_core_curve25519_ref10_ge_p3_0
-#define ge_precomp_0 crypto_core_curve25519_ref10_ge_precomp_0
-#define ge_p3_to_p2 crypto_core_curve25519_ref10_ge_p3_to_p2
-#define ge_p3_to_cached crypto_core_curve25519_ref10_ge_p3_to_cached
-#define ge_p1p1_to_p2 crypto_core_curve25519_ref10_ge_p1p1_to_p2
-#define ge_p1p1_to_p3 crypto_core_curve25519_ref10_ge_p1p1_to_p3
-#define ge_p2_dbl crypto_core_curve25519_ref10_ge_p2_dbl
-#define ge_p3_dbl crypto_core_curve25519_ref10_ge_p3_dbl
-
-#define ge_madd crypto_core_curve25519_ref10_ge_madd
-#define ge_msub crypto_core_curve25519_ref10_ge_msub
-#define ge_add crypto_core_curve25519_ref10_ge_add
-#define ge_sub crypto_core_curve25519_ref10_ge_sub
-#define ge_scalarmult_base crypto_core_curve25519_ref10_ge_scalarmult_base
-#define ge_double_scalarmult_vartime crypto_core_curve25519_ref10_ge_double_scalarmult_vartime
-#define ge_scalarmult_vartime crypto_core_curve25519_ref10_ge_scalarmult_vartime
-
-extern void ge_tobytes(unsigned char *,const ge_p2 *);
-extern void ge_p3_tobytes(unsigned char *,const ge_p3 *);
-extern int ge_frombytes_negate_vartime(ge_p3 *,const unsigned char *);
-
-extern void ge_p2_0(ge_p2 *);
-extern void ge_p3_0(ge_p3 *);
-extern void ge_precomp_0(ge_precomp *);
-extern void ge_p3_to_p2(ge_p2 *,const ge_p3 *);
-extern void ge_p3_to_cached(ge_cached *,const ge_p3 *);
-extern void ge_p1p1_to_p2(ge_p2 *,const ge_p1p1 *);
-extern void ge_p1p1_to_p3(ge_p3 *,const ge_p1p1 *);
-extern void ge_p2_dbl(ge_p1p1 *,const ge_p2 *);
-extern void ge_p3_dbl(ge_p1p1 *,const ge_p3 *);
-
-extern void ge_madd(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
-extern void ge_msub(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
-extern void ge_add(ge_p1p1 *,const ge_p3 *,const ge_cached *);
-extern void ge_sub(ge_p1p1 *,const ge_p3 *,const ge_cached *);
-extern void ge_scalarmult_base(ge_p3 *,const unsigned char *);
-extern void ge_double_scalarmult_vartime(ge_p2 *,const unsigned char *,const ge_p3 *,const unsigned char *);
-extern void ge_scalarmult_vartime(ge_p3 *,const unsigned char *,const ge_p3 *);
-
-/*
- The set of scalars is \Z/l
- where l = 2^252 + 27742317777372353535851937790883648493.
- */
-
-#define sc_reduce crypto_core_curve25519_ref10_sc_reduce
-#define sc_muladd crypto_core_curve25519_ref10_sc_muladd
-
-extern void sc_reduce(unsigned char *);
-extern void sc_muladd(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/hchacha20/core_hchacha20.c new/libsodium-1.0.10/src/libsodium/crypto_core/hchacha20/core_hchacha20.c
--- old/libsodium-1.0.9/src/libsodium/crypto_core/hchacha20/core_hchacha20.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/hchacha20/core_hchacha20.c 2016-04-04 17:09:37.000000000 +0200
@@ -4,7 +4,7 @@
#include "core_hchacha20.h"
#include "crypto_core_hchacha20.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
int
crypto_core_hchacha20(unsigned char *out, const unsigned char *in,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c new/libsodium-1.0.10/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c
--- old/libsodium-1.0.9/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c 2016-04-04 17:09:37.000000000 +0200
@@ -8,7 +8,7 @@
#include
#include "crypto_core_hsalsa20.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#define ROUNDS 20
#define U32C(v) (v##U)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c new/libsodium-1.0.10/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c
--- old/libsodium-1.0.9/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c 2016-04-04 17:09:37.000000000 +0200
@@ -8,7 +8,7 @@
#include
#include "crypto_core_salsa20.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#define ROUNDS 20
#define U32C(v) (v##U)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c new/libsodium-1.0.10/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c
--- old/libsodium-1.0.9/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c 2016-04-04 17:09:37.000000000 +0200
@@ -8,7 +8,7 @@
#include
#include "crypto_core_salsa2012.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#define ROUNDS 12
#define U32C(v) (v##U)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c new/libsodium-1.0.10/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c
--- old/libsodium-1.0.9/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c 2016-04-04 17:09:37.000000000 +0200
@@ -8,7 +8,7 @@
#include
#include "crypto_core_salsa208.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#define ROUNDS 8
#define U32C(v) (v##U)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c new/libsodium-1.0.10/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c
--- old/libsodium-1.0.9/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c 2016-04-04 17:09:37.000000000 +0200
@@ -4,7 +4,7 @@
#include "blake2.h"
#include "blake2-impl.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
CRYPTO_ALIGN(64) static const uint64_t blake2b_IV[8] =
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c new/libsodium-1.0.10/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c
--- old/libsodium-1.0.9/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c 2016-03-25 09:56:35.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c 2016-04-04 17:09:37.000000000 +0200
@@ -19,7 +19,7 @@
#include "blake2.h"
#include "blake2-impl.h"
#include "runtime.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#ifdef HAVE_TI_MODE
# if defined(__SIZEOF_INT128__)
@@ -86,6 +86,8 @@
/* Parameter-related functions */
#if 0
+/* Redundant: digest length is directly set in blake2b_init(), blake2b_init_salt_personal(),
+ * blake2b_init_key() and blake2b_init_key_salt_personal() */
static inline int blake2b_param_set_digest_length( blake2b_param *P, const uint8_t digest_length )
{
P->digest_length = digest_length;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c new/libsodium-1.0.10/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c
--- old/libsodium-1.0.9/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c 2016-04-04 17:09:37.000000000 +0200
@@ -28,7 +28,7 @@
#include "crypto_hash_sha256.h"
#include "utils.h"
-#include "../../../sodium/common.h"
+#include "private/common.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c new/libsodium-1.0.10/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c
--- old/libsodium-1.0.9/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c 2016-04-04 17:09:37.000000000 +0200
@@ -28,7 +28,7 @@
#include "crypto_hash_sha512.h"
#include "utils.h"
-#include "../../../sodium/common.h"
+#include "private/common.h"
#include
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h new/libsodium-1.0.10/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h
--- old/libsodium-1.0.9/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h 2016-04-02 01:23:32.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h 2016-04-04 17:09:37.000000000 +0200
@@ -10,7 +10,7 @@
# define POLY1305_NOINLINE
#endif
-#include "../../../sodium/common.h"
+#include "private/common.h"
#define poly1305_block_size 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h new/libsodium-1.0.10/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h
--- old/libsodium-1.0.9/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h 2016-04-02 01:23:32.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h 2016-04-04 17:09:37.000000000 +0200
@@ -22,7 +22,7 @@
# define POLY1305_NOINLINE
#endif
-#include "../../../sodium/common.h"
+#include "private/common.h"
#define poly1305_block_size 16
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_pwhash/argon2/argon2-core.c new/libsodium-1.0.10/src/libsodium/crypto_pwhash/argon2/argon2-core.c
--- old/libsodium-1.0.9/src/libsodium/crypto_pwhash/argon2/argon2-core.c 2016-04-01 17:19:40.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_pwhash/argon2/argon2-core.c 2016-04-04 17:09:37.000000000 +0200
@@ -23,7 +23,7 @@
#include "crypto_generichash_blake2b.h"
#include "runtime.h"
#include "utils.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#include "argon2-core.h"
#include "argon2-impl.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_pwhash/argon2/blake2b-long.c new/libsodium-1.0.10/src/libsodium/crypto_pwhash/argon2/blake2b-long.c
--- old/libsodium-1.0.9/src/libsodium/crypto_pwhash/argon2/blake2b-long.c 2016-04-01 17:19:40.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_pwhash/argon2/blake2b-long.c 2016-04-04 17:09:37.000000000 +0200
@@ -5,7 +5,7 @@
#include "crypto_generichash_blake2b.h"
#include "utils.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
#include "argon2-impl.h"
#include "blake2b-long.h"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c new/libsodium-1.0.10/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c
--- old/libsodium-1.0.9/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c 2016-04-02 01:23:32.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c 2016-04-04 17:09:37.000000000 +0200
@@ -36,7 +36,7 @@
#include "../pbkdf2-sha256.h"
#include "../crypto_scrypt.h"
-#include "../../../sodium/common.h"
+#include "private/common.h"
static inline void
blkcpy_64(escrypt_block_t *dest, const escrypt_block_t *src)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c new/libsodium-1.0.10/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c
--- old/libsodium-1.0.9/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c 2016-04-04 17:09:37.000000000 +0200
@@ -33,7 +33,7 @@
#include "crypto_auth_hmacsha256.h"
#include "pbkdf2-sha256.h"
#include "utils.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
/**
* PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, c, buf, dkLen):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c new/libsodium-1.0.10/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c
--- old/libsodium-1.0.9/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c 2016-04-02 01:23:32.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c 2016-04-04 17:09:37.000000000 +0200
@@ -46,7 +46,7 @@
#include "../pbkdf2-sha256.h"
#include "../crypto_scrypt.h"
-#include "../../../sodium/common.h"
+#include "private/common.h"
#if defined(__XOP__) && defined(DISABLED)
#define ARX(out, in1, in2, s) \
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c new/libsodium-1.0.10/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c
--- old/libsodium-1.0.9/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c 2016-04-02 01:23:32.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c 2016-04-04 18:23:28.000000000 +0200
@@ -7,7 +7,7 @@
#include "utils.h"
#include "x25519_ref10.h"
#include "../scalarmult_curve25519.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
/*
Replace (f,g) with (g,f) if b == 1;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c new/libsodium-1.0.10/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c
--- old/libsodium-1.0.9/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c 2016-04-01 10:43:22.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c 2016-04-04 17:09:37.000000000 +0200
@@ -1,5 +1,5 @@
#include "crypto_shorthash_siphash24.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
typedef uint64_t u64;
typedef uint32_t u32;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/keypair.c new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/keypair.c
--- old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/keypair.c 2016-03-08 20:18:08.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/keypair.c 2016-04-04 18:23:28.000000000 +0200
@@ -6,7 +6,7 @@
#include "crypto_scalarmult_curve25519.h"
#include "randombytes.h"
#include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
int crypto_sign_ed25519_seed_keypair(unsigned char *pk, unsigned char *sk,
const unsigned char *seed)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c
--- old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c 2016-03-08 20:18:08.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c 2016-04-04 18:23:28.000000000 +0200
@@ -8,7 +8,7 @@
#include "crypto_verify_32.h"
#include "randombytes.h"
#include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
int crypto_sign_edwards25519sha512batch_keypair(unsigned char *pk,
unsigned char *sk)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/open.c new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/open.c
--- old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/open.c 2016-04-02 01:23:32.000000000 +0200
+++ new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/open.c 2016-04-04 18:23:28.000000000 +0200
@@ -7,7 +7,7 @@
#include "crypto_sign_ed25519.h"
#include "crypto_verify_32.h"
#include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
#ifndef ED25519_COMPAT
static int
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/sign.c new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/sign.c
--- old/libsodium-1.0.9/src/libsodium/crypto_sign/ed25519/ref10/sign.c 2016-03-08 20:18:08.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_sign/ed25519/ref10/sign.c 2016-04-04 18:23:28.000000000 +0200
@@ -4,7 +4,7 @@
#include "crypto_hash_sha512.h"
#include "crypto_sign_ed25519.h"
#include "utils.h"
-#include "../../../crypto_core/curve25519/ref10/curve25519_ref10.h"
+#include "private/curve25519_ref10.h"
int
crypto_sign_ed25519_detached(unsigned char *sig, unsigned long long *siglen_p,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_stream/aes128ctr/portable/common.h new/libsodium-1.0.10/src/libsodium/crypto_stream/aes128ctr/portable/common.h
--- old/libsodium-1.0.9/src/libsodium/crypto_stream/aes128ctr/portable/common.h 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_stream/aes128ctr/portable/common.h 2016-04-04 17:41:14.000000000 +0200
@@ -5,7 +5,7 @@
#define COMMON_H
#include "types.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
/* Macros required only for key expansion */
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c new/libsodium-1.0.10/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c
--- old/libsodium-1.0.9/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c 2016-04-04 17:41:14.000000000 +0200
@@ -13,7 +13,7 @@
#include "crypto_stream_chacha20.h"
#include "stream_chacha20_ref.h"
#include "../stream_chacha20.h"
-#include "../../sodium/common.h"
+#include "private/common.h"
struct chacha_ctx {
uint32_t input[16];
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/include/sodium/private/common.h new/libsodium-1.0.10/src/libsodium/include/sodium/private/common.h
--- old/libsodium-1.0.9/src/libsodium/include/sodium/private/common.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/include/sodium/private/common.h 2016-04-04 17:09:37.000000000 +0200
@@ -0,0 +1,150 @@
+#ifndef common_H
+#define common_H 1
+
+#include
+#include
+#include
+
+#define LOAD64_LE(SRC) load64_le(SRC)
+static inline uint64_t
+load64_le(const uint8_t src[8])
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+ uint64_t w;
+ memcpy(&w, src, sizeof w);
+ return w;
+#else
+ uint64_t w = (uint64_t) src[0];
+ w |= (uint64_t) src[1] << 8;
+ w |= (uint64_t) src[2] << 16;
+ w |= (uint64_t) src[3] << 24;
+ w |= (uint64_t) src[4] << 32;
+ w |= (uint64_t) src[5] << 40;
+ w |= (uint64_t) src[6] << 48;
+ w |= (uint64_t) src[7] << 56;
+ return w;
+#endif
+}
+
+#define STORE64_LE(DST, W) store64_le((DST), (W))
+static inline void
+store64_le(uint8_t dst[8], uint64_t w)
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+ memcpy(dst, &w, sizeof w);
+#else
+ dst[0] = (uint8_t) w; w >>= 8;
+ dst[1] = (uint8_t) w; w >>= 8;
+ dst[2] = (uint8_t) w; w >>= 8;
+ dst[3] = (uint8_t) w; w >>= 8;
+ dst[4] = (uint8_t) w; w >>= 8;
+ dst[5] = (uint8_t) w; w >>= 8;
+ dst[6] = (uint8_t) w; w >>= 8;
+ dst[7] = (uint8_t) w;
+#endif
+}
+
+#define LOAD32_LE(SRC) load32_le(SRC)
+static inline uint32_t
+load32_le(const uint8_t src[4])
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+ uint32_t w;
+ memcpy(&w, src, sizeof w);
+ return w;
+#else
+ uint32_t w = (uint32_t) src[0];
+ w |= (uint32_t) src[1] << 8;
+ w |= (uint32_t) src[2] << 16;
+ w |= (uint32_t) src[3] << 24;
+ return w;
+#endif
+}
+
+#define STORE32_LE(DST, W) store32_le((DST), (W))
+static inline void
+store32_le(uint8_t dst[4], uint32_t w)
+{
+#ifdef NATIVE_LITTLE_ENDIAN
+ memcpy(dst, &w, sizeof w);
+#else
+ dst[0] = (uint8_t) w; w >>= 8;
+ dst[1] = (uint8_t) w; w >>= 8;
+ dst[2] = (uint8_t) w; w >>= 8;
+ dst[3] = (uint8_t) w;
+#endif
+}
+
+/* ----- */
+
+#define LOAD64_BE(SRC) load64_be(SRC)
+static inline uint64_t
+load64_be(const uint8_t src[8])
+{
+#ifdef NATIVE_BIG_ENDIAN
+ uint64_t w;
+ memcpy(&w, src, sizeof w);
+ return w;
+#else
+ uint64_t w = (uint64_t) src[7];
+ w |= (uint64_t) src[6] << 8;
+ w |= (uint64_t) src[5] << 16;
+ w |= (uint64_t) src[4] << 24;
+ w |= (uint64_t) src[3] << 32;
+ w |= (uint64_t) src[2] << 40;
+ w |= (uint64_t) src[1] << 48;
+ w |= (uint64_t) src[0] << 56;
+ return w;
+#endif
+}
+
+#define LOAD32_BE(SRC) load32_be(SRC)
+static inline uint32_t
+load32_be(const uint8_t src[4])
+{
+#ifdef NATIVE_BIG_ENDIAN
+ uint32_t w;
+ memcpy(&w, src, sizeof w);
+ return w;
+#else
+ uint32_t w = (uint32_t) src[3];
+ w |= (uint32_t) src[2] << 8;
+ w |= (uint32_t) src[1] << 16;
+ w |= (uint32_t) src[0] << 24;
+ return w;
+#endif
+}
+
+#define STORE64_BE(DST, W) store64_be((DST), (W))
+static inline void
+store64_be(uint8_t dst[8], uint64_t w)
+{
+#ifdef NATIVE_BIG_ENDIAN
+ memcpy(dst, &w, sizeof w);
+#else
+ dst[7] = (uint8_t) w; w >>= 8;
+ dst[6] = (uint8_t) w; w >>= 8;
+ dst[5] = (uint8_t) w; w >>= 8;
+ dst[4] = (uint8_t) w; w >>= 8;
+ dst[3] = (uint8_t) w; w >>= 8;
+ dst[2] = (uint8_t) w; w >>= 8;
+ dst[1] = (uint8_t) w; w >>= 8;
+ dst[0] = (uint8_t) w;
+#endif
+}
+
+#define STORE32_BE(DST, W) store32_be((DST), (W))
+static inline void
+store32_be(uint8_t dst[4], uint32_t w)
+{
+#ifdef NATIVE_BIG_ENDIAN
+ memcpy(dst, &w, sizeof w);
+#else
+ dst[3] = (uint8_t) w; w >>= 8;
+ dst[2] = (uint8_t) w; w >>= 8;
+ dst[1] = (uint8_t) w; w >>= 8;
+ dst[0] = (uint8_t) w;
+#endif
+}
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/include/sodium/private/curve25519_ref10.h new/libsodium-1.0.10/src/libsodium/include/sodium/private/curve25519_ref10.h
--- old/libsodium-1.0.9/src/libsodium/include/sodium/private/curve25519_ref10.h 1970-01-01 01:00:00.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/include/sodium/private/curve25519_ref10.h 2016-04-04 18:23:28.000000000 +0200
@@ -0,0 +1,160 @@
+#ifndef CURVE25519_REF10_H
+#define CURVE25519_REF10_H
+
+#include
+#include
+
+#define fe crypto_core_curve25519_ref10_fe
+typedef int32_t fe[10];
+
+/*
+ fe means field element.
+ Here the field is \Z/(2^255-19).
+ An element t, entries t[0]...t[9], represents the integer
+ t[0]+2^26 t[1]+2^51 t[2]+2^77 t[3]+2^102 t[4]+...+2^230 t[9].
+ Bounds on each t[i] vary depending on context.
+ */
+
+#define fe_frombytes crypto_core_curve25519_ref10_fe_frombytes
+#define fe_tobytes crypto_core_curve25519_ref10_fe_tobytes
+#define fe_copy crypto_core_curve25519_ref10_fe_copy
+#define fe_isnonzero crypto_core_curve25519_ref10_fe_isnonzero
+#define fe_isnegative crypto_core_curve25519_ref10_fe_isnegative
+#define fe_0 crypto_core_curve25519_ref10_fe_0
+#define fe_1 crypto_core_curve25519_ref10_fe_1
+#define fe_cmov crypto_core_curve25519_ref10_fe_cmov
+#define fe_add crypto_core_curve25519_ref10_fe_add
+#define fe_sub crypto_core_curve25519_ref10_fe_sub
+#define fe_neg crypto_core_curve25519_ref10_fe_neg
+#define fe_mul crypto_core_curve25519_ref10_fe_mul
+#define fe_sq crypto_core_curve25519_ref10_fe_sq
+#define fe_sq2 crypto_core_curve25519_ref10_fe_sq2
+#define fe_invert crypto_core_curve25519_ref10_fe_invert
+#define fe_pow22523 crypto_core_curve25519_ref10_fe_pow22523
+
+extern void fe_frombytes(fe,const unsigned char *);
+extern void fe_tobytes(unsigned char *,const fe);
+
+extern void fe_copy(fe,const fe);
+extern int fe_isnonzero(const fe);
+extern int fe_isnegative(const fe);
+extern void fe_0(fe);
+extern void fe_1(fe);
+extern void fe_cmov(fe,const fe,unsigned int);
+extern void fe_add(fe,const fe,const fe);
+extern void fe_sub(fe,const fe,const fe);
+extern void fe_neg(fe,const fe);
+extern void fe_mul(fe,const fe,const fe);
+extern void fe_sq(fe,const fe);
+extern void fe_sq2(fe,const fe);
+extern void fe_invert(fe,const fe);
+extern void fe_pow22523(fe,const fe);
+
+/*
+ ge means group element.
+ *
+ Here the group is the set of pairs (x,y) of field elements (see fe.h)
+ satisfying -x^2 + y^2 = 1 + d x^2y^2
+ where d = -121665/121666.
+ *
+ Representations:
+ ge_p2 (projective): (X:Y:Z) satisfying x=X/Z, y=Y/Z
+ ge_p3 (extended): (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
+ ge_p1p1 (completed): ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
+ ge_precomp (Duif): (y+x,y-x,2dxy)
+ */
+
+#define ge_p2 crypto_core_curve25519_ref10_ge_p2
+typedef struct {
+ fe X;
+ fe Y;
+ fe Z;
+} ge_p2;
+
+#define ge_p3 crypto_core_curve25519_ref10_ge_p3
+typedef struct {
+ fe X;
+ fe Y;
+ fe Z;
+ fe T;
+} ge_p3;
+
+#define ge_p1p1 crypto_core_curve25519_ref10_ge_p1p1
+typedef struct {
+ fe X;
+ fe Y;
+ fe Z;
+ fe T;
+} ge_p1p1;
+
+#define ge_precomp crypto_core_curve25519_ref10_ge_precomp
+typedef struct {
+ fe yplusx;
+ fe yminusx;
+ fe xy2d;
+} ge_precomp;
+
+#define ge_cached crypto_core_curve25519_ref10_ge_cached
+typedef struct {
+ fe YplusX;
+ fe YminusX;
+ fe Z;
+ fe T2d;
+} ge_cached;
+
+#define ge_frombytes_negate_vartime crypto_core_curve25519_ref10_ge_frombytes_negate_vartime
+#define ge_tobytes crypto_core_curve25519_ref10_ge_tobytes
+#define ge_p3_tobytes crypto_core_curve25519_ref10_ge_p3_tobytes
+
+#define ge_p2_0 crypto_core_curve25519_ref10_ge_p2_0
+#define ge_p3_0 crypto_core_curve25519_ref10_ge_p3_0
+#define ge_precomp_0 crypto_core_curve25519_ref10_ge_precomp_0
+#define ge_p3_to_p2 crypto_core_curve25519_ref10_ge_p3_to_p2
+#define ge_p3_to_cached crypto_core_curve25519_ref10_ge_p3_to_cached
+#define ge_p1p1_to_p2 crypto_core_curve25519_ref10_ge_p1p1_to_p2
+#define ge_p1p1_to_p3 crypto_core_curve25519_ref10_ge_p1p1_to_p3
+#define ge_p2_dbl crypto_core_curve25519_ref10_ge_p2_dbl
+#define ge_p3_dbl crypto_core_curve25519_ref10_ge_p3_dbl
+
+#define ge_madd crypto_core_curve25519_ref10_ge_madd
+#define ge_msub crypto_core_curve25519_ref10_ge_msub
+#define ge_add crypto_core_curve25519_ref10_ge_add
+#define ge_sub crypto_core_curve25519_ref10_ge_sub
+#define ge_scalarmult_base crypto_core_curve25519_ref10_ge_scalarmult_base
+#define ge_double_scalarmult_vartime crypto_core_curve25519_ref10_ge_double_scalarmult_vartime
+#define ge_scalarmult_vartime crypto_core_curve25519_ref10_ge_scalarmult_vartime
+
+extern void ge_tobytes(unsigned char *,const ge_p2 *);
+extern void ge_p3_tobytes(unsigned char *,const ge_p3 *);
+extern int ge_frombytes_negate_vartime(ge_p3 *,const unsigned char *);
+
+extern void ge_p2_0(ge_p2 *);
+extern void ge_p3_0(ge_p3 *);
+extern void ge_precomp_0(ge_precomp *);
+extern void ge_p3_to_p2(ge_p2 *,const ge_p3 *);
+extern void ge_p3_to_cached(ge_cached *,const ge_p3 *);
+extern void ge_p1p1_to_p2(ge_p2 *,const ge_p1p1 *);
+extern void ge_p1p1_to_p3(ge_p3 *,const ge_p1p1 *);
+extern void ge_p2_dbl(ge_p1p1 *,const ge_p2 *);
+extern void ge_p3_dbl(ge_p1p1 *,const ge_p3 *);
+
+extern void ge_madd(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
+extern void ge_msub(ge_p1p1 *,const ge_p3 *,const ge_precomp *);
+extern void ge_add(ge_p1p1 *,const ge_p3 *,const ge_cached *);
+extern void ge_sub(ge_p1p1 *,const ge_p3 *,const ge_cached *);
+extern void ge_scalarmult_base(ge_p3 *,const unsigned char *);
+extern void ge_double_scalarmult_vartime(ge_p2 *,const unsigned char *,const ge_p3 *,const unsigned char *);
+extern void ge_scalarmult_vartime(ge_p3 *,const unsigned char *,const ge_p3 *);
+
+/*
+ The set of scalars is \Z/l
+ where l = 2^252 + 27742317777372353535851937790883648493.
+ */
+
+#define sc_reduce crypto_core_curve25519_ref10_sc_reduce
+#define sc_muladd crypto_core_curve25519_ref10_sc_muladd
+
+extern void sc_reduce(unsigned char *);
+extern void sc_muladd(unsigned char *,const unsigned char *,const unsigned char *,const unsigned char *);
+
+#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/src/libsodium/sodium/common.h new/libsodium-1.0.10/src/libsodium/sodium/common.h
--- old/libsodium-1.0.9/src/libsodium/sodium/common.h 2016-03-24 19:23:20.000000000 +0100
+++ new/libsodium-1.0.10/src/libsodium/sodium/common.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,150 +0,0 @@
-#ifndef common_H
-#define common_H 1
-
-#include
-#include
-#include
-
-#define LOAD64_LE(SRC) load64_le(SRC)
-static inline uint64_t
-load64_le(const uint8_t src[8])
-{
-#ifdef NATIVE_LITTLE_ENDIAN
- uint64_t w;
- memcpy(&w, src, sizeof w);
- return w;
-#else
- uint64_t w = (uint64_t) src[0];
- w |= (uint64_t) src[1] << 8;
- w |= (uint64_t) src[2] << 16;
- w |= (uint64_t) src[3] << 24;
- w |= (uint64_t) src[4] << 32;
- w |= (uint64_t) src[5] << 40;
- w |= (uint64_t) src[6] << 48;
- w |= (uint64_t) src[7] << 56;
- return w;
-#endif
-}
-
-#define STORE64_LE(DST, W) store64_le((DST), (W))
-static inline void
-store64_le(uint8_t dst[8], uint64_t w)
-{
-#ifdef NATIVE_LITTLE_ENDIAN
- memcpy(dst, &w, sizeof w);
-#else
- dst[0] = (uint8_t) w; w >>= 8;
- dst[1] = (uint8_t) w; w >>= 8;
- dst[2] = (uint8_t) w; w >>= 8;
- dst[3] = (uint8_t) w; w >>= 8;
- dst[4] = (uint8_t) w; w >>= 8;
- dst[5] = (uint8_t) w; w >>= 8;
- dst[6] = (uint8_t) w; w >>= 8;
- dst[7] = (uint8_t) w;
-#endif
-}
-
-#define LOAD32_LE(SRC) load32_le(SRC)
-static inline uint32_t
-load32_le(const uint8_t src[4])
-{
-#ifdef NATIVE_LITTLE_ENDIAN
- uint32_t w;
- memcpy(&w, src, sizeof w);
- return w;
-#else
- uint32_t w = (uint32_t) src[0];
- w |= (uint32_t) src[1] << 8;
- w |= (uint32_t) src[2] << 16;
- w |= (uint32_t) src[3] << 24;
- return w;
-#endif
-}
-
-#define STORE32_LE(DST, W) store32_le((DST), (W))
-static inline void
-store32_le(uint8_t dst[4], uint32_t w)
-{
-#ifdef NATIVE_LITTLE_ENDIAN
- memcpy(dst, &w, sizeof w);
-#else
- dst[0] = (uint8_t) w; w >>= 8;
- dst[1] = (uint8_t) w; w >>= 8;
- dst[2] = (uint8_t) w; w >>= 8;
- dst[3] = (uint8_t) w;
-#endif
-}
-
-/* ----- */
-
-#define LOAD64_BE(SRC) load64_be(SRC)
-static inline uint64_t
-load64_be(const uint8_t src[8])
-{
-#ifdef NATIVE_BIG_ENDIAN
- uint64_t w;
- memcpy(&w, src, sizeof w);
- return w;
-#else
- uint64_t w = (uint64_t) src[7];
- w |= (uint64_t) src[6] << 8;
- w |= (uint64_t) src[5] << 16;
- w |= (uint64_t) src[4] << 24;
- w |= (uint64_t) src[3] << 32;
- w |= (uint64_t) src[2] << 40;
- w |= (uint64_t) src[1] << 48;
- w |= (uint64_t) src[0] << 56;
- return w;
-#endif
-}
-
-#define LOAD32_BE(SRC) load32_be(SRC)
-static inline uint32_t
-load32_be(const uint8_t src[4])
-{
-#ifdef NATIVE_BIG_ENDIAN
- uint32_t w;
- memcpy(&w, src, sizeof w);
- return w;
-#else
- uint32_t w = (uint32_t) src[3];
- w |= (uint32_t) src[2] << 8;
- w |= (uint32_t) src[1] << 16;
- w |= (uint32_t) src[0] << 24;
- return w;
-#endif
-}
-
-#define STORE64_BE(DST, W) store64_be((DST), (W))
-static inline void
-store64_be(uint8_t dst[8], uint64_t w)
-{
-#ifdef NATIVE_BIG_ENDIAN
- memcpy(dst, &w, sizeof w);
-#else
- dst[7] = (uint8_t) w; w >>= 8;
- dst[6] = (uint8_t) w; w >>= 8;
- dst[5] = (uint8_t) w; w >>= 8;
- dst[4] = (uint8_t) w; w >>= 8;
- dst[3] = (uint8_t) w; w >>= 8;
- dst[2] = (uint8_t) w; w >>= 8;
- dst[1] = (uint8_t) w; w >>= 8;
- dst[0] = (uint8_t) w;
-#endif
-}
-
-#define STORE32_BE(DST, W) store32_be((DST), (W))
-static inline void
-store32_be(uint8_t dst[4], uint32_t w)
-{
-#ifdef NATIVE_BIG_ENDIAN
- memcpy(dst, &w, sizeof w);
-#else
- dst[3] = (uint8_t) w; w >>= 8;
- dst[2] = (uint8_t) w; w >>= 8;
- dst[1] = (uint8_t) w; w >>= 8;
- dst[0] = (uint8_t) w;
-#endif
-}
-
-#endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/test/default/aead_aes256gcm.c new/libsodium-1.0.10/test/default/aead_aes256gcm.c
--- old/libsodium-1.0.9/test/default/aead_aes256gcm.c 2016-03-31 12:05:36.000000000 +0200
+++ new/libsodium-1.0.10/test/default/aead_aes256gcm.c 2016-04-04 21:39:09.000000000 +0200
@@ -3179,7 +3179,7 @@
printf("Message length should have been set to zero after a failure\n");
}
if (crypto_aead_aes256gcm_decrypt(decrypted, &found_message_len,
- NULL, ciphertext,
+ NULL, NULL,
randombytes_uniform(crypto_aead_aes256gcm_ABYTES),
ad, ad_len, nonce, key) != -1) {
printf("Verification of test vector #%u with a truncated tag failed\n",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libsodium-1.0.9/test/default/aead_chacha20poly1305.c new/libsodium-1.0.10/test/default/aead_chacha20poly1305.c
--- old/libsodium-1.0.9/test/default/aead_chacha20poly1305.c 2016-04-02 12:04:18.000000000 +0200
+++ new/libsodium-1.0.10/test/default/aead_chacha20poly1305.c 2016-04-04 21:39:09.000000000 +0200
@@ -111,8 +111,9 @@
}
m2len = 1;
if (crypto_aead_chacha20poly1305_decrypt(
- m2, &m2len, NULL, c, crypto_aead_chacha20poly1305_ABYTES / 2, NULL,
- 0U, nonce, firstkey) != -1) {
+ m2, &m2len, NULL, NULL,
+ randombytes_uniform(crypto_aead_chacha20poly1305_ABYTES),
+ NULL, 0U, nonce, firstkey) != -1) {
printf("crypto_aead_chacha20poly1305_decrypt() worked with a short "
"ciphertext\n");
}
@@ -281,8 +282,9 @@
}
m2len = 1;
if (crypto_aead_chacha20poly1305_ietf_decrypt(
- m2, &m2len, NULL, c, crypto_aead_chacha20poly1305_ietf_ABYTES / 2, NULL,
- 0U, nonce, firstkey) != -1) {
+ m2, &m2len, NULL, NULL,
+ randombytes_uniform(crypto_aead_chacha20poly1305_ietf_ABYTES),
+ NULL, 0U, nonce, firstkey) != -1) {
printf("crypto_aead_chacha20poly1305_ietf_decrypt() worked with a short "
"ciphertext\n");
}
@@ -314,7 +316,7 @@
printf("\n");
if (crypto_aead_chacha20poly1305_ietf_decrypt(c, &m2len, NULL, c, CLEN,
- NULL, 0U, nonce, firstkey) != 0) {
+ NULL, 0U, nonce, firstkey) != 0) {
printf("crypto_aead_chacha20poly1305_ietf_decrypt() failed (adlen=0)\n");
}
if (m2len != MLEN) {