From ee16bc6e6c7a51d497c827d276e0a8ba4bdc73ae Mon Sep 17 00:00:00 2001 From: Douglas Campos Date: Sun, 20 Jan 2013 17:14:35 -0200 Subject: [PATCH] rename libnacl-ref -> libsodium --- .gitignore | 2 +- configure.ac | 12 +++--- src/Makefile.am | 2 +- src/libnacl-ref/include/Makefile.am | 42 ------------------- src/{libnacl-ref => libsodium}/Makefile.am | 10 ++--- .../crypto_auth/hmacsha256/checksum | 0 .../crypto_auth/hmacsha256/ref/api.h | 0 .../crypto_auth/hmacsha256/ref/crypto_auth.h | 0 .../hmacsha256/ref/hmac_hmacsha256.c | 0 .../hmacsha256/ref/verify_hmacsha256.c | 0 .../crypto_auth/hmacsha512256/checksum | 0 .../crypto_auth/hmacsha512256/ref/api.h | 0 .../hmacsha512256/ref/crypto_auth.h | 0 .../hmacsha512256/ref/hmac_hmacsha512256.c | 0 .../hmacsha512256/ref/verify_hmacsha512256.c | 0 .../crypto_auth/measure.c | 0 .../crypto_auth/try.c | 0 .../curve25519xsalsa20poly1305/checksum | 0 .../ref/after_curve25519xsalsa20poly1305.c | 0 .../curve25519xsalsa20poly1305/ref/api.h | 0 .../ref/before_curve25519xsalsa20poly1305.c | 0 .../ref/box_curve25519xsalsa20poly1305.c | 0 .../ref/crypto_box.h | 0 .../ref/keypair_curve25519xsalsa20poly1305.c | 0 .../crypto_box/measure.c | 0 .../crypto_box/try.c | 0 .../crypto_core/hsalsa20/checksum | 0 .../crypto_core/hsalsa20/ref/api.h | 0 .../crypto_core/hsalsa20/ref/core.c | 0 .../crypto_core/hsalsa20/ref/crypto_core.h | 0 .../crypto_core/hsalsa20/ref/implementors | 0 .../crypto_core/hsalsa20/ref2/api.h | 0 .../crypto_core/hsalsa20/ref2/core_hsalsa20.c | 0 .../crypto_core/hsalsa20/ref2/crypto_core.h | 0 .../crypto_core/hsalsa20/ref2/implementors | 0 .../crypto_core/salsa20/checksum | 0 .../crypto_core/salsa20/ref/api.h | 0 .../crypto_core/salsa20/ref/core_salsa20.c | 0 .../crypto_core/salsa20/ref/crypto_core.h | 0 .../crypto_core/salsa20/ref/implementors | 0 .../crypto_core/salsa2012/checksum | 0 .../crypto_core/salsa2012/ref/api.h | 0 .../salsa2012/ref/core_salsa2012.c | 0 .../crypto_core/salsa2012/ref/crypto_core.h | 0 .../crypto_core/salsa2012/ref/implementors | 0 .../crypto_core/salsa208/checksum | 0 .../crypto_core/salsa208/ref/api.h | 0 .../crypto_core/salsa208/ref/core_salsa208.c | 0 .../crypto_core/salsa208/ref/crypto_core.h | 0 .../crypto_core/salsa208/ref/implementors | 0 .../crypto_hash/measure.c | 0 .../crypto_hash/sha256/checksum | 0 .../crypto_hash/sha256/ref/api.h | 0 .../crypto_hash/sha256/ref/crypto_hash.h | 0 .../crypto_hash/sha256/ref/hash_sha256.c | 0 .../crypto_hash/sha256/ref/implementors | 0 .../crypto_hash/sha512/checksum | 0 .../crypto_hash/sha512/ref/api.h | 0 .../crypto_hash/sha512/ref/crypto_hash.h | 0 .../crypto_hash/sha512/ref/hash_sha512.c | 0 .../crypto_hash/sha512/ref/implementors | 0 .../crypto_hash/try.c | 0 .../crypto_hashblocks/measure.c | 0 .../crypto_hashblocks/sha256/checksum | 0 .../crypto_hashblocks/sha256/inplace/api.h | 0 .../crypto_hashblocks/sha256/inplace/blocks.c | 0 .../sha256/inplace/implementors | 0 .../crypto_hashblocks/sha256/ref/api.h | 0 .../sha256/ref/blocks_sha256.c | 0 .../sha256/ref/crypto_hashblocks.h | 0 .../crypto_hashblocks/sha256/ref/implementors | 0 .../crypto_hashblocks/sha512/checksum | 0 .../crypto_hashblocks/sha512/inplace/api.h | 0 .../crypto_hashblocks/sha512/inplace/blocks.c | 0 .../sha512/inplace/implementors | 0 .../crypto_hashblocks/sha512/ref/api.h | 0 .../sha512/ref/blocks_sha512.c | 0 .../sha512/ref/crypto_hashblocks.h | 0 .../crypto_hashblocks/sha512/ref/implementors | 0 .../crypto_hashblocks/try.c | 0 .../crypto_onetimeauth/measure.c | 0 .../crypto_onetimeauth/poly1305/checksum | 0 .../crypto_onetimeauth/poly1305/ref/api.h | 0 .../poly1305/ref/auth_poly1305.c | 0 .../poly1305/ref/crypto_onetimeauth.h | 0 .../poly1305/ref/verify_poly1305.c | 0 .../crypto_onetimeauth/try.c | 0 .../crypto_scalarmult/curve25519/checksum | 0 .../curve25519/donna_c64/api.h | 0 .../curve25519/donna_c64/base.c | 0 .../curve25519/donna_c64/implementors | 0 .../curve25519/donna_c64/smult.c | 0 .../crypto_scalarmult/curve25519/ref/api.h | 0 .../crypto_scalarmult/curve25519/ref/base.c | 0 .../curve25519/ref/crypto_scalarmult.h | 0 .../curve25519/ref/implementors | 0 .../crypto_scalarmult/curve25519/ref/smult.c | 0 .../crypto_scalarmult/measure.c | 0 .../crypto_scalarmult/try.c | 0 .../crypto_secretbox/measure.c | 0 .../crypto_secretbox/try.c | 0 .../xsalsa20poly1305/checksum | 0 .../xsalsa20poly1305/ref/api.h | 0 .../ref/box_xsalsa20poly1305.c | 0 .../xsalsa20poly1305/ref/crypto_secretbox.h | 0 .../crypto_sign/ed25519/description | 0 .../crypto_sign/ed25519/designers | 0 .../crypto_sign/ed25519/ref/api.h | 0 .../crypto_sign/ed25519/ref/crypto_sign.h | 0 .../crypto_sign/ed25519/ref/ed25519_ed25519.c | 0 .../crypto_sign/ed25519/ref/fe25519.h | 0 .../crypto_sign/ed25519/ref/fe25519_ed25519.c | 0 .../crypto_sign/ed25519/ref/ge25519.h | 0 .../crypto_sign/ed25519/ref/ge25519_base.data | 0 .../crypto_sign/ed25519/ref/ge25519_ed25519.c | 0 .../crypto_sign/ed25519/ref/implementors | 0 .../crypto_sign/ed25519/ref/sc25519.h | 0 .../crypto_sign/ed25519/ref/sc25519_ed25519.c | 0 .../edwards25519sha512batch/ref/api.h | 0 .../edwards25519sha512batch/ref/crypto_sign.h | 0 .../edwards25519sha512batch/ref/fe25519.h | 0 .../ref/fe25519_edwards25519sha512batch.c | 0 .../edwards25519sha512batch/ref/ge25519.h | 0 .../ref/ge25519_edwards25519sha512batch.c | 0 .../edwards25519sha512batch/ref/sc25519.h | 0 .../ref/sc25519_edwards25519sha512batch.c | 0 .../ref/sign_edwards25519sha512batch.c | 0 .../crypto_sign/measure.c | 0 .../crypto_sign/try.c | 0 .../crypto_stream/aes128ctr/checksum | 0 .../aes128ctr/portable/afternm_aes128ctr.c | 0 .../crypto_stream/aes128ctr/portable/api.h | 0 .../aes128ctr/portable/beforenm_aes128ctr.c | 0 .../crypto_stream/aes128ctr/portable/common.h | 0 .../aes128ctr/portable/common_aes128ctr.c | 0 .../crypto_stream/aes128ctr/portable/consts.h | 0 .../aes128ctr/portable/consts_aes128ctr.c | 0 .../aes128ctr/portable/crypto_stream.h | 0 .../crypto_stream/aes128ctr/portable/int128.h | 0 .../aes128ctr/portable/int128_aes128ctr.c | 0 .../aes128ctr/portable/stream_aes128ctr.c | 0 .../crypto_stream/aes128ctr/portable/types.h | 0 .../portable/xor_afternm_aes128ctr.c | 0 .../crypto_stream/measure.c | 0 .../crypto_stream/salsa20/checksum | 0 .../crypto_stream/salsa20/ref/api.h | 0 .../crypto_stream/salsa20/ref/crypto_stream.h | 0 .../crypto_stream/salsa20/ref/implementors | 0 .../salsa20/ref/stream_salsa20.c | 0 .../crypto_stream/salsa20/ref/xor_salsa20.c | 0 .../crypto_stream/salsa2012/checksum | 0 .../crypto_stream/salsa2012/ref/api.h | 0 .../salsa2012/ref/crypto_stream.h | 0 .../crypto_stream/salsa2012/ref/implementors | 0 .../salsa2012/ref/stream_salsa2012.c | 0 .../salsa2012/ref/xor_salsa2012.c | 0 .../crypto_stream/salsa208/checksum | 0 .../crypto_stream/salsa208/ref/api.h | 0 .../salsa208/ref/crypto_stream.h | 0 .../crypto_stream/salsa208/ref/implementors | 0 .../salsa208/ref/stream_salsa208.c | 0 .../crypto_stream/salsa208/ref/xor_salsa208.c | 0 .../crypto_stream/try.c | 0 .../crypto_stream/xsalsa20/checksum | 0 .../crypto_stream/xsalsa20/ref/api.h | 0 .../xsalsa20/ref/crypto_stream.h | 0 .../crypto_stream/xsalsa20/ref/implementors | 0 .../xsalsa20/ref/stream_xsalsa20.c | 0 .../crypto_stream/xsalsa20/ref/xor_xsalsa20.c | 0 .../crypto_verify/16/checksum | 0 .../crypto_verify/16/ref/api.h | 0 .../crypto_verify/16/ref/crypto_verify.h | 0 .../crypto_verify/16/ref/verify_16.c | 0 .../crypto_verify/32/checksum | 0 .../crypto_verify/32/ref/api.h | 0 .../crypto_verify/32/ref/crypto_verify.h | 0 .../crypto_verify/32/ref/verify_32.c | 0 .../crypto_verify/measure.c | 0 .../crypto_verify/try.c | 0 src/libsodium/include/Makefile.am | 42 +++++++++++++++++++ .../include/sodium}/crypto_auth.h | 0 .../include/sodium}/crypto_auth_hmacsha256.h | 0 .../sodium}/crypto_auth_hmacsha512256.h | 0 .../include/sodium}/crypto_box.h | 0 .../crypto_box_curve25519xsalsa20poly1305.h | 0 .../include/sodium}/crypto_core_hsalsa20.h | 0 .../include/sodium}/crypto_core_salsa20.h | 0 .../include/sodium}/crypto_core_salsa2012.h | 0 .../include/sodium}/crypto_core_salsa208.h | 0 .../include/sodium}/crypto_hash.h | 0 .../include/sodium}/crypto_hash_sha256.h | 0 .../include/sodium}/crypto_hash_sha512.h | 0 .../sodium}/crypto_hashblocks_sha256.h | 0 .../sodium}/crypto_hashblocks_sha512.h | 0 .../include/sodium}/crypto_onetimeauth.h | 0 .../sodium}/crypto_onetimeauth_poly1305.h | 0 .../sodium}/crypto_scalarmult_curve25519.h | 0 .../include/sodium}/crypto_secretbox.h | 0 .../crypto_secretbox_xsalsa20poly1305.h | 0 .../include/sodium}/crypto_sign.h | 0 .../include/sodium}/crypto_sign_ed25519.h | 0 .../crypto_sign_edwards25519sha512batch.h | 0 .../include/sodium}/crypto_stream.h | 0 .../include/sodium}/crypto_stream_aes128ctr.h | 0 .../include/sodium}/crypto_stream_salsa20.h | 0 .../include/sodium}/crypto_stream_salsa2012.h | 0 .../include/sodium}/crypto_stream_salsa208.h | 0 .../include/sodium}/crypto_stream_xsalsa20.h | 0 .../include/sodium}/crypto_uint16.h | 0 .../include/sodium}/crypto_uint32.h | 0 .../include/sodium}/crypto_uint64.h | 0 .../include/sodium}/crypto_uint8.h | 0 .../include/sodium}/crypto_verify_16.h | 0 .../include/sodium}/crypto_verify_32.h | 0 .../include/sodium}/randombytes.h | 0 .../include/sodium}/version.h.in | 0 .../randombytes/devurandom.c | 0 .../randombytes/devurandom.h | 0 218 files changed, 55 insertions(+), 55 deletions(-) delete mode 100644 src/libnacl-ref/include/Makefile.am rename src/{libnacl-ref => libsodium}/Makefile.am (96%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha256/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha256/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha256/ref/crypto_auth.h (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha256/ref/hmac_hmacsha256.c (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha256/ref/verify_hmacsha256.c (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha512256/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha512256/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha512256/ref/crypto_auth.h (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_auth/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h (100%) rename src/{libnacl-ref => libsodium}/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_box/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_box/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref/core.c (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref/crypto_core.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref2/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref2/core_hsalsa20.c (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref2/crypto_core.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/hsalsa20/ref2/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa20/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa20/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa20/ref/core_salsa20.c (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa20/ref/crypto_core.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa20/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa2012/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa2012/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa2012/ref/core_salsa2012.c (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa2012/ref/crypto_core.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa2012/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa208/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa208/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa208/ref/core_salsa208.c (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa208/ref/crypto_core.h (100%) rename src/{libnacl-ref => libsodium}/crypto_core/salsa208/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha256/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha256/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha256/ref/crypto_hash.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha256/ref/hash_sha256.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha256/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha512/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha512/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha512/ref/crypto_hash.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha512/ref/hash_sha512.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/sha512/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hash/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/inplace/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/inplace/blocks.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/inplace/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/ref/blocks_sha256.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/ref/crypto_hashblocks.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha256/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/inplace/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/inplace/blocks.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/inplace/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/ref/blocks_sha512.c (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/ref/crypto_hashblocks.h (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/sha512/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_hashblocks/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/poly1305/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/poly1305/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/poly1305/ref/auth_poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/poly1305/ref/verify_poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_onetimeauth/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/donna_c64/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/donna_c64/base.c (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/donna_c64/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/donna_c64/smult.c (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/ref/base.c (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/curve25519/ref/smult.c (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_scalarmult/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_secretbox/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_secretbox/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_secretbox/xsalsa20poly1305/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_secretbox/xsalsa20poly1305/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c (100%) rename src/{libnacl-ref => libsodium}/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/description (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/designers (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/crypto_sign.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/ed25519_ed25519.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/fe25519.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/fe25519_ed25519.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/ge25519.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/ge25519_base.data (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/ge25519_ed25519.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/sc25519.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/ed25519/ref/sc25519_ed25519.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/crypto_sign.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/fe25519.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/ge25519.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/sc25519.h (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_sign/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/common.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/common_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/consts.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/consts_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/crypto_stream.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/int128.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/int128_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/stream_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/types.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa20/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa20/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa20/ref/crypto_stream.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa20/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa20/ref/stream_salsa20.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa20/ref/xor_salsa20.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa2012/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa2012/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa2012/ref/crypto_stream.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa2012/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa2012/ref/stream_salsa2012.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa2012/ref/xor_salsa2012.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa208/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa208/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa208/ref/crypto_stream.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa208/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa208/ref/stream_salsa208.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/salsa208/ref/xor_salsa208.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/try.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/xsalsa20/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/xsalsa20/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/xsalsa20/ref/crypto_stream.h (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/xsalsa20/ref/implementors (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/xsalsa20/ref/stream_xsalsa20.c (100%) rename src/{libnacl-ref => libsodium}/crypto_stream/xsalsa20/ref/xor_xsalsa20.c (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/16/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/16/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/16/ref/crypto_verify.h (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/16/ref/verify_16.c (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/32/checksum (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/32/ref/api.h (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/32/ref/crypto_verify.h (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/32/ref/verify_32.c (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/measure.c (100%) rename src/{libnacl-ref => libsodium}/crypto_verify/try.c (100%) create mode 100644 src/libsodium/include/Makefile.am rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_auth.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_auth_hmacsha256.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_auth_hmacsha512256.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_box.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_box_curve25519xsalsa20poly1305.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_core_hsalsa20.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_core_salsa20.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_core_salsa2012.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_core_salsa208.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_hash.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_hash_sha256.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_hash_sha512.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_hashblocks_sha256.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_hashblocks_sha512.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_onetimeauth.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_onetimeauth_poly1305.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_scalarmult_curve25519.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_secretbox.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_secretbox_xsalsa20poly1305.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_sign.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_sign_ed25519.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_sign_edwards25519sha512batch.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_stream.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_stream_aes128ctr.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_stream_salsa20.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_stream_salsa2012.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_stream_salsa208.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_stream_xsalsa20.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_uint16.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_uint32.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_uint64.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_uint8.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_verify_16.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/crypto_verify_32.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/randombytes.h (100%) rename src/{libnacl-ref/include/nacl => libsodium/include/sodium}/version.h.in (100%) rename src/{libnacl-ref => libsodium}/randombytes/devurandom.c (100%) rename src/{libnacl-ref => libsodium}/randombytes/devurandom.h (100%) diff --git a/.gitignore b/.gitignore index 0995dc0b..445e8d9d 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,6 @@ m4/lt~obsolete.m4 man/*.html man/Makefile.in missing -src/libnacl-ref/include/nacl/version.h +src/libsodium/include/sodium/version.h stamp-* testing diff --git a/configure.ac b/configure.ac index bec10841..732b1b10 100644 --- a/configure.ac +++ b/configure.ac @@ -1,8 +1,8 @@ AC_PREREQ([2.61]) -AC_INIT([libnacl-ref],[0.0.1],[https://github.com/jedisct1/libnacl-ref]) +AC_INIT([libsodium],[0.0.1],[https://github.com/jedisct1/libsodium]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_AUX_DIR([libltdl/config]) -AC_CONFIG_SRCDIR([src/libnacl-ref/randombytes/devurandom.c]) +AC_CONFIG_SRCDIR([src/libsodium/randombytes/devurandom.c]) AC_CANONICAL_HOST AM_INIT_AUTOMAKE([1.9 dist-bzip2 tar-ustar]) AM_MAINTAINER_MODE @@ -182,7 +182,7 @@ AC_ARG_WITH(safecode, ]) AC_SUBST([MAINT]) -AC_SUBST([NACL_PATH]) +AC_SUBST([SODIUM_PATH]) dnl Libtool. @@ -199,8 +199,8 @@ AH_VERBATIM([NDEBUG], [/* Never ever ignore assertions */ AC_CONFIG_FILES([Makefile src/Makefile - src/libnacl-ref/Makefile - src/libnacl-ref/include/Makefile - src/libnacl-ref/include/nacl/version.h]) + src/libsodium/Makefile + src/libsodium/include/Makefile + src/libsodium/include/sodium/version.h]) AC_OUTPUT diff --git a/src/Makefile.am b/src/Makefile.am index 212237c4..64445045 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,3 +1,3 @@ SUBDIRS = \ - libnacl-ref + libsodium diff --git a/src/libnacl-ref/include/Makefile.am b/src/libnacl-ref/include/Makefile.am deleted file mode 100644 index 6e07ee0f..00000000 --- a/src/libnacl-ref/include/Makefile.am +++ /dev/null @@ -1,42 +0,0 @@ - -NACL_EXPORT = \ - nacl/crypto_auth.h \ - nacl/crypto_auth_hmacsha256.h \ - nacl/crypto_auth_hmacsha512256.h \ - nacl/crypto_box.h \ - nacl/crypto_box_curve25519xsalsa20poly1305.h \ - nacl/crypto_core_hsalsa20.h \ - nacl/crypto_core_salsa20.h \ - nacl/crypto_core_salsa2012.h \ - nacl/crypto_core_salsa208.h \ - nacl/crypto_hash.h \ - nacl/crypto_hash_sha256.h \ - nacl/crypto_hash_sha512.h \ - nacl/crypto_hashblocks_sha256.h \ - nacl/crypto_hashblocks_sha512.h \ - nacl/crypto_onetimeauth.h \ - nacl/crypto_onetimeauth_poly1305.h \ - nacl/crypto_scalarmult_curve25519.h \ - nacl/crypto_secretbox.h \ - nacl/crypto_secretbox_xsalsa20poly1305.h \ - nacl/crypto_sign.h \ - nacl/crypto_sign_ed25519.h \ - nacl/crypto_sign_edwards25519sha512batch.h \ - nacl/crypto_stream.h \ - nacl/crypto_stream_aes128ctr.h \ - nacl/crypto_stream_salsa20.h \ - nacl/crypto_stream_salsa2012.h \ - nacl/crypto_stream_salsa208.h \ - nacl/crypto_stream_xsalsa20.h \ - nacl/crypto_uint16.h \ - nacl/crypto_uint32.h \ - nacl/crypto_uint64.h \ - nacl/crypto_uint8.h \ - nacl/crypto_verify_16.h \ - nacl/crypto_verify_32.h \ - nacl/randombytes.h - -EXTRA_SRC = $(NACL_EXPORT) \ - nacl/version.h.in - -nobase_include_HEADERS = $(NACL_EXPORT) diff --git a/src/libnacl-ref/Makefile.am b/src/libsodium/Makefile.am similarity index 96% rename from src/libnacl-ref/Makefile.am rename to src/libsodium/Makefile.am index 43e12a45..380d0e94 100644 --- a/src/libnacl-ref/Makefile.am +++ b/src/libsodium/Makefile.am @@ -1,8 +1,8 @@ lib_LTLIBRARIES = \ - libnacl.la + libsodium.la -libnacl_la_SOURCES = \ +libsodium_la_SOURCES = \ randombytes/devurandom.c \ randombytes/devurandom.h \ crypto_core/hsalsa20/ref2/core_hsalsa20.c \ @@ -67,15 +67,15 @@ libnacl_la_SOURCES = \ crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h \ crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c -libnacl_la_LDFLAGS = \ +libsodium_la_LDFLAGS = \ $(AM_LDFLAGS) \ -export-dynamic \ -no-undefined -libnacl_la_CPPFLAGS = \ +libsodium_la_CPPFLAGS = \ $(LTDLINCL) \ -I. \ - -Iinclude/nacl + -Iinclude/sodium SUBDIRS = \ include diff --git a/src/libnacl-ref/crypto_auth/hmacsha256/checksum b/src/libsodium/crypto_auth/hmacsha256/checksum similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha256/checksum rename to src/libsodium/crypto_auth/hmacsha256/checksum diff --git a/src/libnacl-ref/crypto_auth/hmacsha256/ref/api.h b/src/libsodium/crypto_auth/hmacsha256/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha256/ref/api.h rename to src/libsodium/crypto_auth/hmacsha256/ref/api.h diff --git a/src/libnacl-ref/crypto_auth/hmacsha256/ref/crypto_auth.h b/src/libsodium/crypto_auth/hmacsha256/ref/crypto_auth.h similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha256/ref/crypto_auth.h rename to src/libsodium/crypto_auth/hmacsha256/ref/crypto_auth.h diff --git a/src/libnacl-ref/crypto_auth/hmacsha256/ref/hmac_hmacsha256.c b/src/libsodium/crypto_auth/hmacsha256/ref/hmac_hmacsha256.c similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha256/ref/hmac_hmacsha256.c rename to src/libsodium/crypto_auth/hmacsha256/ref/hmac_hmacsha256.c diff --git a/src/libnacl-ref/crypto_auth/hmacsha256/ref/verify_hmacsha256.c b/src/libsodium/crypto_auth/hmacsha256/ref/verify_hmacsha256.c similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha256/ref/verify_hmacsha256.c rename to src/libsodium/crypto_auth/hmacsha256/ref/verify_hmacsha256.c diff --git a/src/libnacl-ref/crypto_auth/hmacsha512256/checksum b/src/libsodium/crypto_auth/hmacsha512256/checksum similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha512256/checksum rename to src/libsodium/crypto_auth/hmacsha512256/checksum diff --git a/src/libnacl-ref/crypto_auth/hmacsha512256/ref/api.h b/src/libsodium/crypto_auth/hmacsha512256/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha512256/ref/api.h rename to src/libsodium/crypto_auth/hmacsha512256/ref/api.h diff --git a/src/libnacl-ref/crypto_auth/hmacsha512256/ref/crypto_auth.h b/src/libsodium/crypto_auth/hmacsha512256/ref/crypto_auth.h similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha512256/ref/crypto_auth.h rename to src/libsodium/crypto_auth/hmacsha512256/ref/crypto_auth.h diff --git a/src/libnacl-ref/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c rename to src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c diff --git a/src/libnacl-ref/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c b/src/libsodium/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c similarity index 100% rename from src/libnacl-ref/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c rename to src/libsodium/crypto_auth/hmacsha512256/ref/verify_hmacsha512256.c diff --git a/src/libnacl-ref/crypto_auth/measure.c b/src/libsodium/crypto_auth/measure.c similarity index 100% rename from src/libnacl-ref/crypto_auth/measure.c rename to src/libsodium/crypto_auth/measure.c diff --git a/src/libnacl-ref/crypto_auth/try.c b/src/libsodium/crypto_auth/try.c similarity index 100% rename from src/libnacl-ref/crypto_auth/try.c rename to src/libsodium/crypto_auth/try.c diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/checksum b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/checksum similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/checksum rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/checksum diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/api.h b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/api.h rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/crypto_box.h diff --git a/src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c b/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c rename to src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c diff --git a/src/libnacl-ref/crypto_box/measure.c b/src/libsodium/crypto_box/measure.c similarity index 100% rename from src/libnacl-ref/crypto_box/measure.c rename to src/libsodium/crypto_box/measure.c diff --git a/src/libnacl-ref/crypto_box/try.c b/src/libsodium/crypto_box/try.c similarity index 100% rename from src/libnacl-ref/crypto_box/try.c rename to src/libsodium/crypto_box/try.c diff --git a/src/libnacl-ref/crypto_core/hsalsa20/checksum b/src/libsodium/crypto_core/hsalsa20/checksum similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/checksum rename to src/libsodium/crypto_core/hsalsa20/checksum diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref/api.h b/src/libsodium/crypto_core/hsalsa20/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref/api.h rename to src/libsodium/crypto_core/hsalsa20/ref/api.h diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref/core.c b/src/libsodium/crypto_core/hsalsa20/ref/core.c similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref/core.c rename to src/libsodium/crypto_core/hsalsa20/ref/core.c diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref/crypto_core.h b/src/libsodium/crypto_core/hsalsa20/ref/crypto_core.h similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref/crypto_core.h rename to src/libsodium/crypto_core/hsalsa20/ref/crypto_core.h diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref/implementors b/src/libsodium/crypto_core/hsalsa20/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref/implementors rename to src/libsodium/crypto_core/hsalsa20/ref/implementors diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref2/api.h b/src/libsodium/crypto_core/hsalsa20/ref2/api.h similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref2/api.h rename to src/libsodium/crypto_core/hsalsa20/ref2/api.h diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref2/core_hsalsa20.c b/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref2/core_hsalsa20.c rename to src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref2/crypto_core.h b/src/libsodium/crypto_core/hsalsa20/ref2/crypto_core.h similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref2/crypto_core.h rename to src/libsodium/crypto_core/hsalsa20/ref2/crypto_core.h diff --git a/src/libnacl-ref/crypto_core/hsalsa20/ref2/implementors b/src/libsodium/crypto_core/hsalsa20/ref2/implementors similarity index 100% rename from src/libnacl-ref/crypto_core/hsalsa20/ref2/implementors rename to src/libsodium/crypto_core/hsalsa20/ref2/implementors diff --git a/src/libnacl-ref/crypto_core/salsa20/checksum b/src/libsodium/crypto_core/salsa20/checksum similarity index 100% rename from src/libnacl-ref/crypto_core/salsa20/checksum rename to src/libsodium/crypto_core/salsa20/checksum diff --git a/src/libnacl-ref/crypto_core/salsa20/ref/api.h b/src/libsodium/crypto_core/salsa20/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_core/salsa20/ref/api.h rename to src/libsodium/crypto_core/salsa20/ref/api.h diff --git a/src/libnacl-ref/crypto_core/salsa20/ref/core_salsa20.c b/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c similarity index 100% rename from src/libnacl-ref/crypto_core/salsa20/ref/core_salsa20.c rename to src/libsodium/crypto_core/salsa20/ref/core_salsa20.c diff --git a/src/libnacl-ref/crypto_core/salsa20/ref/crypto_core.h b/src/libsodium/crypto_core/salsa20/ref/crypto_core.h similarity index 100% rename from src/libnacl-ref/crypto_core/salsa20/ref/crypto_core.h rename to src/libsodium/crypto_core/salsa20/ref/crypto_core.h diff --git a/src/libnacl-ref/crypto_core/salsa20/ref/implementors b/src/libsodium/crypto_core/salsa20/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_core/salsa20/ref/implementors rename to src/libsodium/crypto_core/salsa20/ref/implementors diff --git a/src/libnacl-ref/crypto_core/salsa2012/checksum b/src/libsodium/crypto_core/salsa2012/checksum similarity index 100% rename from src/libnacl-ref/crypto_core/salsa2012/checksum rename to src/libsodium/crypto_core/salsa2012/checksum diff --git a/src/libnacl-ref/crypto_core/salsa2012/ref/api.h b/src/libsodium/crypto_core/salsa2012/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_core/salsa2012/ref/api.h rename to src/libsodium/crypto_core/salsa2012/ref/api.h diff --git a/src/libnacl-ref/crypto_core/salsa2012/ref/core_salsa2012.c b/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c similarity index 100% rename from src/libnacl-ref/crypto_core/salsa2012/ref/core_salsa2012.c rename to src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c diff --git a/src/libnacl-ref/crypto_core/salsa2012/ref/crypto_core.h b/src/libsodium/crypto_core/salsa2012/ref/crypto_core.h similarity index 100% rename from src/libnacl-ref/crypto_core/salsa2012/ref/crypto_core.h rename to src/libsodium/crypto_core/salsa2012/ref/crypto_core.h diff --git a/src/libnacl-ref/crypto_core/salsa2012/ref/implementors b/src/libsodium/crypto_core/salsa2012/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_core/salsa2012/ref/implementors rename to src/libsodium/crypto_core/salsa2012/ref/implementors diff --git a/src/libnacl-ref/crypto_core/salsa208/checksum b/src/libsodium/crypto_core/salsa208/checksum similarity index 100% rename from src/libnacl-ref/crypto_core/salsa208/checksum rename to src/libsodium/crypto_core/salsa208/checksum diff --git a/src/libnacl-ref/crypto_core/salsa208/ref/api.h b/src/libsodium/crypto_core/salsa208/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_core/salsa208/ref/api.h rename to src/libsodium/crypto_core/salsa208/ref/api.h diff --git a/src/libnacl-ref/crypto_core/salsa208/ref/core_salsa208.c b/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c similarity index 100% rename from src/libnacl-ref/crypto_core/salsa208/ref/core_salsa208.c rename to src/libsodium/crypto_core/salsa208/ref/core_salsa208.c diff --git a/src/libnacl-ref/crypto_core/salsa208/ref/crypto_core.h b/src/libsodium/crypto_core/salsa208/ref/crypto_core.h similarity index 100% rename from src/libnacl-ref/crypto_core/salsa208/ref/crypto_core.h rename to src/libsodium/crypto_core/salsa208/ref/crypto_core.h diff --git a/src/libnacl-ref/crypto_core/salsa208/ref/implementors b/src/libsodium/crypto_core/salsa208/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_core/salsa208/ref/implementors rename to src/libsodium/crypto_core/salsa208/ref/implementors diff --git a/src/libnacl-ref/crypto_hash/measure.c b/src/libsodium/crypto_hash/measure.c similarity index 100% rename from src/libnacl-ref/crypto_hash/measure.c rename to src/libsodium/crypto_hash/measure.c diff --git a/src/libnacl-ref/crypto_hash/sha256/checksum b/src/libsodium/crypto_hash/sha256/checksum similarity index 100% rename from src/libnacl-ref/crypto_hash/sha256/checksum rename to src/libsodium/crypto_hash/sha256/checksum diff --git a/src/libnacl-ref/crypto_hash/sha256/ref/api.h b/src/libsodium/crypto_hash/sha256/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_hash/sha256/ref/api.h rename to src/libsodium/crypto_hash/sha256/ref/api.h diff --git a/src/libnacl-ref/crypto_hash/sha256/ref/crypto_hash.h b/src/libsodium/crypto_hash/sha256/ref/crypto_hash.h similarity index 100% rename from src/libnacl-ref/crypto_hash/sha256/ref/crypto_hash.h rename to src/libsodium/crypto_hash/sha256/ref/crypto_hash.h diff --git a/src/libnacl-ref/crypto_hash/sha256/ref/hash_sha256.c b/src/libsodium/crypto_hash/sha256/ref/hash_sha256.c similarity index 100% rename from src/libnacl-ref/crypto_hash/sha256/ref/hash_sha256.c rename to src/libsodium/crypto_hash/sha256/ref/hash_sha256.c diff --git a/src/libnacl-ref/crypto_hash/sha256/ref/implementors b/src/libsodium/crypto_hash/sha256/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_hash/sha256/ref/implementors rename to src/libsodium/crypto_hash/sha256/ref/implementors diff --git a/src/libnacl-ref/crypto_hash/sha512/checksum b/src/libsodium/crypto_hash/sha512/checksum similarity index 100% rename from src/libnacl-ref/crypto_hash/sha512/checksum rename to src/libsodium/crypto_hash/sha512/checksum diff --git a/src/libnacl-ref/crypto_hash/sha512/ref/api.h b/src/libsodium/crypto_hash/sha512/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_hash/sha512/ref/api.h rename to src/libsodium/crypto_hash/sha512/ref/api.h diff --git a/src/libnacl-ref/crypto_hash/sha512/ref/crypto_hash.h b/src/libsodium/crypto_hash/sha512/ref/crypto_hash.h similarity index 100% rename from src/libnacl-ref/crypto_hash/sha512/ref/crypto_hash.h rename to src/libsodium/crypto_hash/sha512/ref/crypto_hash.h diff --git a/src/libnacl-ref/crypto_hash/sha512/ref/hash_sha512.c b/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c similarity index 100% rename from src/libnacl-ref/crypto_hash/sha512/ref/hash_sha512.c rename to src/libsodium/crypto_hash/sha512/ref/hash_sha512.c diff --git a/src/libnacl-ref/crypto_hash/sha512/ref/implementors b/src/libsodium/crypto_hash/sha512/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_hash/sha512/ref/implementors rename to src/libsodium/crypto_hash/sha512/ref/implementors diff --git a/src/libnacl-ref/crypto_hash/try.c b/src/libsodium/crypto_hash/try.c similarity index 100% rename from src/libnacl-ref/crypto_hash/try.c rename to src/libsodium/crypto_hash/try.c diff --git a/src/libnacl-ref/crypto_hashblocks/measure.c b/src/libsodium/crypto_hashblocks/measure.c similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/measure.c rename to src/libsodium/crypto_hashblocks/measure.c diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/checksum b/src/libsodium/crypto_hashblocks/sha256/checksum similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/checksum rename to src/libsodium/crypto_hashblocks/sha256/checksum diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/inplace/api.h b/src/libsodium/crypto_hashblocks/sha256/inplace/api.h similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/inplace/api.h rename to src/libsodium/crypto_hashblocks/sha256/inplace/api.h diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/inplace/blocks.c b/src/libsodium/crypto_hashblocks/sha256/inplace/blocks.c similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/inplace/blocks.c rename to src/libsodium/crypto_hashblocks/sha256/inplace/blocks.c diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/inplace/implementors b/src/libsodium/crypto_hashblocks/sha256/inplace/implementors similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/inplace/implementors rename to src/libsodium/crypto_hashblocks/sha256/inplace/implementors diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/ref/api.h b/src/libsodium/crypto_hashblocks/sha256/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/ref/api.h rename to src/libsodium/crypto_hashblocks/sha256/ref/api.h diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/ref/blocks_sha256.c b/src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/ref/blocks_sha256.c rename to src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/ref/crypto_hashblocks.h b/src/libsodium/crypto_hashblocks/sha256/ref/crypto_hashblocks.h similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/ref/crypto_hashblocks.h rename to src/libsodium/crypto_hashblocks/sha256/ref/crypto_hashblocks.h diff --git a/src/libnacl-ref/crypto_hashblocks/sha256/ref/implementors b/src/libsodium/crypto_hashblocks/sha256/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha256/ref/implementors rename to src/libsodium/crypto_hashblocks/sha256/ref/implementors diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/checksum b/src/libsodium/crypto_hashblocks/sha512/checksum similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/checksum rename to src/libsodium/crypto_hashblocks/sha512/checksum diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/inplace/api.h b/src/libsodium/crypto_hashblocks/sha512/inplace/api.h similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/inplace/api.h rename to src/libsodium/crypto_hashblocks/sha512/inplace/api.h diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/inplace/blocks.c b/src/libsodium/crypto_hashblocks/sha512/inplace/blocks.c similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/inplace/blocks.c rename to src/libsodium/crypto_hashblocks/sha512/inplace/blocks.c diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/inplace/implementors b/src/libsodium/crypto_hashblocks/sha512/inplace/implementors similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/inplace/implementors rename to src/libsodium/crypto_hashblocks/sha512/inplace/implementors diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/ref/api.h b/src/libsodium/crypto_hashblocks/sha512/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/ref/api.h rename to src/libsodium/crypto_hashblocks/sha512/ref/api.h diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/ref/blocks_sha512.c b/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/ref/blocks_sha512.c rename to src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/ref/crypto_hashblocks.h b/src/libsodium/crypto_hashblocks/sha512/ref/crypto_hashblocks.h similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/ref/crypto_hashblocks.h rename to src/libsodium/crypto_hashblocks/sha512/ref/crypto_hashblocks.h diff --git a/src/libnacl-ref/crypto_hashblocks/sha512/ref/implementors b/src/libsodium/crypto_hashblocks/sha512/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/sha512/ref/implementors rename to src/libsodium/crypto_hashblocks/sha512/ref/implementors diff --git a/src/libnacl-ref/crypto_hashblocks/try.c b/src/libsodium/crypto_hashblocks/try.c similarity index 100% rename from src/libnacl-ref/crypto_hashblocks/try.c rename to src/libsodium/crypto_hashblocks/try.c diff --git a/src/libnacl-ref/crypto_onetimeauth/measure.c b/src/libsodium/crypto_onetimeauth/measure.c similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/measure.c rename to src/libsodium/crypto_onetimeauth/measure.c diff --git a/src/libnacl-ref/crypto_onetimeauth/poly1305/checksum b/src/libsodium/crypto_onetimeauth/poly1305/checksum similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/poly1305/checksum rename to src/libsodium/crypto_onetimeauth/poly1305/checksum diff --git a/src/libnacl-ref/crypto_onetimeauth/poly1305/ref/api.h b/src/libsodium/crypto_onetimeauth/poly1305/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/poly1305/ref/api.h rename to src/libsodium/crypto_onetimeauth/poly1305/ref/api.h diff --git a/src/libnacl-ref/crypto_onetimeauth/poly1305/ref/auth_poly1305.c b/src/libsodium/crypto_onetimeauth/poly1305/ref/auth_poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/poly1305/ref/auth_poly1305.c rename to src/libsodium/crypto_onetimeauth/poly1305/ref/auth_poly1305.c diff --git a/src/libnacl-ref/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h b/src/libsodium/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h rename to src/libsodium/crypto_onetimeauth/poly1305/ref/crypto_onetimeauth.h diff --git a/src/libnacl-ref/crypto_onetimeauth/poly1305/ref/verify_poly1305.c b/src/libsodium/crypto_onetimeauth/poly1305/ref/verify_poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/poly1305/ref/verify_poly1305.c rename to src/libsodium/crypto_onetimeauth/poly1305/ref/verify_poly1305.c diff --git a/src/libnacl-ref/crypto_onetimeauth/try.c b/src/libsodium/crypto_onetimeauth/try.c similarity index 100% rename from src/libnacl-ref/crypto_onetimeauth/try.c rename to src/libsodium/crypto_onetimeauth/try.c diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/checksum b/src/libsodium/crypto_scalarmult/curve25519/checksum similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/checksum rename to src/libsodium/crypto_scalarmult/curve25519/checksum diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/api.h b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/api.h similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/api.h rename to src/libsodium/crypto_scalarmult/curve25519/donna_c64/api.h diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/base.c b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/base.c similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/base.c rename to src/libsodium/crypto_scalarmult/curve25519/donna_c64/base.c diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/implementors b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/implementors similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/implementors rename to src/libsodium/crypto_scalarmult/curve25519/donna_c64/implementors diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/smult.c b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult.c similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/donna_c64/smult.c rename to src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult.c diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/ref/api.h b/src/libsodium/crypto_scalarmult/curve25519/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/ref/api.h rename to src/libsodium/crypto_scalarmult/curve25519/ref/api.h diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/ref/base.c b/src/libsodium/crypto_scalarmult/curve25519/ref/base.c similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/ref/base.c rename to src/libsodium/crypto_scalarmult/curve25519/ref/base.c diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h b/src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h rename to src/libsodium/crypto_scalarmult/curve25519/ref/crypto_scalarmult.h diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/ref/implementors b/src/libsodium/crypto_scalarmult/curve25519/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/ref/implementors rename to src/libsodium/crypto_scalarmult/curve25519/ref/implementors diff --git a/src/libnacl-ref/crypto_scalarmult/curve25519/ref/smult.c b/src/libsodium/crypto_scalarmult/curve25519/ref/smult.c similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/curve25519/ref/smult.c rename to src/libsodium/crypto_scalarmult/curve25519/ref/smult.c diff --git a/src/libnacl-ref/crypto_scalarmult/measure.c b/src/libsodium/crypto_scalarmult/measure.c similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/measure.c rename to src/libsodium/crypto_scalarmult/measure.c diff --git a/src/libnacl-ref/crypto_scalarmult/try.c b/src/libsodium/crypto_scalarmult/try.c similarity index 100% rename from src/libnacl-ref/crypto_scalarmult/try.c rename to src/libsodium/crypto_scalarmult/try.c diff --git a/src/libnacl-ref/crypto_secretbox/measure.c b/src/libsodium/crypto_secretbox/measure.c similarity index 100% rename from src/libnacl-ref/crypto_secretbox/measure.c rename to src/libsodium/crypto_secretbox/measure.c diff --git a/src/libnacl-ref/crypto_secretbox/try.c b/src/libsodium/crypto_secretbox/try.c similarity index 100% rename from src/libnacl-ref/crypto_secretbox/try.c rename to src/libsodium/crypto_secretbox/try.c diff --git a/src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/checksum b/src/libsodium/crypto_secretbox/xsalsa20poly1305/checksum similarity index 100% rename from src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/checksum rename to src/libsodium/crypto_secretbox/xsalsa20poly1305/checksum diff --git a/src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/ref/api.h b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/ref/api.h rename to src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h diff --git a/src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c similarity index 100% rename from src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c rename to src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c diff --git a/src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h b/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h similarity index 100% rename from src/libnacl-ref/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h rename to src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/crypto_secretbox.h diff --git a/src/libnacl-ref/crypto_sign/ed25519/description b/src/libsodium/crypto_sign/ed25519/description similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/description rename to src/libsodium/crypto_sign/ed25519/description diff --git a/src/libnacl-ref/crypto_sign/ed25519/designers b/src/libsodium/crypto_sign/ed25519/designers similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/designers rename to src/libsodium/crypto_sign/ed25519/designers diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/api.h b/src/libsodium/crypto_sign/ed25519/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/api.h rename to src/libsodium/crypto_sign/ed25519/ref/api.h diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/crypto_sign.h b/src/libsodium/crypto_sign/ed25519/ref/crypto_sign.h similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/crypto_sign.h rename to src/libsodium/crypto_sign/ed25519/ref/crypto_sign.h diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/ed25519_ed25519.c b/src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/ed25519_ed25519.c rename to src/libsodium/crypto_sign/ed25519/ref/ed25519_ed25519.c diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/fe25519.h b/src/libsodium/crypto_sign/ed25519/ref/fe25519.h similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/fe25519.h rename to src/libsodium/crypto_sign/ed25519/ref/fe25519.h diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/fe25519_ed25519.c b/src/libsodium/crypto_sign/ed25519/ref/fe25519_ed25519.c similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/fe25519_ed25519.c rename to src/libsodium/crypto_sign/ed25519/ref/fe25519_ed25519.c diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/ge25519.h b/src/libsodium/crypto_sign/ed25519/ref/ge25519.h similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/ge25519.h rename to src/libsodium/crypto_sign/ed25519/ref/ge25519.h diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/ge25519_base.data b/src/libsodium/crypto_sign/ed25519/ref/ge25519_base.data similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/ge25519_base.data rename to src/libsodium/crypto_sign/ed25519/ref/ge25519_base.data diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/ge25519_ed25519.c b/src/libsodium/crypto_sign/ed25519/ref/ge25519_ed25519.c similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/ge25519_ed25519.c rename to src/libsodium/crypto_sign/ed25519/ref/ge25519_ed25519.c diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/implementors b/src/libsodium/crypto_sign/ed25519/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/implementors rename to src/libsodium/crypto_sign/ed25519/ref/implementors diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/sc25519.h b/src/libsodium/crypto_sign/ed25519/ref/sc25519.h similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/sc25519.h rename to src/libsodium/crypto_sign/ed25519/ref/sc25519.h diff --git a/src/libnacl-ref/crypto_sign/ed25519/ref/sc25519_ed25519.c b/src/libsodium/crypto_sign/ed25519/ref/sc25519_ed25519.c similarity index 100% rename from src/libnacl-ref/crypto_sign/ed25519/ref/sc25519_ed25519.c rename to src/libsodium/crypto_sign/ed25519/ref/sc25519_ed25519.c diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/api.h b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/api.h rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/crypto_sign.h b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/crypto_sign.h similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/crypto_sign.h rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/crypto_sign.h diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/fe25519.h b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/fe25519.h similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/fe25519.h rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/fe25519.h diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/fe25519_edwards25519sha512batch.c diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/ge25519.h b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/ge25519.h similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/ge25519.h rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/ge25519.h diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/ge25519_edwards25519sha512batch.c diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/sc25519.h b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/sc25519.h similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/sc25519.h rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/sc25519.h diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/sc25519_edwards25519sha512batch.c diff --git a/src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c b/src/libsodium/crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c similarity index 100% rename from src/libnacl-ref/crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c rename to src/libsodium/crypto_sign/edwards25519sha512batch/ref/sign_edwards25519sha512batch.c diff --git a/src/libnacl-ref/crypto_sign/measure.c b/src/libsodium/crypto_sign/measure.c similarity index 100% rename from src/libnacl-ref/crypto_sign/measure.c rename to src/libsodium/crypto_sign/measure.c diff --git a/src/libnacl-ref/crypto_sign/try.c b/src/libsodium/crypto_sign/try.c similarity index 100% rename from src/libnacl-ref/crypto_sign/try.c rename to src/libsodium/crypto_sign/try.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/checksum b/src/libsodium/crypto_stream/aes128ctr/checksum similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/checksum rename to src/libsodium/crypto_stream/aes128ctr/checksum diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/api.h b/src/libsodium/crypto_stream/aes128ctr/portable/api.h similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/api.h rename to src/libsodium/crypto_stream/aes128ctr/portable/api.h diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/common.h b/src/libsodium/crypto_stream/aes128ctr/portable/common.h similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/common.h rename to src/libsodium/crypto_stream/aes128ctr/portable/common.h diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/common_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/common_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/common_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/common_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/consts.h b/src/libsodium/crypto_stream/aes128ctr/portable/consts.h similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/consts.h rename to src/libsodium/crypto_stream/aes128ctr/portable/consts.h diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/consts_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/consts_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/consts_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/consts_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/crypto_stream.h b/src/libsodium/crypto_stream/aes128ctr/portable/crypto_stream.h similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/crypto_stream.h rename to src/libsodium/crypto_stream/aes128ctr/portable/crypto_stream.h diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/int128.h b/src/libsodium/crypto_stream/aes128ctr/portable/int128.h similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/int128.h rename to src/libsodium/crypto_stream/aes128ctr/portable/int128.h diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/int128_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/int128_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/stream_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/stream_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/types.h b/src/libsodium/crypto_stream/aes128ctr/portable/types.h similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/types.h rename to src/libsodium/crypto_stream/aes128ctr/portable/types.h diff --git a/src/libnacl-ref/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c b/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c similarity index 100% rename from src/libnacl-ref/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c rename to src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c diff --git a/src/libnacl-ref/crypto_stream/measure.c b/src/libsodium/crypto_stream/measure.c similarity index 100% rename from src/libnacl-ref/crypto_stream/measure.c rename to src/libsodium/crypto_stream/measure.c diff --git a/src/libnacl-ref/crypto_stream/salsa20/checksum b/src/libsodium/crypto_stream/salsa20/checksum similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa20/checksum rename to src/libsodium/crypto_stream/salsa20/checksum diff --git a/src/libnacl-ref/crypto_stream/salsa20/ref/api.h b/src/libsodium/crypto_stream/salsa20/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa20/ref/api.h rename to src/libsodium/crypto_stream/salsa20/ref/api.h diff --git a/src/libnacl-ref/crypto_stream/salsa20/ref/crypto_stream.h b/src/libsodium/crypto_stream/salsa20/ref/crypto_stream.h similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa20/ref/crypto_stream.h rename to src/libsodium/crypto_stream/salsa20/ref/crypto_stream.h diff --git a/src/libnacl-ref/crypto_stream/salsa20/ref/implementors b/src/libsodium/crypto_stream/salsa20/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa20/ref/implementors rename to src/libsodium/crypto_stream/salsa20/ref/implementors diff --git a/src/libnacl-ref/crypto_stream/salsa20/ref/stream_salsa20.c b/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20.c similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa20/ref/stream_salsa20.c rename to src/libsodium/crypto_stream/salsa20/ref/stream_salsa20.c diff --git a/src/libnacl-ref/crypto_stream/salsa20/ref/xor_salsa20.c b/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20.c similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa20/ref/xor_salsa20.c rename to src/libsodium/crypto_stream/salsa20/ref/xor_salsa20.c diff --git a/src/libnacl-ref/crypto_stream/salsa2012/checksum b/src/libsodium/crypto_stream/salsa2012/checksum similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa2012/checksum rename to src/libsodium/crypto_stream/salsa2012/checksum diff --git a/src/libnacl-ref/crypto_stream/salsa2012/ref/api.h b/src/libsodium/crypto_stream/salsa2012/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa2012/ref/api.h rename to src/libsodium/crypto_stream/salsa2012/ref/api.h diff --git a/src/libnacl-ref/crypto_stream/salsa2012/ref/crypto_stream.h b/src/libsodium/crypto_stream/salsa2012/ref/crypto_stream.h similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa2012/ref/crypto_stream.h rename to src/libsodium/crypto_stream/salsa2012/ref/crypto_stream.h diff --git a/src/libnacl-ref/crypto_stream/salsa2012/ref/implementors b/src/libsodium/crypto_stream/salsa2012/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa2012/ref/implementors rename to src/libsodium/crypto_stream/salsa2012/ref/implementors diff --git a/src/libnacl-ref/crypto_stream/salsa2012/ref/stream_salsa2012.c b/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa2012/ref/stream_salsa2012.c rename to src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c diff --git a/src/libnacl-ref/crypto_stream/salsa2012/ref/xor_salsa2012.c b/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa2012/ref/xor_salsa2012.c rename to src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c diff --git a/src/libnacl-ref/crypto_stream/salsa208/checksum b/src/libsodium/crypto_stream/salsa208/checksum similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa208/checksum rename to src/libsodium/crypto_stream/salsa208/checksum diff --git a/src/libnacl-ref/crypto_stream/salsa208/ref/api.h b/src/libsodium/crypto_stream/salsa208/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa208/ref/api.h rename to src/libsodium/crypto_stream/salsa208/ref/api.h diff --git a/src/libnacl-ref/crypto_stream/salsa208/ref/crypto_stream.h b/src/libsodium/crypto_stream/salsa208/ref/crypto_stream.h similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa208/ref/crypto_stream.h rename to src/libsodium/crypto_stream/salsa208/ref/crypto_stream.h diff --git a/src/libnacl-ref/crypto_stream/salsa208/ref/implementors b/src/libsodium/crypto_stream/salsa208/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa208/ref/implementors rename to src/libsodium/crypto_stream/salsa208/ref/implementors diff --git a/src/libnacl-ref/crypto_stream/salsa208/ref/stream_salsa208.c b/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa208/ref/stream_salsa208.c rename to src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c diff --git a/src/libnacl-ref/crypto_stream/salsa208/ref/xor_salsa208.c b/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c similarity index 100% rename from src/libnacl-ref/crypto_stream/salsa208/ref/xor_salsa208.c rename to src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c diff --git a/src/libnacl-ref/crypto_stream/try.c b/src/libsodium/crypto_stream/try.c similarity index 100% rename from src/libnacl-ref/crypto_stream/try.c rename to src/libsodium/crypto_stream/try.c diff --git a/src/libnacl-ref/crypto_stream/xsalsa20/checksum b/src/libsodium/crypto_stream/xsalsa20/checksum similarity index 100% rename from src/libnacl-ref/crypto_stream/xsalsa20/checksum rename to src/libsodium/crypto_stream/xsalsa20/checksum diff --git a/src/libnacl-ref/crypto_stream/xsalsa20/ref/api.h b/src/libsodium/crypto_stream/xsalsa20/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_stream/xsalsa20/ref/api.h rename to src/libsodium/crypto_stream/xsalsa20/ref/api.h diff --git a/src/libnacl-ref/crypto_stream/xsalsa20/ref/crypto_stream.h b/src/libsodium/crypto_stream/xsalsa20/ref/crypto_stream.h similarity index 100% rename from src/libnacl-ref/crypto_stream/xsalsa20/ref/crypto_stream.h rename to src/libsodium/crypto_stream/xsalsa20/ref/crypto_stream.h diff --git a/src/libnacl-ref/crypto_stream/xsalsa20/ref/implementors b/src/libsodium/crypto_stream/xsalsa20/ref/implementors similarity index 100% rename from src/libnacl-ref/crypto_stream/xsalsa20/ref/implementors rename to src/libsodium/crypto_stream/xsalsa20/ref/implementors diff --git a/src/libnacl-ref/crypto_stream/xsalsa20/ref/stream_xsalsa20.c b/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c similarity index 100% rename from src/libnacl-ref/crypto_stream/xsalsa20/ref/stream_xsalsa20.c rename to src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c diff --git a/src/libnacl-ref/crypto_stream/xsalsa20/ref/xor_xsalsa20.c b/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c similarity index 100% rename from src/libnacl-ref/crypto_stream/xsalsa20/ref/xor_xsalsa20.c rename to src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c diff --git a/src/libnacl-ref/crypto_verify/16/checksum b/src/libsodium/crypto_verify/16/checksum similarity index 100% rename from src/libnacl-ref/crypto_verify/16/checksum rename to src/libsodium/crypto_verify/16/checksum diff --git a/src/libnacl-ref/crypto_verify/16/ref/api.h b/src/libsodium/crypto_verify/16/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_verify/16/ref/api.h rename to src/libsodium/crypto_verify/16/ref/api.h diff --git a/src/libnacl-ref/crypto_verify/16/ref/crypto_verify.h b/src/libsodium/crypto_verify/16/ref/crypto_verify.h similarity index 100% rename from src/libnacl-ref/crypto_verify/16/ref/crypto_verify.h rename to src/libsodium/crypto_verify/16/ref/crypto_verify.h diff --git a/src/libnacl-ref/crypto_verify/16/ref/verify_16.c b/src/libsodium/crypto_verify/16/ref/verify_16.c similarity index 100% rename from src/libnacl-ref/crypto_verify/16/ref/verify_16.c rename to src/libsodium/crypto_verify/16/ref/verify_16.c diff --git a/src/libnacl-ref/crypto_verify/32/checksum b/src/libsodium/crypto_verify/32/checksum similarity index 100% rename from src/libnacl-ref/crypto_verify/32/checksum rename to src/libsodium/crypto_verify/32/checksum diff --git a/src/libnacl-ref/crypto_verify/32/ref/api.h b/src/libsodium/crypto_verify/32/ref/api.h similarity index 100% rename from src/libnacl-ref/crypto_verify/32/ref/api.h rename to src/libsodium/crypto_verify/32/ref/api.h diff --git a/src/libnacl-ref/crypto_verify/32/ref/crypto_verify.h b/src/libsodium/crypto_verify/32/ref/crypto_verify.h similarity index 100% rename from src/libnacl-ref/crypto_verify/32/ref/crypto_verify.h rename to src/libsodium/crypto_verify/32/ref/crypto_verify.h diff --git a/src/libnacl-ref/crypto_verify/32/ref/verify_32.c b/src/libsodium/crypto_verify/32/ref/verify_32.c similarity index 100% rename from src/libnacl-ref/crypto_verify/32/ref/verify_32.c rename to src/libsodium/crypto_verify/32/ref/verify_32.c diff --git a/src/libnacl-ref/crypto_verify/measure.c b/src/libsodium/crypto_verify/measure.c similarity index 100% rename from src/libnacl-ref/crypto_verify/measure.c rename to src/libsodium/crypto_verify/measure.c diff --git a/src/libnacl-ref/crypto_verify/try.c b/src/libsodium/crypto_verify/try.c similarity index 100% rename from src/libnacl-ref/crypto_verify/try.c rename to src/libsodium/crypto_verify/try.c diff --git a/src/libsodium/include/Makefile.am b/src/libsodium/include/Makefile.am new file mode 100644 index 00000000..c01e52a7 --- /dev/null +++ b/src/libsodium/include/Makefile.am @@ -0,0 +1,42 @@ + +SODIUM_EXPORT = \ + sodium/crypto_auth.h \ + sodium/crypto_auth_hmacsha256.h \ + sodium/crypto_auth_hmacsha512256.h \ + sodium/crypto_box.h \ + sodium/crypto_box_curve25519xsalsa20poly1305.h \ + sodium/crypto_core_hsalsa20.h \ + sodium/crypto_core_salsa20.h \ + sodium/crypto_core_salsa2012.h \ + sodium/crypto_core_salsa208.h \ + sodium/crypto_hash.h \ + sodium/crypto_hash_sha256.h \ + sodium/crypto_hash_sha512.h \ + sodium/crypto_hashblocks_sha256.h \ + sodium/crypto_hashblocks_sha512.h \ + sodium/crypto_onetimeauth.h \ + sodium/crypto_onetimeauth_poly1305.h \ + sodium/crypto_scalarmult_curve25519.h \ + sodium/crypto_secretbox.h \ + sodium/crypto_secretbox_xsalsa20poly1305.h \ + sodium/crypto_sign.h \ + sodium/crypto_sign_ed25519.h \ + sodium/crypto_sign_edwards25519sha512batch.h \ + sodium/crypto_stream.h \ + sodium/crypto_stream_aes128ctr.h \ + sodium/crypto_stream_salsa20.h \ + sodium/crypto_stream_salsa2012.h \ + sodium/crypto_stream_salsa208.h \ + sodium/crypto_stream_xsalsa20.h \ + sodium/crypto_uint16.h \ + sodium/crypto_uint32.h \ + sodium/crypto_uint64.h \ + sodium/crypto_uint8.h \ + sodium/crypto_verify_16.h \ + sodium/crypto_verify_32.h \ + sodium/randombytes.h + +EXTRA_SRC = $(SODIUM_EXPORT) \ + sodium/version.h.in + +nobase_include_HEADERS = $(SODIUM_EXPORT) diff --git a/src/libnacl-ref/include/nacl/crypto_auth.h b/src/libsodium/include/sodium/crypto_auth.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_auth.h rename to src/libsodium/include/sodium/crypto_auth.h diff --git a/src/libnacl-ref/include/nacl/crypto_auth_hmacsha256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha256.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_auth_hmacsha256.h rename to src/libsodium/include/sodium/crypto_auth_hmacsha256.h diff --git a/src/libnacl-ref/include/nacl/crypto_auth_hmacsha512256.h b/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_auth_hmacsha512256.h rename to src/libsodium/include/sodium/crypto_auth_hmacsha512256.h diff --git a/src/libnacl-ref/include/nacl/crypto_box.h b/src/libsodium/include/sodium/crypto_box.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_box.h rename to src/libsodium/include/sodium/crypto_box.h diff --git a/src/libnacl-ref/include/nacl/crypto_box_curve25519xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_box_curve25519xsalsa20poly1305.h rename to src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h diff --git a/src/libnacl-ref/include/nacl/crypto_core_hsalsa20.h b/src/libsodium/include/sodium/crypto_core_hsalsa20.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_core_hsalsa20.h rename to src/libsodium/include/sodium/crypto_core_hsalsa20.h diff --git a/src/libnacl-ref/include/nacl/crypto_core_salsa20.h b/src/libsodium/include/sodium/crypto_core_salsa20.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_core_salsa20.h rename to src/libsodium/include/sodium/crypto_core_salsa20.h diff --git a/src/libnacl-ref/include/nacl/crypto_core_salsa2012.h b/src/libsodium/include/sodium/crypto_core_salsa2012.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_core_salsa2012.h rename to src/libsodium/include/sodium/crypto_core_salsa2012.h diff --git a/src/libnacl-ref/include/nacl/crypto_core_salsa208.h b/src/libsodium/include/sodium/crypto_core_salsa208.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_core_salsa208.h rename to src/libsodium/include/sodium/crypto_core_salsa208.h diff --git a/src/libnacl-ref/include/nacl/crypto_hash.h b/src/libsodium/include/sodium/crypto_hash.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_hash.h rename to src/libsodium/include/sodium/crypto_hash.h diff --git a/src/libnacl-ref/include/nacl/crypto_hash_sha256.h b/src/libsodium/include/sodium/crypto_hash_sha256.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_hash_sha256.h rename to src/libsodium/include/sodium/crypto_hash_sha256.h diff --git a/src/libnacl-ref/include/nacl/crypto_hash_sha512.h b/src/libsodium/include/sodium/crypto_hash_sha512.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_hash_sha512.h rename to src/libsodium/include/sodium/crypto_hash_sha512.h diff --git a/src/libnacl-ref/include/nacl/crypto_hashblocks_sha256.h b/src/libsodium/include/sodium/crypto_hashblocks_sha256.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_hashblocks_sha256.h rename to src/libsodium/include/sodium/crypto_hashblocks_sha256.h diff --git a/src/libnacl-ref/include/nacl/crypto_hashblocks_sha512.h b/src/libsodium/include/sodium/crypto_hashblocks_sha512.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_hashblocks_sha512.h rename to src/libsodium/include/sodium/crypto_hashblocks_sha512.h diff --git a/src/libnacl-ref/include/nacl/crypto_onetimeauth.h b/src/libsodium/include/sodium/crypto_onetimeauth.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_onetimeauth.h rename to src/libsodium/include/sodium/crypto_onetimeauth.h diff --git a/src/libnacl-ref/include/nacl/crypto_onetimeauth_poly1305.h b/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_onetimeauth_poly1305.h rename to src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h diff --git a/src/libnacl-ref/include/nacl/crypto_scalarmult_curve25519.h b/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_scalarmult_curve25519.h rename to src/libsodium/include/sodium/crypto_scalarmult_curve25519.h diff --git a/src/libnacl-ref/include/nacl/crypto_secretbox.h b/src/libsodium/include/sodium/crypto_secretbox.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_secretbox.h rename to src/libsodium/include/sodium/crypto_secretbox.h diff --git a/src/libnacl-ref/include/nacl/crypto_secretbox_xsalsa20poly1305.h b/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_secretbox_xsalsa20poly1305.h rename to src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h diff --git a/src/libnacl-ref/include/nacl/crypto_sign.h b/src/libsodium/include/sodium/crypto_sign.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_sign.h rename to src/libsodium/include/sodium/crypto_sign.h diff --git a/src/libnacl-ref/include/nacl/crypto_sign_ed25519.h b/src/libsodium/include/sodium/crypto_sign_ed25519.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_sign_ed25519.h rename to src/libsodium/include/sodium/crypto_sign_ed25519.h diff --git a/src/libnacl-ref/include/nacl/crypto_sign_edwards25519sha512batch.h b/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_sign_edwards25519sha512batch.h rename to src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h diff --git a/src/libnacl-ref/include/nacl/crypto_stream.h b/src/libsodium/include/sodium/crypto_stream.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_stream.h rename to src/libsodium/include/sodium/crypto_stream.h diff --git a/src/libnacl-ref/include/nacl/crypto_stream_aes128ctr.h b/src/libsodium/include/sodium/crypto_stream_aes128ctr.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_stream_aes128ctr.h rename to src/libsodium/include/sodium/crypto_stream_aes128ctr.h diff --git a/src/libnacl-ref/include/nacl/crypto_stream_salsa20.h b/src/libsodium/include/sodium/crypto_stream_salsa20.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_stream_salsa20.h rename to src/libsodium/include/sodium/crypto_stream_salsa20.h diff --git a/src/libnacl-ref/include/nacl/crypto_stream_salsa2012.h b/src/libsodium/include/sodium/crypto_stream_salsa2012.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_stream_salsa2012.h rename to src/libsodium/include/sodium/crypto_stream_salsa2012.h diff --git a/src/libnacl-ref/include/nacl/crypto_stream_salsa208.h b/src/libsodium/include/sodium/crypto_stream_salsa208.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_stream_salsa208.h rename to src/libsodium/include/sodium/crypto_stream_salsa208.h diff --git a/src/libnacl-ref/include/nacl/crypto_stream_xsalsa20.h b/src/libsodium/include/sodium/crypto_stream_xsalsa20.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_stream_xsalsa20.h rename to src/libsodium/include/sodium/crypto_stream_xsalsa20.h diff --git a/src/libnacl-ref/include/nacl/crypto_uint16.h b/src/libsodium/include/sodium/crypto_uint16.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_uint16.h rename to src/libsodium/include/sodium/crypto_uint16.h diff --git a/src/libnacl-ref/include/nacl/crypto_uint32.h b/src/libsodium/include/sodium/crypto_uint32.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_uint32.h rename to src/libsodium/include/sodium/crypto_uint32.h diff --git a/src/libnacl-ref/include/nacl/crypto_uint64.h b/src/libsodium/include/sodium/crypto_uint64.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_uint64.h rename to src/libsodium/include/sodium/crypto_uint64.h diff --git a/src/libnacl-ref/include/nacl/crypto_uint8.h b/src/libsodium/include/sodium/crypto_uint8.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_uint8.h rename to src/libsodium/include/sodium/crypto_uint8.h diff --git a/src/libnacl-ref/include/nacl/crypto_verify_16.h b/src/libsodium/include/sodium/crypto_verify_16.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_verify_16.h rename to src/libsodium/include/sodium/crypto_verify_16.h diff --git a/src/libnacl-ref/include/nacl/crypto_verify_32.h b/src/libsodium/include/sodium/crypto_verify_32.h similarity index 100% rename from src/libnacl-ref/include/nacl/crypto_verify_32.h rename to src/libsodium/include/sodium/crypto_verify_32.h diff --git a/src/libnacl-ref/include/nacl/randombytes.h b/src/libsodium/include/sodium/randombytes.h similarity index 100% rename from src/libnacl-ref/include/nacl/randombytes.h rename to src/libsodium/include/sodium/randombytes.h diff --git a/src/libnacl-ref/include/nacl/version.h.in b/src/libsodium/include/sodium/version.h.in similarity index 100% rename from src/libnacl-ref/include/nacl/version.h.in rename to src/libsodium/include/sodium/version.h.in diff --git a/src/libnacl-ref/randombytes/devurandom.c b/src/libsodium/randombytes/devurandom.c similarity index 100% rename from src/libnacl-ref/randombytes/devurandom.c rename to src/libsodium/randombytes/devurandom.c diff --git a/src/libnacl-ref/randombytes/devurandom.h b/src/libsodium/randombytes/devurandom.h similarity index 100% rename from src/libnacl-ref/randombytes/devurandom.h rename to src/libsodium/randombytes/devurandom.h