diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am index 659a6c4a..f7f481be 100644 --- a/src/libsodium/include/Makefile.am +++ b/src/libsodium/include/Makefile.am @@ -45,6 +45,7 @@ SODIUM_EXPORT = \ sodium/crypto_uint8.h \ sodium/crypto_verify_16.h \ sodium/crypto_verify_32.h \ + sodium/export.h \ sodium/randombytes.h \ sodium/randombytes_salsa20_random.h \ sodium/randombytes_sysrandom.h \ diff --git a/src/libsodium/include/sodium/core.h b/src/libsodium/include/sodium/core.h index 745acdb9..55d2c2a0 100644 --- a/src/libsodium/include/sodium/core.h +++ b/src/libsodium/include/sodium/core.h @@ -2,6 +2,8 @@ #ifndef __SODIUM_CORE_H__ #define __SODIUM_CORE_H__ +#include "export.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/libsodium/include/sodium/crypto_auth.h b/src/libsodium/include/sodium/crypto_auth.h index df6abd1a..2c0b67ea 100644 --- a/src/libsodium/include/sodium/crypto_auth.h +++ b/src/libsodium/include/sodium/crypto_auth.h @@ -4,6 +4,7 @@ #include #include "crypto_auth_hmacsha512256.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h index b4d40e60..da4e31b7 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h @@ -1,6 +1,8 @@ #ifndef crypto_auth_hmacsha256_H #define crypto_auth_hmacsha256_H +#include "export.h" + #define crypto_auth_hmacsha256_BYTES 32 #define crypto_auth_hmacsha256_KEYBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h index ce3b0af1..02b9f5c2 100644 --- a/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +++ b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h @@ -1,6 +1,8 @@ #ifndef crypto_auth_hmacsha512256_H #define crypto_auth_hmacsha512256_H +#include "export.h" + #define crypto_auth_hmacsha512256_BYTES 32 #define crypto_auth_hmacsha512256_KEYBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_box.h b/src/libsodium/include/sodium/crypto_box.h index f17cd472..f0fd55ae 100644 --- a/src/libsodium/include/sodium/crypto_box.h +++ b/src/libsodium/include/sodium/crypto_box.h @@ -4,6 +4,7 @@ #include #include "crypto_box_curve25519xsalsa20poly1305.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h index 14de0857..d16e5ad9 100644 --- a/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h @@ -1,6 +1,8 @@ #ifndef crypto_box_curve25519xsalsa20poly1305_H #define crypto_box_curve25519xsalsa20poly1305_H +#include "export.h" + #define crypto_box_curve25519xsalsa20poly1305_PUBLICKEYBYTES 32 #define crypto_box_curve25519xsalsa20poly1305_SECRETKEYBYTES 32 #define crypto_box_curve25519xsalsa20poly1305_BEFORENMBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h index a16e0fc7..ea527981 100644 --- a/src/libsodium/include/sodium/crypto_core_hsalsa20.h +++ b/src/libsodium/include/sodium/crypto_core_hsalsa20.h @@ -1,6 +1,8 @@ #ifndef crypto_core_hsalsa20_H #define crypto_core_hsalsa20_H +#include "export.h" + #define crypto_core_hsalsa20_OUTPUTBYTES 32 #define crypto_core_hsalsa20_INPUTBYTES 16 #define crypto_core_hsalsa20_KEYBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h index cdd3a94c..34205abb 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa20.h +++ b/src/libsodium/include/sodium/crypto_core_salsa20.h @@ -1,6 +1,8 @@ #ifndef crypto_core_salsa20_H #define crypto_core_salsa20_H +#include "export.h" + #define crypto_core_salsa20_OUTPUTBYTES 64 #define crypto_core_salsa20_INPUTBYTES 16 #define crypto_core_salsa20_KEYBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h index 782ae12c..e9bfe2d3 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_core_salsa2012.h @@ -1,6 +1,8 @@ #ifndef crypto_core_salsa2012_H #define crypto_core_salsa2012_H +#include "export.h" + #define crypto_core_salsa2012_OUTPUTBYTES 64 #define crypto_core_salsa2012_INPUTBYTES 16 #define crypto_core_salsa2012_KEYBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h index 1d357ae1..27a6bd2f 100644 --- a/src/libsodium/include/sodium/crypto_core_salsa208.h +++ b/src/libsodium/include/sodium/crypto_core_salsa208.h @@ -1,6 +1,8 @@ #ifndef crypto_core_salsa208_H #define crypto_core_salsa208_H +#include "export.h" + #define crypto_core_salsa208_OUTPUTBYTES 64 #define crypto_core_salsa208_INPUTBYTES 16 #define crypto_core_salsa208_KEYBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_generichash.h b/src/libsodium/include/sodium/crypto_generichash.h index b9baf57c..db8fe31d 100644 --- a/src/libsodium/include/sodium/crypto_generichash.h +++ b/src/libsodium/include/sodium/crypto_generichash.h @@ -4,6 +4,7 @@ #include #include "crypto_generichash_blake2b.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_generichash_blake2b.h b/src/libsodium/include/sodium/crypto_generichash_blake2b.h index d824ae2e..c86d219b 100644 --- a/src/libsodium/include/sodium/crypto_generichash_blake2b.h +++ b/src/libsodium/include/sodium/crypto_generichash_blake2b.h @@ -4,6 +4,8 @@ #include #include +#include "export.h" + #define crypto_generichash_blake2b_BYTES_MIN 1U #define crypto_generichash_blake2b_BYTES_MAX 64U #define crypto_generichash_blake2b_KEYBYTES_MIN 0U diff --git a/src/libsodium/include/sodium/crypto_hash.h b/src/libsodium/include/sodium/crypto_hash.h index 37126a27..ebd6104e 100644 --- a/src/libsodium/include/sodium/crypto_hash.h +++ b/src/libsodium/include/sodium/crypto_hash.h @@ -2,6 +2,7 @@ #define crypto_hash_H #include "crypto_hash_sha512.h" +#include "export.h" #define crypto_hash_BYTES crypto_hash_sha512_BYTES #define crypto_hash_BLOCKBYTES crypto_hash_sha512_BLOCKBYTES diff --git a/src/libsodium/include/sodium/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h index 1677827c..e1a45876 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha256.h +++ b/src/libsodium/include/sodium/crypto_hash_sha256.h @@ -1,6 +1,8 @@ #ifndef crypto_hash_sha256_H #define crypto_hash_sha256_H +#include "export.h" + #define crypto_hash_sha256_BYTES 32 #define crypto_hash_sha256_BLOCKBYTES 64 diff --git a/src/libsodium/include/sodium/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h index 3bac1b80..3f49573e 100644 --- a/src/libsodium/include/sodium/crypto_hash_sha512.h +++ b/src/libsodium/include/sodium/crypto_hash_sha512.h @@ -1,6 +1,8 @@ #ifndef crypto_hash_sha512_H #define crypto_hash_sha512_H +#include "export.h" + #define crypto_hash_sha512_BYTES 64 #define crypto_hash_sha512_BLOCKBYTES 128 diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h index 6c230bd9..f9009def 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha256.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h @@ -1,6 +1,8 @@ #ifndef crypto_hashblocks_sha256_H #define crypto_hashblocks_sha256_H +#include "export.h" + #define crypto_hashblocks_sha256_STATEBYTES 32 #define crypto_hashblocks_sha256_BLOCKBYTES 64 diff --git a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h index 934aa661..086ee1b7 100644 --- a/src/libsodium/include/sodium/crypto_hashblocks_sha512.h +++ b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h @@ -1,6 +1,8 @@ #ifndef crypto_hashblocks_sha512_H #define crypto_hashblocks_sha512_H +#include "export.h" + #define crypto_hashblocks_sha512_STATEBYTES 64 #define crypto_hashblocks_sha512_BLOCKBYTES 128 diff --git a/src/libsodium/include/sodium/crypto_onetimeauth.h b/src/libsodium/include/sodium/crypto_onetimeauth.h index 368efe3a..65c0fd3b 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth.h @@ -2,6 +2,7 @@ #define crypto_onetimeauth_H #include "crypto_onetimeauth_poly1305.h" +#include "export.h" #define crypto_onetimeauth crypto_onetimeauth_poly1305 #define crypto_onetimeauth_verify crypto_onetimeauth_poly1305_verify diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h index 7e6883e6..fe56a0f8 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h @@ -1,6 +1,8 @@ #ifndef crypto_onetimeauth_poly1305_H #define crypto_onetimeauth_poly1305_H +#include "export.h" + #define crypto_onetimeauth_poly1305_BYTES 16 #define crypto_onetimeauth_poly1305_KEYBYTES 32 #ifdef __cplusplus diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h index 02d93db2..fd2bef58 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h @@ -2,6 +2,7 @@ #define crypto_onetimeauth_poly1305_53_H #include "crypto_onetimeauth_poly1305.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_ref.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_ref.h index 1bc1d817..93209340 100644 --- a/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_ref.h +++ b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_ref.h @@ -2,6 +2,7 @@ #define crypto_onetimeauth_poly1305_ref_H #include "crypto_onetimeauth_poly1305.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_scalarmult.h b/src/libsodium/include/sodium/crypto_scalarmult.h index c101a2fd..34672fbd 100644 --- a/src/libsodium/include/sodium/crypto_scalarmult.h +++ b/src/libsodium/include/sodium/crypto_scalarmult.h @@ -4,6 +4,7 @@ #include #include "crypto_scalarmult_curve25519.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_secretbox.h b/src/libsodium/include/sodium/crypto_secretbox.h index 08e871c4..68d64e80 100644 --- a/src/libsodium/include/sodium/crypto_secretbox.h +++ b/src/libsodium/include/sodium/crypto_secretbox.h @@ -4,6 +4,7 @@ #include #include "crypto_secretbox_xsalsa20poly1305.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h index 523e31f9..0c211508 100644 --- a/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +++ b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h @@ -1,6 +1,8 @@ #ifndef crypto_secretbox_xsalsa20poly1305_H #define crypto_secretbox_xsalsa20poly1305_H +#include "export.h" + #define crypto_secretbox_xsalsa20poly1305_KEYBYTES 32 #define crypto_secretbox_xsalsa20poly1305_NONCEBYTES 24 #define crypto_secretbox_xsalsa20poly1305_ZEROBYTES 32 diff --git a/src/libsodium/include/sodium/crypto_shorthash.h b/src/libsodium/include/sodium/crypto_shorthash.h index 9e8d900b..ffbc999b 100644 --- a/src/libsodium/include/sodium/crypto_shorthash.h +++ b/src/libsodium/include/sodium/crypto_shorthash.h @@ -4,6 +4,7 @@ #include #include "crypto_shorthash_siphash24.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h index 7d643a0e..f09b5231 100644 --- a/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +++ b/src/libsodium/include/sodium/crypto_shorthash_siphash24.h @@ -1,6 +1,8 @@ #ifndef crypto_shorthash_siphash24_H #define crypto_shorthash_siphash24_H +#include "export.h" + #define crypto_shorthash_siphash24_BYTES 8 #define crypto_shorthash_siphash24_KEYBYTES 16 diff --git a/src/libsodium/include/sodium/crypto_sign.h b/src/libsodium/include/sodium/crypto_sign.h index b0cc83a3..775e9cba 100644 --- a/src/libsodium/include/sodium/crypto_sign.h +++ b/src/libsodium/include/sodium/crypto_sign.h @@ -4,6 +4,7 @@ #include #include "crypto_sign_ed25519.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h index ff2c45c2..75d2aebb 100644 --- a/src/libsodium/include/sodium/crypto_sign_ed25519.h +++ b/src/libsodium/include/sodium/crypto_sign_ed25519.h @@ -1,6 +1,8 @@ #ifndef crypto_sign_ed25519_H #define crypto_sign_ed25519_H +#include "export.h" + #define crypto_sign_ed25519_SECRETKEYBYTES 64 #define crypto_sign_ed25519_PUBLICKEYBYTES 32 #define crypto_sign_ed25519_BYTES 64 diff --git a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h index c0c52517..f344e0e3 100644 --- a/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h +++ b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h @@ -1,6 +1,8 @@ #ifndef crypto_sign_edwards25519sha512batch_H #define crypto_sign_edwards25519sha512batch_H +#include "export.h" + #define crypto_sign_edwards25519sha512batch_SECRETKEYBYTES 64 #define crypto_sign_edwards25519sha512batch_PUBLICKEYBYTES 32 #define crypto_sign_edwards25519sha512batch_BYTES 64 diff --git a/src/libsodium/include/sodium/crypto_stream.h b/src/libsodium/include/sodium/crypto_stream.h index 6c6d9ac9..e26599ab 100644 --- a/src/libsodium/include/sodium/crypto_stream.h +++ b/src/libsodium/include/sodium/crypto_stream.h @@ -4,6 +4,7 @@ #include #include "crypto_stream_xsalsa20.h" +#include "export.h" #ifdef __cplusplus extern "C" { diff --git a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h index c0b46ef5..749df9a4 100644 --- a/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +++ b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h @@ -1,6 +1,8 @@ #ifndef crypto_stream_aes128ctr_H #define crypto_stream_aes128ctr_H +#include "export.h" + #define crypto_stream_aes128ctr_KEYBYTES 16 #define crypto_stream_aes128ctr_NONCEBYTES 16 #define crypto_stream_aes128ctr_BEFORENMBYTES 1408 diff --git a/src/libsodium/include/sodium/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h index faeb758e..3bc12875 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa20.h @@ -1,6 +1,8 @@ #ifndef crypto_stream_salsa20_H #define crypto_stream_salsa20_H +#include "export.h" + #define crypto_stream_salsa20_KEYBYTES 32 #define crypto_stream_salsa20_NONCEBYTES 8 diff --git a/src/libsodium/include/sodium/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h index 7a49e52a..31945155 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa2012.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa2012.h @@ -1,6 +1,8 @@ #ifndef crypto_stream_salsa2012_H #define crypto_stream_salsa2012_H +#include "export.h" + #define crypto_stream_salsa2012_KEYBYTES 32 #define crypto_stream_salsa2012_NONCEBYTES 8 diff --git a/src/libsodium/include/sodium/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h index 0ab6a9c0..29204d72 100644 --- a/src/libsodium/include/sodium/crypto_stream_salsa208.h +++ b/src/libsodium/include/sodium/crypto_stream_salsa208.h @@ -1,6 +1,8 @@ #ifndef crypto_stream_salsa208_H #define crypto_stream_salsa208_H +#include "export.h" + #define crypto_stream_salsa208_KEYBYTES 32 #define crypto_stream_salsa208_NONCEBYTES 8 diff --git a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h index ab48aa72..af2309b8 100644 --- a/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +++ b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h @@ -1,6 +1,8 @@ #ifndef crypto_stream_xsalsa20_H #define crypto_stream_xsalsa20_H +#include "export.h" + #define crypto_stream_xsalsa20_KEYBYTES 32 #define crypto_stream_xsalsa20_NONCEBYTES 24 diff --git a/src/libsodium/include/sodium/crypto_verify_16.h b/src/libsodium/include/sodium/crypto_verify_16.h index fca477f7..e73199dc 100644 --- a/src/libsodium/include/sodium/crypto_verify_16.h +++ b/src/libsodium/include/sodium/crypto_verify_16.h @@ -1,6 +1,8 @@ #ifndef crypto_verify_16_H #define crypto_verify_16_H +#include "export.h" + #define crypto_verify_16_BYTES 16 #ifdef __cplusplus diff --git a/src/libsodium/include/sodium/crypto_verify_32.h b/src/libsodium/include/sodium/crypto_verify_32.h index bf8251e0..a205201a 100644 --- a/src/libsodium/include/sodium/crypto_verify_32.h +++ b/src/libsodium/include/sodium/crypto_verify_32.h @@ -1,6 +1,8 @@ #ifndef crypto_verify_32_H #define crypto_verify_32_H +#include "export.h" + #define crypto_verify_32_BYTES 32 #ifdef __cplusplus diff --git a/src/libsodium/include/sodium/randombytes.h b/src/libsodium/include/sodium/randombytes.h index e9c5a612..4866b7a9 100644 --- a/src/libsodium/include/sodium/randombytes.h +++ b/src/libsodium/include/sodium/randombytes.h @@ -7,6 +7,8 @@ #include #include +#include "export.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/libsodium/include/sodium/randombytes_salsa20_random.h b/src/libsodium/include/sodium/randombytes_salsa20_random.h index 9e2dadce..d4d5bef5 100644 --- a/src/libsodium/include/sodium/randombytes_salsa20_random.h +++ b/src/libsodium/include/sodium/randombytes_salsa20_random.h @@ -5,6 +5,8 @@ #include #include +#include "export.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/libsodium/include/sodium/randombytes_sysrandom.h b/src/libsodium/include/sodium/randombytes_sysrandom.h index b0e23703..1c7d3c6b 100644 --- a/src/libsodium/include/sodium/randombytes_sysrandom.h +++ b/src/libsodium/include/sodium/randombytes_sysrandom.h @@ -5,6 +5,8 @@ #include #include +#include "export.h" + #ifdef __cplusplus extern "C" { #endif diff --git a/src/libsodium/include/sodium/utils.h b/src/libsodium/include/sodium/utils.h index 1dae4aba..3e8f90f3 100644 --- a/src/libsodium/include/sodium/utils.h +++ b/src/libsodium/include/sodium/utils.h @@ -4,6 +4,8 @@ #include +#include "export.h" + #ifdef __cplusplus extern "C" { #endif