RubyGems - rbnacl-libsodium - Versions diffs - 1.0.10 → 1.0.11 - Mend

rbnacl-libsodium 1.0.10 → 1.0.11

Files changed (124) hide show

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

@@ -96,6 +96,9 @@ crypto_secretbox_open_detached(unsigned char *m, const unsigned char *c,
         sodium_memzero(subkey, sizeof subkey);
         return -1;
     }
+    if (m == NULL) {
+        return 0;
+    }
     if (((uintptr_t) c >= (uintptr_t) m &&
          (uintptr_t) c - (uintptr_t) m < clen) ||
         ((uintptr_t) m >= (uintptr_t) c &&

data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128.h CHANGED

@@ -6,7 +6,7 @@
 #include "common.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 #endif

data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.S CHANGED

@@ -136,6 +136,7 @@ movdqa %xmm1,304(%rsp)
 movdqa %xmm2,320(%rsp)
 movdqa %xmm0,336(%rsp)
+.p2align 4
 ._bytesatleast256:
 movq 472(%rsp),%rdx
 mov  %rdx,%rcx
@@ -182,6 +183,7 @@ movdqa 224(%rsp),%xmm13
 movdqa 304(%rsp),%xmm14
 movdqa 352(%rsp),%xmm15
+.p2align 4
 ._mainloop1:
 movdqa %xmm1,384(%rsp)
 movdqa %xmm2,400(%rsp)
@@ -425,6 +427,7 @@ movdqa 384(%rsp),%xmm12
 movdqa 400(%rsp),%xmm0
 sub  $2,%rdx
 ja ._mainloop1
 paddd 176(%rsp),%xmm12
 paddd 240(%rsp),%xmm7
 paddd 288(%rsp),%xmm10
@@ -687,12 +690,14 @@ add  $256,%rsi
 add  $256,%rdi
 cmp  $256,%r9
 jae ._bytesatleast256
 cmp  $0,%r9
 jbe ._done
 ._bytesbetween1and255:
 cmp  $64,%r9
 jae ._nocopy
 mov  %rdi,%rdx
 leaq 0(%rsp),%rdi
 mov  %r9,%rcx
@@ -709,6 +714,7 @@ movdqa 96(%rsp),%xmm3
 movdqa %xmm1,%xmm4
 mov  $20,%rcx
+.p2align 4
 ._mainloop2:
 paddd %xmm0,%xmm4
 movdqa %xmm0,%xmm5
@@ -837,6 +843,7 @@ pxor  %xmm5,%xmm0
 pshufd $0x39,%xmm3,%xmm3
 pxor  %xmm6,%xmm0
 ja ._mainloop2
 paddd 112(%rsp),%xmm0
 paddd 64(%rsp),%xmm1
 paddd 80(%rsp),%xmm2
@@ -912,6 +919,7 @@ movq %rcx,472(%rsp)
 cmp  $64,%r9
 ja ._bytesatleast65
 jae ._bytesatleast64
 mov  %rdi,%rsi
 mov  %rdx,%rdi
 mov  %r9,%rcx

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

@@ -96,6 +96,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_check_compile_flag.m4 \
 	$(top_srcdir)/m4/ax_check_define.m4 \
 	$(top_srcdir)/m4/ax_check_link_flag.m4 \
+	$(top_srcdir)/m4/ax_pthread.m4 \
 	$(top_srcdir)/m4/ax_valgrind_check.m4 \
 	$(top_srcdir)/m4/ld-output-def.m4 $(top_srcdir)/m4/libtool.m4 \
 	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
@@ -293,6 +294,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@
 PACKAGE_URL = @PACKAGE_URL@
 PACKAGE_VERSION = @PACKAGE_VERSION@
 PATH_SEPARATOR = @PATH_SEPARATOR@
+PTHREAD_CC = @PTHREAD_CC@
+PTHREAD_CFLAGS = @PTHREAD_CFLAGS@
+PTHREAD_LIBS = @PTHREAD_LIBS@
 RANLIB = @RANLIB@
 SAFECODE_HOME = @SAFECODE_HOME@
 SED = @SED@
@@ -322,6 +326,7 @@ am__leading_dot = @am__leading_dot@
 am__quote = @am__quote@
 am__tar = @am__tar@
 am__untar = @am__untar@
+ax_pthread_config = @ax_pthread_config@
 bindir = @bindir@
 build = @build@
 build_alias = @build_alias@

data/vendor/libsodium/src/libsodium/include/sodium/crypto_aead_aes256gcm.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_aead_chacha20poly1305.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha256.h CHANGED

@@ -6,7 +6,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512.h CHANGED

@@ -6,7 +6,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h CHANGED

@@ -6,7 +6,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_box.h CHANGED

@@ -3,8 +3,8 @@
 /*
  * THREAD SAFETY: crypto_box_keypair() is thread-safe,
- * provided that you called sodium_init() once before using any
- * other libsodium function.
+ * provided that sodium_init() was called before.
+ *
  * Other functions are always thread-safe.
  */
@@ -14,7 +14,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash_blake2b.h CHANGED

@@ -8,7 +8,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash.h CHANGED

@@ -14,7 +14,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha256.h CHANGED

@@ -15,7 +15,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha512.h CHANGED

@@ -15,7 +15,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_argon2i.h CHANGED

@@ -6,7 +6,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_shorthash.h CHANGED

@@ -7,7 +7,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_shorthash_siphash24.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign.h CHANGED

@@ -3,8 +3,8 @@
 /*
  * THREAD SAFETY: crypto_sign_keypair() is thread-safe,
- * provided that you called sodium_init() once before using any
- * other libsodium function.
+ * provided that sodium_init() was called before.
+ *
  * Other functions, including crypto_sign_seed_keypair() are always thread-safe.
  */
@@ -14,7 +14,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h CHANGED

@@ -5,7 +5,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h CHANGED

@@ -16,7 +16,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream.h CHANGED

@@ -15,7 +15,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_aes128ctr.h CHANGED

@@ -13,7 +13,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_chacha20.h CHANGED

@@ -14,7 +14,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa20.h CHANGED

@@ -14,7 +14,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa2012.h CHANGED

@@ -13,7 +13,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa208.h CHANGED

@@ -13,7 +13,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_xsalsa20.h CHANGED

@@ -14,7 +14,7 @@
 #include "export.h"
 #ifdef __cplusplus
-# if __GNUC__
+# ifdef __GNUC__
 #  pragma GCC diagnostic ignored "-Wlong-long"
 # endif
 extern "C" {

data/vendor/libsodium/src/libsodium/include/sodium/private/curve25519_ref10.h CHANGED

@@ -1,5 +1,5 @@
-#ifndef CURVE25519_REF10_H
-#define CURVE25519_REF10_H
+#ifndef curve25519_ref10_H
+#define curve25519_ref10_H
 #include <stddef.h>
 #include <stdint.h>