Merge pull request #110 from runtimejs/sodium

Sodium

Author: iefserge

SConstruct

@@ -76,6 +76,7 @@ config = {
             '-c',
             '-std=c99',
             '-D_XOPEN_SOURCE=700',
+            '-DSODIUM_STATIC',
         ]),
         "release": set([
         ]),
@@ -117,6 +118,7 @@ config = {
         'deps/acpica/source/include',
         'deps/printf',
         'deps/miniz',
+        'deps/libsodium/src/libsodium/include',
         'src',
         'test',
     ],
@@ -127,6 +129,7 @@ config = {
         'miniz',
         'acpica',
         'printf',
+        'sodium',
         'musl',
         'gcc',
     ],

deps/SConscript

@@ -1052,6 +1052,155 @@ libs_config = {
             'miniz/tinfl.c',
         ],
     },
+    "libsodium": {
+        "include": [
+            'musl/src/internal',
+            'musl/include',
+            'musl/arch/x86_64',
+            'musl/arch/x86_64/bits',
+            'libsodium/src/libsodium/include/sodium',
+        ],
+        "source": [
+            'libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c',
+            'libsodium/src/libsodium/crypto_auth/crypto_auth.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256_api.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha256/cp/verify_hmacsha256.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256_api.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c',
+            'libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c',
+            'libsodium/src/libsodium/crypto_box/crypto_box.c',
+            'libsodium/src/libsodium/crypto_box/crypto_box_easy.c',
+            'libsodium/src/libsodium/crypto_box/crypto_box_seal.c',
+            'libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c',
+            'libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c',
+            'libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c',
+            'libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c',
+            'libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c',
+            'libsodium/src/libsodium/crypto_core/curve25519/ref10/base.h',
+            'libsodium/src/libsodium/crypto_core/curve25519/ref10/base2.h',
+            'libsodium/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c',
+            'libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c',
+            'libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.h',
+            'libsodium/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c',
+            'libsodium/src/libsodium/crypto_core/salsa2012/core_salsa2012_api.c',
+            'libsodium/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c',
+            'libsodium/src/libsodium/crypto_core/salsa208/core_salsa208_api.c',
+            'libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c',
+            'libsodium/src/libsodium/crypto_core/hsalsa20/core_hsalsa20_api.c',
+            'libsodium/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c',
+            'libsodium/src/libsodium/crypto_core/salsa20/core_salsa20_api.c',
+            'libsodium/src/libsodium/crypto_generichash/crypto_generichash.c',
+            'libsodium/src/libsodium/crypto_generichash/blake2/generichash_blake2_api.c',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2-impl.h',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-load-sse2.h',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-load-sse41.h',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-load-avx2.h',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c',
+            'libsodium/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c',
+            'libsodium/src/libsodium/crypto_hash/crypto_hash.c',
+            'libsodium/src/libsodium/crypto_hash/sha256/hash_sha256_api.c',
+            'libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c',
+            'libsodium/src/libsodium/crypto_hash/sha512/hash_sha512_api.c',
+            'libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c',
+            'libsodium/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c',
+            'libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c',
+            'libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.h',
+            'libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h',
+            'libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h',
+            'libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h',
+            'libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.c',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.h',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.c',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.h',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2-impl.h',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2.c',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/argon2.h',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.h',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/blamka-round-ref.h',
+            'libsodium/src/libsodium/crypto_pwhash/argon2/pwhash_argon2i.c',
+            'libsodium/src/libsodium/crypto_pwhash/crypto_pwhash.c',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c',
+            'libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c',
+            'libsodium/src/libsodium/crypto_scalarmult/crypto_scalarmult.c',
+            'libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c',
+            'libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.h',
+            'libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c',
+            'libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.h',
+            'libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.c',
+            'libsodium/src/libsodium/crypto_scalarmult/curve25519/scalarmult_curve25519.h',
+            'libsodium/src/libsodium/crypto_secretbox/crypto_secretbox.c',
+            'libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c',
+            'libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c',
+            'libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c',
+            'libsodium/src/libsodium/crypto_shorthash/crypto_shorthash.c',
+            'libsodium/src/libsodium/crypto_shorthash/siphash24/shorthash_siphash24_api.c',
+            'libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c',
+            'libsodium/src/libsodium/crypto_sign/crypto_sign.c',
+            'libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519_api.c',
+            'libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c',
+            'libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c',
+            'libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c',
+            'libsodium/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/stream_aes128ctr_api.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/common.h',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/consts.h',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/consts_aes128ctr.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128.h',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/types.h',
+            'libsodium/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c',
+            'libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c',
+            'libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.h',
+            'libsodium/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h',
+            'libsodium/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.c',
+            'libsodium/src/libsodium/crypto_stream/crypto_stream.c',
+            'libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20_api.c',
+            'libsodium/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c',
+            'libsodium/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20_ref.c',
+            'libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20_api.c',
+            'libsodium/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c',
+            'libsodium/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c',
+            'libsodium/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.S',
+            'libsodium/src/libsodium/crypto_stream/salsa2012/stream_salsa2012_api.c',
+            'libsodium/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c',
+            'libsodium/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c',
+            'libsodium/src/libsodium/crypto_stream/salsa208/stream_salsa208_api.c',
+            'libsodium/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c',
+            'libsodium/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c',
+            'libsodium/src/libsodium/crypto_verify/16/verify_16_api.c',
+            'libsodium/src/libsodium/crypto_verify/16/ref/verify_16.c',
+            'libsodium/src/libsodium/crypto_verify/32/verify_32_api.c',
+            'libsodium/src/libsodium/crypto_verify/32/ref/verify_32.c',
+            'libsodium/src/libsodium/crypto_verify/64/verify_64_api.c',
+            'libsodium/src/libsodium/crypto_verify/64/ref/verify_64.c',
+            'libsodium/src/libsodium/include/sodium/private/common.h',
+            'libsodium/src/libsodium/include/sodium/private/curve25519_ref10.h',
+            'libsodium/src/libsodium/randombytes/randombytes.c',
+            'libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c',
+            'libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c',
+            'libsodium/src/libsodium/sodium/core.c',
+            'libsodium/src/libsodium/sodium/runtime.c',
+            'libsodium/src/libsodium/sodium/utils.c',
+            'libsodium/src/libsodium/sodium/version.c',
+        ],
+    },
 }
 
 

deps/libsodium/.gitignore

@@ -0,0 +1,142 @@
+*.bc
+*.cmake
+*.dSYM
+*.done
+*.final
+*.gcda
+*.gcno
+*.i
+*.la
+*.lo
+*.log
+*.mem
+*.nexe
+*.o
+*.plist
+*.s
+*.scan
+*.sdf
+*.status
+*.tar.*
+*~
+.DS_Store
+.deps
+.dirstamp
+.done
+.libs
+/bin/
+/obj/
+Build
+INSTALL
+Makefile
+Makefile.in
+Vagrantfile
+aclocal.m4
+android-toolchain
+android-toolchain-*
+autom4te.cache
+build
+compile
+confdefs.h
+config.*
+configure
+configure.lineno
+coverage.info
+depcomp
+install-sh
+libsodium-*.tar.bz2
+libsodium-*.tar.gz
+libsodium-*.vcproj
+libsodium-*.vcproj.filters
+libsodium-*.vcxproj
+libsodium-*.vcxproj.filters
+libsodium-android-*
+libsodium-ios
+libsodium-js
+libsodium-js-*
+libsodium-nativeclient
+libsodium-nativeclient-*
+libsodium-osx
+libsodium-uninstalled.pc
+libsodium-win32
+libsodium-win64
+libsodium.pc
+libtool
+ltmain.sh
+m4/argz.m4
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+man/*.html
+man/Makefile.in
+missing
+src/libsodium/*.def
+src/libsodium/include/sodium/version.h
+stamp-*
+test-driver
+test/default/browser
+test/default/*.res
+test/default/*.trs
+test/default/aead_aes256gcm
+test/default/aead_chacha20poly1305
+test/default/auth
+test/default/auth2
+test/default/auth3
+test/default/auth5
+test/default/auth6
+test/default/auth7
+test/default/box
+test/default/box2
+test/default/box7
+test/default/box8
+test/default/box_easy
+test/default/box_easy2
+test/default/box_seal
+test/default/box_seed
+test/default/chacha20
+test/default/core1
+test/default/core2
+test/default/core3
+test/default/core4
+test/default/core5
+test/default/core6
+test/default/ed25519_convert
+test/default/generichash
+test/default/generichash2
+test/default/generichash3
+test/default/hash
+test/default/hash3
+test/default/onetimeauth
+test/default/onetimeauth2
+test/default/onetimeauth7
+test/default/pwhash
+test/default/pwhash_scrypt
+test/default/pwhash_scrypt_ll
+test/default/randombytes
+test/default/scalarmult
+test/default/scalarmult2
+test/default/scalarmult5
+test/default/scalarmult6
+test/default/scalarmult7
+test/default/secretbox
+test/default/secretbox2
+test/default/secretbox7
+test/default/secretbox8
+test/default/secretbox_easy
+test/default/secretbox_easy2
+test/default/shorthash
+test/default/sign
+test/default/sodium_core
+test/default/sodium_utils
+test/default/sodium_utils2
+test/default/sodium_utils3
+test/default/sodium_version
+test/default/stream
+test/default/stream2
+test/default/stream3
+test/default/stream4
+test/default/verify1
+test/js.done
+testing

deps/libsodium/.travis.yml

@@ -0,0 +1,40 @@
+sudo: false
+
+language: c
+
+os:
+ - linux
+ - osx
+
+compiler:
+ - clang
+ - gcc
+ - g++
+
+before_script:
+ - ./autogen.sh
+
+script:
+ - ./configure --disable-dependency-tracking
+ - >
+   if [ "$TRAVIS_OS_NAME" = 'linux' -a "$CC" = 'gcc' ]; then make CFLAGS='-g0' > /dev/null && cp src/libsodium/.libs/libsodium.so lib.so && make clean > /dev/null && make CFLAGS='-g0' CPPFLAGS='-DSODIUM_C99\(X\)=' > /dev/null && cp src/libsodium/.libs/libsodium.so lib-oldc.so && cmp lib.so lib-oldc.so && echo No binary changes && make clean > /dev/null ; fi
+ - make distcheck
+ - make distclean > /dev/null
+ - ./configure --disable-dependency-tracking --enable-minimal
+ - make distcheck
+ - ( echo '#include <sodium.h>' ; echo 'int main(void) { return sodium_init(); }' ) > /tmp/main.c && gcc -Isrc/libsodium/include -Isrc/libsodium/include/sodium $(find src -name '*.c' -o -name '*.S') /tmp/main.c
+
+env:
+  global:
+   - secure: "P4qv8aX+nogLlSy0lTMDIR6I5OLXq+qMijB4s+oCLME5BL2xPAn3v0QG5IoHdnU0ncRc1tEYZxN3F48Rp+Q7+wEVqSBLFS3oXzfNHJGEYoiaAcPNWO0R1kF8rcy8AuoAEomNeYS+5vhzQtaXklNtx/250p6MgGuMsdpMsRUKS/U="
+
+addons:
+  coverity_scan:
+    project:
+      name: jedisct1/libsodium
+      version: 1.0.3
+      description: libsodium
+      notification_email: coverityscan@pureftpd.org
+      build_command_prepend: ./autogen.sh ; ./configure
+      build_command: make -j4
+      branch_pattern: coverity_scan