Update to the latest libsodium-stable

jedisct1 · Sep 18, 2018 · fb1a264 · fb1a264
1 parent acabedb
commit fb1a264
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ The `libsodium-osx.a` file has been generated by the
 [dist-build/osx.sh](https://github.com/jedisct1/libsodium/blob/master/dist-build/osx.sh)
 script.
 
-Running these scripts on Xcode 9.3.1 (`9E501`) on the revision `9c6b2e0cebbb2d6f88f8b30b541186eb84b452d1` of libsodium generates files identical to the ones present in this repository.
+Running these scripts on Xcode 10.0 (`10A255`) on the revision `675a899d114a247a6f1ee5e8aa44cd73febb1293` of libsodium generates files identical to the ones present in this repository.
 
 ## Secret-key cryptography
 

diff --git a/Sodium/libsodium/crypto_aead_aes256gcm.h b/Sodium/libsodium/crypto_aead_aes256gcm.h
@@ -52,7 +52,7 @@ size_t crypto_aead_aes256gcm_abytes(void);
 
 #define crypto_aead_aes256gcm_MESSAGEBYTES_MAX \
     SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_aes256gcm_ABYTES, \
-               (16ULL * ((1ULL << 32) - 2ULL)) - crypto_aead_aes256gcm_ABYTES)
+               (16ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
 size_t crypto_aead_aes256gcm_messagebytes_max(void);
 

diff --git a/Sodium/libsodium/crypto_aead_chacha20poly1305.h b/Sodium/libsodium/crypto_aead_chacha20poly1305.h
@@ -32,7 +32,7 @@ size_t crypto_aead_chacha20poly1305_ietf_abytes(void);
 
 #define crypto_aead_chacha20poly1305_ietf_MESSAGEBYTES_MAX \
     SODIUM_MIN(SODIUM_SIZE_MAX - crypto_aead_chacha20poly1305_ietf_ABYTES, \
-               (64ULL * (1ULL << 32) - 64ULL) - crypto_aead_chacha20poly1305_ietf_ABYTES)
+               (64ULL * ((1ULL << 32) - 1ULL)))
 SODIUM_EXPORT
 size_t crypto_aead_chacha20poly1305_ietf_messagebytes_max(void);
 

diff --git a/Sodium/libsodium/crypto_secretstream_xchacha20poly1305.h b/Sodium/libsodium/crypto_secretstream_xchacha20poly1305.h
@@ -30,7 +30,8 @@ SODIUM_EXPORT
 size_t crypto_secretstream_xchacha20poly1305_keybytes(void);
 
 #define crypto_secretstream_xchacha20poly1305_MESSAGEBYTES_MAX \
-    SODIUM_MIN(SODIUM_SIZE_MAX, ((1ULL << 32) - 2ULL) * 64ULL)
+    SODIUM_MIN(SODIUM_SIZE_MAX - crypto_secretstream_xchacha20poly1305_ABYTES, \
+              (64ULL * ((1ULL << 32) - 2ULL)))
 SODIUM_EXPORT
 size_t crypto_secretstream_xchacha20poly1305_messagebytes_max(void);
 

diff --git a/Sodium/libsodium/libsodium-ios.a b/Sodium/libsodium/libsodium-ios.a
diff --git a/Sodium/libsodium/libsodium-osx.a b/Sodium/libsodium/libsodium-osx.a