Merge pull request #121 from reaperhulk/fix-120

Upgrade libsodium to 1.0.1

setup.py

@@ -183,8 +183,7 @@ def run(self):
                 "src/libsodium/install-sh",
                 "src/libsodium/missing",
                 "src/libsodium/msvc-scripts/process.bat",
-                "src/libsodium/test/default/wintest.bat",
-                "src/libsodium/test-driver"]:
+                "src/libsodium/test/default/wintest.bat"]:
             os.chmod(here(filename), 0o755)
 
         # Locate our configure script

src/libsodium/ChangeLog

@@ -1,4 +1,14 @@
 
+* Version 1.0.1
+ - DLL_EXPORT was renamed SODIUM_DLL_EXPORT in order to avoid
+collisions with similar macros defined by other libraries.
+ - sodium_bin2hex() is now constant-time.
+ - crypto_secretbox_detached() now supports overlapping input and output
+regions.
+ - NaCl's donna_c64 implementation of curve25519 was reading an extra byte
+past the end of the buffer containing the base point. This has been
+fixed.
+
 * Version 1.0.0
  - The API and ABI are now stable. New features will be added, but
 backward-compatibility is guaranteed through all the 1.x.y releases.

src/libsodium/LICENSE

@@ -2,7 +2,7 @@
  * Copyright (c) 2013-2014
  * Frank Denis <j at pureftpd dot org>
  *
- * Permission to use, copy, modify, and distribute this software for any
+ * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
  * copyright notice and this permission notice appear in all copies.
  *

src/libsodium/Makefile.in

@@ -83,8 +83,16 @@ DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
 	$(top_srcdir)/configure $(am__configure_deps) \
 	$(srcdir)/libsodium.pc.in \
 	$(top_srcdir)/src/libsodium/include/sodium/version.h.in \
-	AUTHORS ChangeLog README THANKS compile config.guess \
-	config.sub depcomp install-sh missing ltmain.sh
+	AUTHORS ChangeLog README THANKS compile build-aux/compile \
+	config.guess build-aux/config.guess config.sub \
+	build-aux/config.sub depcomp build-aux/depcomp install-sh \
+	build-aux/install-sh missing build-aux/missing ltmain.sh \
+	build-aux/ltmain.sh $(top_srcdir)/build-aux/compile \
+	$(top_srcdir)/build-aux/config.guess \
+	$(top_srcdir)/build-aux/config.sub \
+	$(top_srcdir)/build-aux/install-sh \
+	$(top_srcdir)/build-aux/ltmain.sh \
+	$(top_srcdir)/build-aux/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \

src/libsodium/THANKS

@@ -19,6 +19,7 @@ Jason McCampbell (@jasonmccampbell)
 Jeroen Habraken (@VeXocide)
 Joseph Abrahamson (@tel)
 Kenneth Ballenegger (@kballenegger)
+Loic Maury (@loicmaury)
 Michael Gorlick (@mgorlick)
 Michael Gregorowicz (@mgregoro)
 Omar Ayub (@electricFeel)