rbnacl-libsodium 1.0.11 → 1.0.13
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGES.md +4 -0
- data/lib/rbnacl/libsodium/version.rb +1 -1
- data/vendor/libsodium/AUTHORS +45 -33
- data/vendor/libsodium/ChangeLog +63 -2
- data/vendor/libsodium/LICENSE +1 -1
- data/vendor/libsodium/Makefile.am +1 -0
- data/vendor/libsodium/Makefile.in +17 -14
- data/vendor/libsodium/README.markdown +1 -0
- data/vendor/libsodium/THANKS +38 -4
- data/vendor/libsodium/aclocal.m4 +25 -24
- data/vendor/libsodium/autogen.sh +12 -7
- data/vendor/libsodium/autom4te.cache/output.0 +5066 -2281
- data/vendor/libsodium/autom4te.cache/output.1 +1013 -600
- data/vendor/libsodium/autom4te.cache/output.2 +5066 -2281
- data/vendor/libsodium/autom4te.cache/requests +426 -1584
- data/vendor/libsodium/autom4te.cache/traces.0 +2044 -876
- data/vendor/libsodium/autom4te.cache/traces.1 +996 -523
- data/vendor/libsodium/autom4te.cache/traces.2 +1996 -828
- data/vendor/libsodium/build-aux/compile +5 -4
- data/vendor/libsodium/build-aux/config.guess +120 -68
- data/vendor/libsodium/build-aux/config.sub +51 -22
- data/vendor/libsodium/build-aux/depcomp +3 -3
- data/vendor/libsodium/build-aux/install-sh +2 -2
- data/vendor/libsodium/build-aux/missing +3 -3
- data/vendor/libsodium/build-aux/test-driver +3 -3
- data/vendor/libsodium/builds/msvc/properties/Win32.props +4 -1
- data/vendor/libsodium/builds/msvc/properties/x64.props +4 -1
- data/vendor/libsodium/builds/msvc/resource.h +14 -0
- data/vendor/libsodium/builds/msvc/resource.rc +63 -0
- data/vendor/libsodium/builds/msvc/version.h +7 -4
- data/vendor/libsodium/builds/msvc/vs2010/libsodium.import.props +1 -1
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.props +10 -5
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +182 -139
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +632 -470
- data/vendor/libsodium/builds/msvc/vs2012/libsodium.import.props +1 -1
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.props +10 -5
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +182 -129
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +632 -470
- data/vendor/libsodium/builds/msvc/vs2013/libsodium.import.props +1 -1
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.props +10 -5
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +182 -129
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +632 -470
- data/vendor/libsodium/builds/msvc/vs2015/libsodium.import.props +1 -1
- data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.props +10 -5
- data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj +181 -118
- data/vendor/libsodium/builds/msvc/vs2015/libsodium/libsodium.vcxproj.filters +632 -470
- data/vendor/libsodium/builds/msvc/vs2017/libsodium.import.props +52 -0
- data/vendor/libsodium/builds/msvc/vs2017/libsodium.import.xml +17 -0
- data/vendor/libsodium/builds/msvc/vs2017/libsodium.sln +52 -0
- data/vendor/libsodium/builds/msvc/vs2017/libsodium/libsodium.props +48 -0
- data/vendor/libsodium/builds/msvc/vs2017/libsodium/libsodium.vcxproj +320 -0
- data/vendor/libsodium/builds/msvc/vs2017/libsodium/libsodium.vcxproj.filters +962 -0
- data/vendor/libsodium/builds/msvc/vs2017/libsodium/libsodium.xml +15 -0
- data/vendor/libsodium/configure +1002 -589
- data/vendor/libsodium/configure.ac +48 -21
- data/vendor/libsodium/contrib/Findsodium.cmake +267 -0
- data/vendor/libsodium/contrib/Makefile.am +3 -0
- data/vendor/libsodium/contrib/Makefile.in +483 -0
- data/vendor/libsodium/dist-build/Makefile.in +11 -7
- data/vendor/libsodium/dist-build/android-armv8-a.sh +1 -1
- data/vendor/libsodium/dist-build/android-build.sh +25 -17
- data/vendor/libsodium/dist-build/android-mips32.sh +1 -1
- data/vendor/libsodium/dist-build/android-mips64.sh +1 -1
- data/vendor/libsodium/dist-build/android-x86_64.sh +1 -1
- data/vendor/libsodium/dist-build/emscripten-symbols.def +150 -2
- data/vendor/libsodium/dist-build/emscripten-wasm.sh +132 -0
- data/vendor/libsodium/dist-build/emscripten.sh +8 -6
- data/vendor/libsodium/dist-build/ios.sh +29 -5
- data/vendor/libsodium/libsodium.vcxproj +139 -77
- data/vendor/libsodium/libsodium.vcxproj.filters +315 -144
- data/vendor/libsodium/m4/ax_check_catchable_segv.m4 +42 -0
- data/vendor/libsodium/m4/ax_check_compile_flag.m4 +6 -4
- data/vendor/libsodium/m4/ax_check_define.m4 +3 -3
- data/vendor/libsodium/m4/ax_check_gnu_make.m4 +31 -25
- data/vendor/libsodium/m4/ax_check_link_flag.m4 +8 -6
- data/vendor/libsodium/m4/ax_pthread.m4 +275 -275
- data/vendor/libsodium/m4/ax_valgrind_check.m4 +92 -41
- data/vendor/libsodium/m4/pkg.m4 +1 -1
- data/vendor/libsodium/msvc-scripts/Makefile.in +11 -7
- data/vendor/libsodium/msvc-scripts/process.bat +4 -3
- data/vendor/libsodium/packaging/dotnet-core/README.md +59 -0
- data/vendor/libsodium/packaging/dotnet-core/desktop.targets +16 -0
- data/vendor/libsodium/packaging/dotnet-core/libsodium.props +33 -0
- data/vendor/libsodium/packaging/dotnet-core/prepare.py +262 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/alpine-x64 +3 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/build +9 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/centos-x64 +3 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/debian-x64 +4 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/fedora-x64 +3 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/opensuse-x64 +3 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/pack +5 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/test +27 -0
- data/vendor/libsodium/packaging/dotnet-core/recipes/ubuntu-x64 +4 -0
- data/vendor/libsodium/packaging/nuget/package.config +1 -1
- data/vendor/libsodium/packaging/nuget/package.gsl +3 -3
- data/vendor/libsodium/src/Makefile.in +11 -7
- data/vendor/libsodium/src/libsodium/Makefile.am +113 -98
- data/vendor/libsodium/src/libsodium/Makefile.in +1034 -1236
- data/vendor/libsodium/src/libsodium/crypto_aead/aes256gcm/aesni/aead_aes256gcm_aesni.c +31 -12
- data/vendor/libsodium/src/libsodium/crypto_aead/chacha20poly1305/sodium/aead_chacha20poly1305.c +31 -10
- data/vendor/libsodium/src/libsodium/crypto_aead/xchacha20poly1305/sodium/aead_xchacha20poly1305.c +153 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/crypto_auth.c +7 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/{cp/hmac_hmacsha256.c → auth_hmacsha256.c} +43 -35
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/{cp/hmac_hmacsha512.c → auth_hmacsha512.c} +43 -35
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/{cp/hmac_hmacsha512256.c → auth_hmacsha512256.c} +48 -9
- data/vendor/libsodium/src/libsodium/crypto_box/crypto_box_easy.c +4 -3
- data/vendor/libsodium/src/libsodium/crypto_box/crypto_box_seal.c +2 -1
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_curve25519xchacha20poly1305.c +197 -0
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xchacha20poly1305/box_seal_curve25519xchacha20poly1305.c +79 -0
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305.c +150 -0
- data/vendor/libsodium/src/libsodium/crypto_core/curve25519/ref10/curve25519_ref10.c +1156 -662
- data/vendor/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.c +12 -5
- data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/{core_hsalsa20_api.c → core_hsalsa20.c} +0 -0
- data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20_ref2.c +95 -0
- data/vendor/libsodium/src/libsodium/crypto_core/salsa/ref/core_salsa_ref.c +195 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/{blake2/generichash_blake2_api.c → blake2b/generichash_blake2.c} +7 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2.h +109 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.c +49 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-avx2.h +140 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ref.c +92 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.c +87 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-sse41.h +103 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.c +90 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-compress-ssse3.h +103 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-avx2.h +340 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-sse2.h +164 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-load-sse41.h +307 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2b/ref/blake2b-ref.c +494 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/{blake2 → blake2b}/ref/generichash_blake2b.c +22 -26
- data/vendor/libsodium/src/libsodium/crypto_generichash/crypto_generichash.c +7 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256_cp.c +254 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/{hash_sha256_api.c → hash_sha256.c} +4 -2
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512_cp.c +280 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/{hash_sha512_api.c → hash_sha512.c} +4 -2
- data/vendor/libsodium/src/libsodium/crypto_kdf/blake2b/kdf_blake2b.c +52 -0
- data/vendor/libsodium/src/libsodium/crypto_kdf/crypto_kdf.c +49 -0
- data/vendor/libsodium/src/libsodium/crypto_kx/crypto_kx.c +136 -0
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/crypto_onetimeauth.c +6 -0
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.c +34 -27
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h +1 -1
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h +203 -156
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h +178 -134
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.c +22 -4
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305.h +10 -12
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c +564 -315
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.h +1 -1
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.c +131 -84
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-core.h +23 -18
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.c +163 -145
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-encoding.h +2 -1
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-avx2.c +247 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ref.c +42 -29
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-fill-block-ssse3.c +71 -47
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2.c +100 -65
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2.h +77 -23
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/blake2b-long.c +30 -31
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/blamka-round-avx2.h +150 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/blamka-round-ref.h +28 -26
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/blamka-round-ssse3.h +102 -99
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/pwhash_argon2i.c +90 -41
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/pwhash_argon2id.c +213 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/crypto_pwhash.c +72 -4
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt-common.c +34 -37
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/crypto_scrypt.h +27 -32
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/nosse/pwhash_scryptsalsa208sha256_nosse.c +120 -86
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.c +16 -13
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pbkdf2-sha256.h +4 -4
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/pwhash_scryptsalsa208sha256.c +98 -50
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/scrypt_platform.c +23 -18
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptsalsa208sha256/sse/pwhash_scryptsalsa208sha256_sse.c +105 -105
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c +395 -330
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref10/x25519_ref10.c +225 -198
- data/vendor/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox.c +7 -0
- data/vendor/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c +6 -5
- data/vendor/libsodium/src/libsodium/crypto_secretbox/xchacha20poly1305/secretbox_xchacha20poly1305.c +170 -0
- data/vendor/libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305.c +83 -0
- data/vendor/libsodium/src/libsodium/crypto_shorthash/crypto_shorthash.c +7 -0
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24_ref.c +65 -0
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash_ref.h +24 -0
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphashx24_ref.c +71 -0
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/{shorthash_siphash24_api.c → shorthash_siphash24.c} +0 -0
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/shorthash_siphashx24.c +11 -0
- data/vendor/libsodium/src/libsodium/crypto_sign/crypto_sign.c +33 -0
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/ed25519_ref10.h +18 -0
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c +18 -13
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/obsolete.c +29 -26
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +75 -36
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +39 -15
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519.c +91 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/afternm_aes128ctr.c +174 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/beforenm_aes128ctr.c +66 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/common.h +766 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/consts.h +28 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/consts_aes128ctr.c +28 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/int128.h +50 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/int128_aes128ctr.c +149 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/stream_aes128ctr_nacl.c +31 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/nacl/xor_afternm_aes128ctr.c +195 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/{stream_aes128ctr_api.c → stream_aes128ctr.c} +6 -3
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.c +179 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-avx2.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.c +173 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/chacha20_dolbeau-ssse3.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/u0.h +86 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/u1.h +98 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/u4.h +175 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/dolbeau/u8.h +357 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/{stream_chacha20_ref.c → chacha20_ref.c} +93 -94
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/chacha20_ref.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/stream_chacha20.c +39 -7
- data/vendor/libsodium/src/libsodium/crypto_stream/crypto_stream.c +7 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.c +120 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/salsa20_ref.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.c +93 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20.h +16 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/{amd64_xmm6/stream_salsa20_amd64_xmm6.S → xmm6/salsa20_xmm6-asm.S} +20 -12
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.c +31 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6/salsa20_xmm6.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.c +131 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-avx2.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.c +122 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/salsa20_xmm6int-sse2.h +8 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u0.h +195 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u1.h +207 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u4.h +547 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/xmm6int/u8.h +476 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012_ref.c +106 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/stream_salsa2012.c +20 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208_ref.c +106 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/stream_salsa208.c +20 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/xchacha20/stream_xchacha20.c +63 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20.c +60 -0
- data/vendor/libsodium/src/libsodium/crypto_verify/sodium/verify.c +61 -0
- data/vendor/libsodium/src/libsodium/include/Makefile.am +8 -6
- data/vendor/libsodium/src/libsodium/include/Makefile.in +29 -21
- data/vendor/libsodium/src/libsodium/include/sodium.h +15 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_aead_aes256gcm.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_aead_chacha20poly1305.h +6 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_aead_xchacha20poly1305.h +91 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +5 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_box_curve25519xchacha20poly1305.h +153 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash_blake2b.h +3 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha256.h +4 -3
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha512.h +4 -3
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_kdf.h +51 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_kdf_blake2b.h +42 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_kx.h +64 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +11 -9
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash.h +37 -1
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_argon2i.h +40 -10
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_argon2id.h +116 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_scryptsalsa208sha256.h +37 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h +0 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox_xchacha20poly1305.h +62 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +5 -1
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_shorthash.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +18 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign.h +22 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h +28 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +10 -5
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_chacha20.h +14 -3
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa20.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa2012.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa208.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_xchacha20.h +53 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +4 -0
- data/vendor/libsodium/src/libsodium/include/sodium/private/common.h +84 -17
- data/vendor/libsodium/src/libsodium/include/sodium/private/implementations.h +11 -0
- data/vendor/libsodium/src/libsodium/include/sodium/private/sse2_64_32.h +50 -0
- data/vendor/libsodium/src/libsodium/include/sodium/randombytes.h +10 -2
- data/vendor/libsodium/src/libsodium/include/sodium/utils.h +4 -5
- data/vendor/libsodium/src/libsodium/include/sodium/version.h.in +4 -0
- data/vendor/libsodium/src/libsodium/randombytes/randombytes.c +47 -19
- data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +30 -50
- data/vendor/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +25 -15
- data/vendor/libsodium/src/libsodium/sodium/core.c +25 -23
- data/vendor/libsodium/src/libsodium/sodium/runtime.c +66 -57
- data/vendor/libsodium/src/libsodium/sodium/utils.c +120 -106
- data/vendor/libsodium/src/libsodium/sodium/version.c +10 -0
- data/vendor/libsodium/test/Makefile.in +11 -7
- data/vendor/libsodium/test/default/Makefile.am +65 -5
- data/vendor/libsodium/test/default/Makefile.in +243 -78
- data/vendor/libsodium/test/default/aead_aes256gcm.c +2 -2
- data/vendor/libsodium/test/default/aead_xchacha20poly1305.c +188 -0
- data/vendor/libsodium/test/default/aead_xchacha20poly1305.exp +51 -0
- data/vendor/libsodium/test/default/auth.c +11 -7
- data/vendor/libsodium/test/default/auth2.c +15 -12
- data/vendor/libsodium/test/default/auth3.c +18 -15
- data/vendor/libsodium/test/default/auth5.c +3 -2
- data/vendor/libsodium/test/default/auth6.c +4 -3
- data/vendor/libsodium/test/default/auth7.c +3 -2
- data/vendor/libsodium/test/default/box.c +57 -52
- data/vendor/libsodium/test/default/box2.c +41 -36
- data/vendor/libsodium/test/default/box7.c +4 -3
- data/vendor/libsodium/test/default/box8.c +4 -3
- data/vendor/libsodium/test/default/box_easy.c +36 -32
- data/vendor/libsodium/test/default/box_easy2.c +41 -34
- data/vendor/libsodium/test/default/box_seal.c +7 -6
- data/vendor/libsodium/test/default/box_seed.c +10 -8
- data/vendor/libsodium/test/default/chacha20.c +18 -3
- data/vendor/libsodium/test/default/chacha20.exp +45 -0
- data/vendor/libsodium/test/default/cmptest.h +1 -0
- data/vendor/libsodium/test/default/core1.c +10 -9
- data/vendor/libsodium/test/default/core2.c +13 -12
- data/vendor/libsodium/test/default/core3.c +13 -12
- data/vendor/libsodium/test/default/core4.c +11 -12
- data/vendor/libsodium/test/default/core5.c +13 -12
- data/vendor/libsodium/test/default/core6.c +15 -13
- data/vendor/libsodium/test/default/ed25519_convert.c +12 -9
- data/vendor/libsodium/test/default/hash.c +10 -6
- data/vendor/libsodium/test/default/hash3.c +3 -2
- data/vendor/libsodium/test/default/index-wasm.html.tpl +118 -0
- data/vendor/libsodium/test/default/kdf.c +61 -0
- data/vendor/libsodium/test/default/kdf.exp +77 -0
- data/vendor/libsodium/test/default/keygen.c +64 -0
- data/vendor/libsodium/test/default/keygen.exp +1 -0
- data/vendor/libsodium/test/default/kx.c +119 -0
- data/vendor/libsodium/test/default/kx.exp +7 -0
- data/vendor/libsodium/test/default/nacl-test-wrapper.sh +9 -2
- data/vendor/libsodium/test/default/onetimeauth.c +26 -23
- data/vendor/libsodium/test/default/onetimeauth2.c +22 -20
- data/vendor/libsodium/test/default/onetimeauth7.c +3 -2
- data/vendor/libsodium/test/default/pwhash.c +209 -157
- data/vendor/libsodium/test/default/pwhash_argon2id.c +388 -0
- data/vendor/libsodium/test/default/pwhash_argon2id.exp +15 -0
- data/vendor/libsodium/test/default/pwhash_scrypt.c +232 -224
- data/vendor/libsodium/test/default/pwhash_scrypt.exp +2 -1
- data/vendor/libsodium/test/default/pwhash_scrypt_ll.c +39 -41
- data/vendor/libsodium/test/default/randombytes.c +34 -13
- data/vendor/libsodium/test/default/randombytes.exp +1 -0
- data/vendor/libsodium/test/default/scalarmult.c +21 -18
- data/vendor/libsodium/test/default/scalarmult2.c +8 -6
- data/vendor/libsodium/test/default/scalarmult5.c +13 -10
- data/vendor/libsodium/test/default/scalarmult6.c +17 -14
- data/vendor/libsodium/test/default/scalarmult7.c +9 -10
- data/vendor/libsodium/test/default/secretbox.c +39 -36
- data/vendor/libsodium/test/default/secretbox2.c +28 -25
- data/vendor/libsodium/test/default/secretbox7.c +3 -2
- data/vendor/libsodium/test/default/secretbox8.c +4 -3
- data/vendor/libsodium/test/default/secretbox_easy.c +40 -37
- data/vendor/libsodium/test/default/secretbox_easy2.c +19 -18
- data/vendor/libsodium/test/default/shorthash.c +4 -4
- data/vendor/libsodium/test/default/sign.c +70 -13
- data/vendor/libsodium/test/default/sign.exp +2 -0
- data/vendor/libsodium/test/default/siphashx24.c +33 -0
- data/vendor/libsodium/test/default/siphashx24.exp +64 -0
- data/vendor/libsodium/test/default/sodium_core.c +9 -8
- data/vendor/libsodium/test/default/sodium_utils.c +52 -46
- data/vendor/libsodium/test/default/sodium_utils2.c +17 -8
- data/vendor/libsodium/test/default/sodium_utils3.c +15 -6
- data/vendor/libsodium/test/default/sodium_version.c +7 -1
- data/vendor/libsodium/test/default/stream.c +31 -18
- data/vendor/libsodium/test/default/stream.exp +65 -0
- data/vendor/libsodium/test/default/stream2.c +13 -9
- data/vendor/libsodium/test/default/stream3.c +12 -10
- data/vendor/libsodium/test/default/stream4.c +30 -27
- data/vendor/libsodium/test/default/verify1.c +5 -4
- data/vendor/libsodium/test/default/xchacha20.c +376 -0
- data/vendor/libsodium/test/default/xchacha20.exp +5 -0
- data/vendor/libsodium/test/quirks/quirks.h +4 -3
- metadata +140 -111
- data/vendor/libsodium/autom4te.cache/output.3 +0 -17240
- data/vendor/libsodium/autom4te.cache/output.4 +0 -17517
- data/vendor/libsodium/autom4te.cache/output.5 +0 -18535
- data/vendor/libsodium/autom4te.cache/output.6 +0 -19077
- data/vendor/libsodium/autom4te.cache/output.7 +0 -19837
- data/vendor/libsodium/autom4te.cache/traces.3 +0 -2833
- data/vendor/libsodium/autom4te.cache/traces.4 +0 -2951
- data/vendor/libsodium/autom4te.cache/traces.5 +0 -3042
- data/vendor/libsodium/autom4te.cache/traces.6 +0 -3194
- data/vendor/libsodium/autom4te.cache/traces.7 +0 -3614
- data/vendor/libsodium/builds/msvc/properties/ARM.props +0 -20
- data/vendor/libsodium/compile +0 -347
- data/vendor/libsodium/config.guess +0 -1568
- data/vendor/libsodium/config.sub +0 -1793
- data/vendor/libsodium/depcomp +0 -791
- data/vendor/libsodium/install-sh +0 -527
- data/vendor/libsodium/ltmain.sh +0 -9655
- data/vendor/libsodium/missing +0 -215
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256_api.c +0 -16
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/cp/verify_hmacsha256.c +0 -11
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c +0 -16
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c +0 -12
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256_api.c +0 -16
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/verify_hmacsha512256.c +0 -14
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c +0 -41
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/after_curve25519xsalsa20poly1305.c +0 -22
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/before_curve25519xsalsa20poly1305.c +0 -18
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/box_curve25519xsalsa20poly1305.c +0 -42
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/keypair_curve25519xsalsa20poly1305.c +0 -29
- data/vendor/libsodium/src/libsodium/crypto_core/hchacha20/core_hchacha20.h +0 -28
- data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/ref2/core_hsalsa20.c +0 -100
- data/vendor/libsodium/src/libsodium/crypto_core/salsa20/core_salsa20_api.c +0 -21
- data/vendor/libsodium/src/libsodium/crypto_core/salsa20/ref/core_salsa20.c +0 -126
- data/vendor/libsodium/src/libsodium/crypto_core/salsa2012/core_salsa2012_api.c +0 -21
- data/vendor/libsodium/src/libsodium/crypto_core/salsa2012/ref/core_salsa2012.c +0 -126
- data/vendor/libsodium/src/libsodium/crypto_core/salsa208/core_salsa208_api.c +0 -21
- data/vendor/libsodium/src/libsodium/crypto_core/salsa208/ref/core_salsa208.c +0 -126
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2-impl.h +0 -48
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h +0 -97
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-avx2.c +0 -45
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-avx2.h +0 -123
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ref.c +0 -94
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.c +0 -80
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-sse41.h +0 -97
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ssse3.c +0 -87
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-compress-ssse3.h +0 -97
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-load-avx2.h +0 -339
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-load-sse2.h +0 -66
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-load-sse41.h +0 -400
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c +0 -456
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c +0 -269
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c +0 -298
- data/vendor/libsodium/src/libsodium/crypto_pwhash/argon2/argon2-impl.h +0 -40
- data/vendor/libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/box_xsalsa20poly1305.c +0 -35
- data/vendor/libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c +0 -26
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/shorthash_siphash24.c +0 -72
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/description +0 -1
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519_api.c +0 -39
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c +0 -159
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/beforenm_aes128ctr.c +0 -59
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/common.h +0 -771
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/consts.h +0 -28
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/consts_aes128ctr.c +0 -14
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128.h +0 -56
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128_aes128ctr.c +0 -131
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/stream_aes128ctr.c +0 -29
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/types.h +0 -10
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c +0 -180
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/ref/stream_chacha20_ref.h +0 -28
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.c +0 -336
- data/vendor/libsodium/src/libsodium/crypto_stream/chacha20/vec/stream_chacha20_vec.h +0 -28
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c +0 -55
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20_ref.c +0 -63
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20_api.c +0 -19
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/stream_salsa2012.c +0 -51
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/xor_salsa2012.c +0 -54
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/stream_salsa2012_api.c +0 -11
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/stream_salsa208.c +0 -51
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/xor_salsa208.c +0 -54
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/stream_salsa208_api.c +0 -11
- data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/stream_xsalsa20.c +0 -24
- data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/xor_xsalsa20.c +0 -35
- data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20_api.c +0 -11
- data/vendor/libsodium/src/libsodium/crypto_verify/16/ref/verify_16.c +0 -17
- data/vendor/libsodium/src/libsodium/crypto_verify/16/verify_16_api.c +0 -6
- data/vendor/libsodium/src/libsodium/crypto_verify/32/ref/verify_32.c +0 -17
- data/vendor/libsodium/src/libsodium/crypto_verify/32/verify_32_api.c +0 -6
- data/vendor/libsodium/src/libsodium/crypto_verify/64/ref/verify_64.c +0 -17
- data/vendor/libsodium/src/libsodium/crypto_verify/64/verify_64_api.c +0 -6
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_int32.h +0 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_int64.h +0 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_uint16.h +0 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_uint32.h +0 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_uint64.h +0 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_uint8.h +0 -8
- data/vendor/libsodium/test-driver +0 -139
data/vendor/libsodium/src/libsodium/crypto_generichash/{blake2 → blake2b}/ref/generichash_blake2b.c
RENAMED
@@ -3,8 +3,8 @@
|
|
3
3
|
#include <limits.h>
|
4
4
|
#include <stdint.h>
|
5
5
|
|
6
|
-
#include "crypto_generichash_blake2b.h"
|
7
6
|
#include "blake2.h"
|
7
|
+
#include "crypto_generichash_blake2b.h"
|
8
8
|
|
9
9
|
int
|
10
10
|
crypto_generichash_blake2b(unsigned char *out, size_t outlen,
|
@@ -18,16 +18,15 @@ crypto_generichash_blake2b(unsigned char *out, size_t outlen,
|
|
18
18
|
assert(outlen <= UINT8_MAX);
|
19
19
|
assert(keylen <= UINT8_MAX);
|
20
20
|
|
21
|
-
return blake2b((uint8_t *) out, in, key,
|
22
|
-
(uint8_t)
|
21
|
+
return blake2b((uint8_t *) out, in, key, (uint8_t) outlen, (uint64_t) inlen,
|
22
|
+
(uint8_t) keylen);
|
23
23
|
}
|
24
24
|
|
25
25
|
int
|
26
|
-
crypto_generichash_blake2b_salt_personal(
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
const unsigned char *personal)
|
26
|
+
crypto_generichash_blake2b_salt_personal(
|
27
|
+
unsigned char *out, size_t outlen, const unsigned char *in,
|
28
|
+
unsigned long long inlen, const unsigned char *key, size_t keylen,
|
29
|
+
const unsigned char *salt, const unsigned char *personal)
|
31
30
|
{
|
32
31
|
if (outlen <= 0U || outlen > BLAKE2B_OUTBYTES ||
|
33
32
|
keylen > BLAKE2B_KEYBYTES || inlen > UINT64_MAX) {
|
@@ -36,15 +35,15 @@ crypto_generichash_blake2b_salt_personal(unsigned char *out, size_t outlen,
|
|
36
35
|
assert(outlen <= UINT8_MAX);
|
37
36
|
assert(keylen <= UINT8_MAX);
|
38
37
|
|
39
|
-
return blake2b_salt_personal((uint8_t *) out, in, key,
|
40
|
-
(
|
41
|
-
|
38
|
+
return blake2b_salt_personal((uint8_t *) out, in, key, (uint8_t) outlen,
|
39
|
+
(uint64_t) inlen, (uint8_t) keylen, salt,
|
40
|
+
personal);
|
42
41
|
}
|
43
42
|
|
44
43
|
int
|
45
44
|
crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
|
46
|
-
const unsigned char *key,
|
47
|
-
const size_t
|
45
|
+
const unsigned char *key, const size_t keylen,
|
46
|
+
const size_t outlen)
|
48
47
|
{
|
49
48
|
if (outlen <= 0U || outlen > BLAKE2B_OUTBYTES ||
|
50
49
|
keylen > BLAKE2B_KEYBYTES) {
|
@@ -64,11 +63,10 @@ crypto_generichash_blake2b_init(crypto_generichash_blake2b_state *state,
|
|
64
63
|
}
|
65
64
|
|
66
65
|
int
|
67
|
-
crypto_generichash_blake2b_init_salt_personal(
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
const unsigned char *personal)
|
66
|
+
crypto_generichash_blake2b_init_salt_personal(
|
67
|
+
crypto_generichash_blake2b_state *state, const unsigned char *key,
|
68
|
+
const size_t keylen, const size_t outlen, const unsigned char *salt,
|
69
|
+
const unsigned char *personal)
|
72
70
|
{
|
73
71
|
if (outlen <= 0U || outlen > BLAKE2B_OUTBYTES ||
|
74
72
|
keylen > BLAKE2B_KEYBYTES) {
|
@@ -77,14 +75,13 @@ crypto_generichash_blake2b_init_salt_personal(crypto_generichash_blake2b_state *
|
|
77
75
|
assert(outlen <= UINT8_MAX);
|
78
76
|
assert(keylen <= UINT8_MAX);
|
79
77
|
if (key == NULL || keylen <= 0U) {
|
80
|
-
if (blake2b_init_salt_personal(state, (uint8_t) outlen,
|
81
|
-
|
78
|
+
if (blake2b_init_salt_personal(state, (uint8_t) outlen, salt,
|
79
|
+
personal) != 0) {
|
82
80
|
return -1; /* LCOV_EXCL_LINE */
|
83
81
|
}
|
84
|
-
} else if (blake2b_init_key_salt_personal(state,
|
85
|
-
(uint8_t)
|
86
|
-
|
87
|
-
salt, personal) != 0) {
|
82
|
+
} else if (blake2b_init_key_salt_personal(state, (uint8_t) outlen, key,
|
83
|
+
(uint8_t) keylen, salt,
|
84
|
+
personal) != 0) {
|
88
85
|
return -1; /* LCOV_EXCL_LINE */
|
89
86
|
}
|
90
87
|
return 0;
|
@@ -100,8 +97,7 @@ crypto_generichash_blake2b_update(crypto_generichash_blake2b_state *state,
|
|
100
97
|
|
101
98
|
int
|
102
99
|
crypto_generichash_blake2b_final(crypto_generichash_blake2b_state *state,
|
103
|
-
unsigned char *out,
|
104
|
-
const size_t outlen)
|
100
|
+
unsigned char *out, const size_t outlen)
|
105
101
|
{
|
106
102
|
assert(outlen <= UINT8_MAX);
|
107
103
|
return blake2b_final(state, (uint8_t *) out, (uint8_t) outlen);
|
@@ -1,5 +1,6 @@
|
|
1
1
|
|
2
2
|
#include "crypto_generichash.h"
|
3
|
+
#include "randombytes.h"
|
3
4
|
|
4
5
|
size_t
|
5
6
|
crypto_generichash_bytes_min(void)
|
@@ -82,3 +83,9 @@ crypto_generichash_final(crypto_generichash_state *state,
|
|
82
83
|
return crypto_generichash_blake2b_final
|
83
84
|
((crypto_generichash_blake2b_state *) state, out, outlen);
|
84
85
|
}
|
86
|
+
|
87
|
+
void
|
88
|
+
crypto_generichash_keygen(unsigned char k[crypto_generichash_KEYBYTES])
|
89
|
+
{
|
90
|
+
randombytes_buf(k, crypto_generichash_KEYBYTES);
|
91
|
+
}
|
@@ -0,0 +1,254 @@
|
|
1
|
+
|
2
|
+
/*-
|
3
|
+
* Copyright 2005,2007,2009 Colin Percival
|
4
|
+
* All rights reserved.
|
5
|
+
*
|
6
|
+
* Redistribution and use in source and binary forms, with or without
|
7
|
+
* modification, are permitted provided that the following conditions
|
8
|
+
* are met:
|
9
|
+
* 1. Redistributions of source code must retain the above copyright
|
10
|
+
* notice, this list of conditions and the following disclaimer.
|
11
|
+
* 2. Redistributions in binary form must reproduce the above copyright
|
12
|
+
* notice, this list of conditions and the following disclaimer in the
|
13
|
+
* documentation and/or other materials provided with the distribution.
|
14
|
+
*
|
15
|
+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
16
|
+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
17
|
+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
18
|
+
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
19
|
+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
20
|
+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
21
|
+
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
22
|
+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
23
|
+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
24
|
+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
25
|
+
* SUCH DAMAGE.
|
26
|
+
*
|
27
|
+
*/
|
28
|
+
|
29
|
+
#include <limits.h>
|
30
|
+
#include <stdint.h>
|
31
|
+
#include <stdlib.h>
|
32
|
+
#include <string.h>
|
33
|
+
|
34
|
+
#include <sys/types.h>
|
35
|
+
|
36
|
+
#include "crypto_hash_sha256.h"
|
37
|
+
#include "private/common.h"
|
38
|
+
#include "utils.h"
|
39
|
+
|
40
|
+
static void
|
41
|
+
be32enc_vect(unsigned char *dst, const uint32_t *src, size_t len)
|
42
|
+
{
|
43
|
+
size_t i;
|
44
|
+
|
45
|
+
for (i = 0; i < len / 4; i++) {
|
46
|
+
STORE32_BE(dst + i * 4, src[i]);
|
47
|
+
}
|
48
|
+
}
|
49
|
+
|
50
|
+
static void
|
51
|
+
be32dec_vect(uint32_t *dst, const unsigned char *src, size_t len)
|
52
|
+
{
|
53
|
+
size_t i;
|
54
|
+
|
55
|
+
for (i = 0; i < len / 4; i++) {
|
56
|
+
dst[i] = LOAD32_BE(src + i * 4);
|
57
|
+
}
|
58
|
+
}
|
59
|
+
|
60
|
+
static const uint32_t Krnd[64] = {
|
61
|
+
0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1,
|
62
|
+
0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3,
|
63
|
+
0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786,
|
64
|
+
0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da,
|
65
|
+
0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147,
|
66
|
+
0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13,
|
67
|
+
0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b,
|
68
|
+
0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070,
|
69
|
+
0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a,
|
70
|
+
0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208,
|
71
|
+
0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2
|
72
|
+
};
|
73
|
+
|
74
|
+
#define Ch(x, y, z) ((x & (y ^ z)) ^ z)
|
75
|
+
#define Maj(x, y, z) ((x & (y | z)) | (y & z))
|
76
|
+
#define SHR(x, n) (x >> n)
|
77
|
+
#define ROTR(x, n) ROTR32(x, n)
|
78
|
+
#define S0(x) (ROTR(x, 2) ^ ROTR(x, 13) ^ ROTR(x, 22))
|
79
|
+
#define S1(x) (ROTR(x, 6) ^ ROTR(x, 11) ^ ROTR(x, 25))
|
80
|
+
#define s0(x) (ROTR(x, 7) ^ ROTR(x, 18) ^ SHR(x, 3))
|
81
|
+
#define s1(x) (ROTR(x, 17) ^ ROTR(x, 19) ^ SHR(x, 10))
|
82
|
+
|
83
|
+
#define RND(a, b, c, d, e, f, g, h, k) \
|
84
|
+
h += S1(e) + Ch(e, f, g) + k; \
|
85
|
+
d += h; \
|
86
|
+
h += S0(a) + Maj(a, b, c);
|
87
|
+
|
88
|
+
#define RNDr(S, W, i, ii) \
|
89
|
+
RND(S[(64 - i) % 8], S[(65 - i) % 8], S[(66 - i) % 8], S[(67 - i) % 8], \
|
90
|
+
S[(68 - i) % 8], S[(69 - i) % 8], S[(70 - i) % 8], S[(71 - i) % 8], \
|
91
|
+
W[i + ii] + Krnd[i + ii])
|
92
|
+
|
93
|
+
#define MSCH(W, ii, i) \
|
94
|
+
W[i + ii + 16] = \
|
95
|
+
s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i + ii + 1]) + W[i + ii]
|
96
|
+
|
97
|
+
static void
|
98
|
+
SHA256_Transform(uint32_t state[8], const uint8_t block[64], uint32_t W[64],
|
99
|
+
uint32_t S[8])
|
100
|
+
{
|
101
|
+
int i;
|
102
|
+
|
103
|
+
be32dec_vect(W, block, 64);
|
104
|
+
memcpy(S, state, 32);
|
105
|
+
for (i = 0; i < 64; i += 16) {
|
106
|
+
RNDr(S, W, 0, i);
|
107
|
+
RNDr(S, W, 1, i);
|
108
|
+
RNDr(S, W, 2, i);
|
109
|
+
RNDr(S, W, 3, i);
|
110
|
+
RNDr(S, W, 4, i);
|
111
|
+
RNDr(S, W, 5, i);
|
112
|
+
RNDr(S, W, 6, i);
|
113
|
+
RNDr(S, W, 7, i);
|
114
|
+
RNDr(S, W, 8, i);
|
115
|
+
RNDr(S, W, 9, i);
|
116
|
+
RNDr(S, W, 10, i);
|
117
|
+
RNDr(S, W, 11, i);
|
118
|
+
RNDr(S, W, 12, i);
|
119
|
+
RNDr(S, W, 13, i);
|
120
|
+
RNDr(S, W, 14, i);
|
121
|
+
RNDr(S, W, 15, i);
|
122
|
+
if (i == 48) {
|
123
|
+
break;
|
124
|
+
}
|
125
|
+
MSCH(W, 0, i);
|
126
|
+
MSCH(W, 1, i);
|
127
|
+
MSCH(W, 2, i);
|
128
|
+
MSCH(W, 3, i);
|
129
|
+
MSCH(W, 4, i);
|
130
|
+
MSCH(W, 5, i);
|
131
|
+
MSCH(W, 6, i);
|
132
|
+
MSCH(W, 7, i);
|
133
|
+
MSCH(W, 8, i);
|
134
|
+
MSCH(W, 9, i);
|
135
|
+
MSCH(W, 10, i);
|
136
|
+
MSCH(W, 11, i);
|
137
|
+
MSCH(W, 12, i);
|
138
|
+
MSCH(W, 13, i);
|
139
|
+
MSCH(W, 14, i);
|
140
|
+
MSCH(W, 15, i);
|
141
|
+
}
|
142
|
+
for (i = 0; i < 8; i++) {
|
143
|
+
state[i] += S[i];
|
144
|
+
}
|
145
|
+
}
|
146
|
+
|
147
|
+
static const uint8_t PAD[64] = { 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
148
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
149
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
150
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
151
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
|
152
|
+
|
153
|
+
static void
|
154
|
+
SHA256_Pad(crypto_hash_sha256_state *state, uint32_t tmp32[64 + 8])
|
155
|
+
{
|
156
|
+
uint64_t r;
|
157
|
+
uint64_t i;
|
158
|
+
|
159
|
+
r = (state->count >> 3) & 0x3f;
|
160
|
+
if (r < 56) {
|
161
|
+
for (i = 0; i < 56 - r; i++) {
|
162
|
+
state->buf[r + i] = PAD[i];
|
163
|
+
}
|
164
|
+
} else {
|
165
|
+
for (i = 0; i < 64 - r; i++) {
|
166
|
+
state->buf[r + i] = PAD[i];
|
167
|
+
}
|
168
|
+
SHA256_Transform(state->state, state->buf, &tmp32[0], &tmp32[64]);
|
169
|
+
memset(&state->buf[0], 0, 56);
|
170
|
+
}
|
171
|
+
STORE64_BE(&state->buf[56], state->count);
|
172
|
+
SHA256_Transform(state->state, state->buf, &tmp32[0], &tmp32[64]);
|
173
|
+
}
|
174
|
+
|
175
|
+
int
|
176
|
+
crypto_hash_sha256_init(crypto_hash_sha256_state *state)
|
177
|
+
{
|
178
|
+
static const uint32_t sha256_initial_state[8] = { 0x6a09e667, 0xbb67ae85,
|
179
|
+
0x3c6ef372, 0xa54ff53a,
|
180
|
+
0x510e527f, 0x9b05688c,
|
181
|
+
0x1f83d9ab, 0x5be0cd19 };
|
182
|
+
|
183
|
+
state->count = (uint64_t) 0U;
|
184
|
+
memcpy(state->state, sha256_initial_state, sizeof sha256_initial_state);
|
185
|
+
|
186
|
+
return 0;
|
187
|
+
}
|
188
|
+
|
189
|
+
int
|
190
|
+
crypto_hash_sha256_update(crypto_hash_sha256_state *state,
|
191
|
+
const unsigned char *in, unsigned long long inlen)
|
192
|
+
{
|
193
|
+
uint32_t tmp32[64 + 8];
|
194
|
+
unsigned long long i;
|
195
|
+
unsigned long long r;
|
196
|
+
|
197
|
+
if (inlen <= 0U) {
|
198
|
+
return 0;
|
199
|
+
}
|
200
|
+
r = (unsigned long long) ((state->count >> 3) & 0x3f);
|
201
|
+
|
202
|
+
state->count += ((uint64_t) inlen) << 3;
|
203
|
+
if (inlen < 64 - r) {
|
204
|
+
for (i = 0; i < inlen; i++) {
|
205
|
+
state->buf[r + i] = in[i];
|
206
|
+
}
|
207
|
+
return 0;
|
208
|
+
}
|
209
|
+
for (i = 0; i < 64 - r; i++) {
|
210
|
+
state->buf[r + i] = in[i];
|
211
|
+
}
|
212
|
+
SHA256_Transform(state->state, state->buf, &tmp32[0], &tmp32[64]);
|
213
|
+
in += 64 - r;
|
214
|
+
inlen -= 64 - r;
|
215
|
+
|
216
|
+
while (inlen >= 64) {
|
217
|
+
SHA256_Transform(state->state, in, &tmp32[0], &tmp32[64]);
|
218
|
+
in += 64;
|
219
|
+
inlen -= 64;
|
220
|
+
}
|
221
|
+
inlen &= 63;
|
222
|
+
for (i = 0; i < inlen; i++) {
|
223
|
+
state->buf[i] = in[i];
|
224
|
+
}
|
225
|
+
sodium_memzero((void *) tmp32, sizeof tmp32);
|
226
|
+
|
227
|
+
return 0;
|
228
|
+
}
|
229
|
+
|
230
|
+
int
|
231
|
+
crypto_hash_sha256_final(crypto_hash_sha256_state *state, unsigned char *out)
|
232
|
+
{
|
233
|
+
uint32_t tmp32[64 + 8];
|
234
|
+
|
235
|
+
SHA256_Pad(state, tmp32);
|
236
|
+
be32enc_vect(out, state->state, 32);
|
237
|
+
sodium_memzero((void *) tmp32, sizeof tmp32);
|
238
|
+
sodium_memzero((void *) state, sizeof *state);
|
239
|
+
|
240
|
+
return 0;
|
241
|
+
}
|
242
|
+
|
243
|
+
int
|
244
|
+
crypto_hash_sha256(unsigned char *out, const unsigned char *in,
|
245
|
+
unsigned long long inlen)
|
246
|
+
{
|
247
|
+
crypto_hash_sha256_state state;
|
248
|
+
|
249
|
+
crypto_hash_sha256_init(&state);
|
250
|
+
crypto_hash_sha256_update(&state, in, inlen);
|
251
|
+
crypto_hash_sha256_final(&state, out);
|
252
|
+
|
253
|
+
return 0;
|
254
|
+
}
|
@@ -1,11 +1,13 @@
|
|
1
1
|
#include "crypto_hash_sha256.h"
|
2
2
|
|
3
3
|
size_t
|
4
|
-
crypto_hash_sha256_bytes(void)
|
4
|
+
crypto_hash_sha256_bytes(void)
|
5
|
+
{
|
5
6
|
return crypto_hash_sha256_BYTES;
|
6
7
|
}
|
7
8
|
|
8
9
|
size_t
|
9
|
-
crypto_hash_sha256_statebytes(void)
|
10
|
+
crypto_hash_sha256_statebytes(void)
|
11
|
+
{
|
10
12
|
return sizeof(crypto_hash_sha256_state);
|
11
13
|
}
|
@@ -0,0 +1,280 @@
|
|
1
|
+
|
2
|
+
/*-
|
3
|
+
* Copyright 2005,2007,2009 Colin Percival
|
4
|
+
* All rights reserved.
|
5
|
+
*
|
6
|
+
* Redistribution and use in source and binary forms, with or without
|
7
|
+
* modification, are permitted provided that the following conditions
|
8
|
+
* are met:
|
9
|
+
* 1. Redistributions of source code must retain the above copyright
|
10
|
+
* notice, this list of conditions and the following disclaimer.
|
11
|
+
* 2. Redistributions in binary form must reproduce the above copyright
|
12
|
+
* notice, this list of conditions and the following disclaimer in the
|
13
|
+
* documentation and/or other materials provided with the distribution.
|
14
|
+
*
|
15
|
+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
16
|
+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
17
|
+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
18
|
+
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
19
|
+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
20
|
+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
21
|
+
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
22
|
+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
23
|
+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
24
|
+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
25
|
+
* SUCH DAMAGE.
|
26
|
+
*
|
27
|
+
*/
|
28
|
+
|
29
|
+
#include <limits.h>
|
30
|
+
#include <stdint.h>
|
31
|
+
#include <stdlib.h>
|
32
|
+
#include <string.h>
|
33
|
+
|
34
|
+
#include <sys/types.h>
|
35
|
+
|
36
|
+
#include "crypto_hash_sha512.h"
|
37
|
+
#include "private/common.h"
|
38
|
+
#include "utils.h"
|
39
|
+
|
40
|
+
static void
|
41
|
+
be64enc_vect(unsigned char *dst, const uint64_t *src, size_t len)
|
42
|
+
{
|
43
|
+
size_t i;
|
44
|
+
|
45
|
+
for (i = 0; i < len / 8; i++) {
|
46
|
+
STORE64_BE(dst + i * 8, src[i]);
|
47
|
+
}
|
48
|
+
}
|
49
|
+
|
50
|
+
static void
|
51
|
+
be64dec_vect(uint64_t *dst, const unsigned char *src, size_t len)
|
52
|
+
{
|
53
|
+
size_t i;
|
54
|
+
|
55
|
+
for (i = 0; i < len / 8; i++) {
|
56
|
+
dst[i] = LOAD64_BE(src + i * 8);
|
57
|
+
}
|
58
|
+
}
|
59
|
+
|
60
|
+
static const uint64_t Krnd[80] = {
|
61
|
+
0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
|
62
|
+
0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
|
63
|
+
0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
|
64
|
+
0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
|
65
|
+
0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
|
66
|
+
0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
|
67
|
+
0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL,
|
68
|
+
0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
|
69
|
+
0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
|
70
|
+
0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
|
71
|
+
0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL,
|
72
|
+
0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
|
73
|
+
0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL,
|
74
|
+
0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
|
75
|
+
0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
|
76
|
+
0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
|
77
|
+
0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL,
|
78
|
+
0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
|
79
|
+
0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL,
|
80
|
+
0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
|
81
|
+
0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
|
82
|
+
0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
|
83
|
+
0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL,
|
84
|
+
0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
|
85
|
+
0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
|
86
|
+
0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
|
87
|
+
0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL
|
88
|
+
};
|
89
|
+
|
90
|
+
#define Ch(x, y, z) ((x & (y ^ z)) ^ z)
|
91
|
+
#define Maj(x, y, z) ((x & (y | z)) | (y & z))
|
92
|
+
#define SHR(x, n) (x >> n)
|
93
|
+
#define ROTR(x, n) ROTR64(x, n)
|
94
|
+
#define S0(x) (ROTR(x, 28) ^ ROTR(x, 34) ^ ROTR(x, 39))
|
95
|
+
#define S1(x) (ROTR(x, 14) ^ ROTR(x, 18) ^ ROTR(x, 41))
|
96
|
+
#define s0(x) (ROTR(x, 1) ^ ROTR(x, 8) ^ SHR(x, 7))
|
97
|
+
#define s1(x) (ROTR(x, 19) ^ ROTR(x, 61) ^ SHR(x, 6))
|
98
|
+
|
99
|
+
#define RND(a, b, c, d, e, f, g, h, k) \
|
100
|
+
h += S1(e) + Ch(e, f, g) + k; \
|
101
|
+
d += h; \
|
102
|
+
h += S0(a) + Maj(a, b, c);
|
103
|
+
|
104
|
+
#define RNDr(S, W, i, ii) \
|
105
|
+
RND(S[(80 - i) % 8], S[(81 - i) % 8], S[(82 - i) % 8], S[(83 - i) % 8], \
|
106
|
+
S[(84 - i) % 8], S[(85 - i) % 8], S[(86 - i) % 8], S[(87 - i) % 8], \
|
107
|
+
W[i + ii] + Krnd[i + ii])
|
108
|
+
|
109
|
+
#define MSCH(W, ii, i) \
|
110
|
+
W[i + ii + 16] = \
|
111
|
+
s1(W[i + ii + 14]) + W[i + ii + 9] + s0(W[i + ii + 1]) + W[i + ii]
|
112
|
+
|
113
|
+
static void
|
114
|
+
SHA512_Transform(uint64_t *state, const uint8_t block[128], uint64_t W[80],
|
115
|
+
uint64_t S[8])
|
116
|
+
{
|
117
|
+
int i;
|
118
|
+
|
119
|
+
be64dec_vect(W, block, 128);
|
120
|
+
memcpy(S, state, 64);
|
121
|
+
for (i = 0; i < 80; i += 16) {
|
122
|
+
RNDr(S, W, 0, i);
|
123
|
+
RNDr(S, W, 1, i);
|
124
|
+
RNDr(S, W, 2, i);
|
125
|
+
RNDr(S, W, 3, i);
|
126
|
+
RNDr(S, W, 4, i);
|
127
|
+
RNDr(S, W, 5, i);
|
128
|
+
RNDr(S, W, 6, i);
|
129
|
+
RNDr(S, W, 7, i);
|
130
|
+
RNDr(S, W, 8, i);
|
131
|
+
RNDr(S, W, 9, i);
|
132
|
+
RNDr(S, W, 10, i);
|
133
|
+
RNDr(S, W, 11, i);
|
134
|
+
RNDr(S, W, 12, i);
|
135
|
+
RNDr(S, W, 13, i);
|
136
|
+
RNDr(S, W, 14, i);
|
137
|
+
RNDr(S, W, 15, i);
|
138
|
+
if (i == 64) {
|
139
|
+
break;
|
140
|
+
}
|
141
|
+
MSCH(W, 0, i);
|
142
|
+
MSCH(W, 1, i);
|
143
|
+
MSCH(W, 2, i);
|
144
|
+
MSCH(W, 3, i);
|
145
|
+
MSCH(W, 4, i);
|
146
|
+
MSCH(W, 5, i);
|
147
|
+
MSCH(W, 6, i);
|
148
|
+
MSCH(W, 7, i);
|
149
|
+
MSCH(W, 8, i);
|
150
|
+
MSCH(W, 9, i);
|
151
|
+
MSCH(W, 10, i);
|
152
|
+
MSCH(W, 11, i);
|
153
|
+
MSCH(W, 12, i);
|
154
|
+
MSCH(W, 13, i);
|
155
|
+
MSCH(W, 14, i);
|
156
|
+
MSCH(W, 15, i);
|
157
|
+
}
|
158
|
+
for (i = 0; i < 8; i++) {
|
159
|
+
state[i] += S[i];
|
160
|
+
}
|
161
|
+
}
|
162
|
+
|
163
|
+
static const uint8_t PAD[128] = {
|
164
|
+
0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
165
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
166
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
167
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
168
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
169
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
|
170
|
+
};
|
171
|
+
|
172
|
+
static void
|
173
|
+
SHA512_Pad(crypto_hash_sha512_state *state, uint64_t tmp64[80 + 8])
|
174
|
+
{
|
175
|
+
uint64_t r;
|
176
|
+
uint64_t i;
|
177
|
+
|
178
|
+
r = (state->count[1] >> 3) & 0x7f;
|
179
|
+
if (r < 112) {
|
180
|
+
for (i = 0; i < 112 - r; i++) {
|
181
|
+
state->buf[r + i] = PAD[i];
|
182
|
+
}
|
183
|
+
} else {
|
184
|
+
for (i = 0; i < 128 - r; i++) {
|
185
|
+
state->buf[r + i] = PAD[i];
|
186
|
+
}
|
187
|
+
SHA512_Transform(state->state, state->buf, &tmp64[0], &tmp64[80]);
|
188
|
+
memset(&state->buf[0], 0, 112);
|
189
|
+
}
|
190
|
+
be64enc_vect(&state->buf[112], state->count, 16);
|
191
|
+
SHA512_Transform(state->state, state->buf, &tmp64[0], &tmp64[80]);
|
192
|
+
}
|
193
|
+
|
194
|
+
int
|
195
|
+
crypto_hash_sha512_init(crypto_hash_sha512_state *state)
|
196
|
+
{
|
197
|
+
static const uint64_t sha512_initial_state[8] = {
|
198
|
+
0x6a09e667f3bcc908ULL, 0xbb67ae8584caa73bULL, 0x3c6ef372fe94f82bULL,
|
199
|
+
0xa54ff53a5f1d36f1ULL, 0x510e527fade682d1ULL, 0x9b05688c2b3e6c1fULL,
|
200
|
+
0x1f83d9abfb41bd6bULL, 0x5be0cd19137e2179ULL
|
201
|
+
};
|
202
|
+
|
203
|
+
state->count[0] = state->count[1] = (uint64_t) 0U;
|
204
|
+
memcpy(state->state, sha512_initial_state, sizeof sha512_initial_state);
|
205
|
+
|
206
|
+
return 0;
|
207
|
+
}
|
208
|
+
|
209
|
+
int
|
210
|
+
crypto_hash_sha512_update(crypto_hash_sha512_state *state,
|
211
|
+
const unsigned char *in, unsigned long long inlen)
|
212
|
+
{
|
213
|
+
uint64_t tmp64[80 + 8];
|
214
|
+
uint64_t bitlen[2];
|
215
|
+
unsigned long long i;
|
216
|
+
unsigned long long r;
|
217
|
+
|
218
|
+
if (inlen <= 0U) {
|
219
|
+
return 0;
|
220
|
+
}
|
221
|
+
r = (unsigned long long) ((state->count[1] >> 3) & 0x7f);
|
222
|
+
|
223
|
+
bitlen[1] = ((uint64_t) inlen) << 3;
|
224
|
+
bitlen[0] = ((uint64_t) inlen) >> 61;
|
225
|
+
if ((state->count[1] += bitlen[1]) < bitlen[1]) {
|
226
|
+
state->count[0]++;
|
227
|
+
}
|
228
|
+
state->count[0] += bitlen[0];
|
229
|
+
if (inlen < 128 - r) {
|
230
|
+
for (i = 0; i < inlen; i++) {
|
231
|
+
state->buf[r + i] = in[i];
|
232
|
+
}
|
233
|
+
return 0;
|
234
|
+
}
|
235
|
+
for (i = 0; i < 128 - r; i++) {
|
236
|
+
state->buf[r + i] = in[i];
|
237
|
+
}
|
238
|
+
SHA512_Transform(state->state, state->buf, &tmp64[0], &tmp64[80]);
|
239
|
+
in += 128 - r;
|
240
|
+
inlen -= 128 - r;
|
241
|
+
|
242
|
+
while (inlen >= 128) {
|
243
|
+
SHA512_Transform(state->state, in, &tmp64[0], &tmp64[80]);
|
244
|
+
in += 128;
|
245
|
+
inlen -= 128;
|
246
|
+
}
|
247
|
+
inlen &= 127;
|
248
|
+
for (i = 0; i < inlen; i++) {
|
249
|
+
state->buf[i] = in[i];
|
250
|
+
}
|
251
|
+
sodium_memzero((void *) tmp64, sizeof tmp64);
|
252
|
+
|
253
|
+
return 0;
|
254
|
+
}
|
255
|
+
|
256
|
+
int
|
257
|
+
crypto_hash_sha512_final(crypto_hash_sha512_state *state, unsigned char *out)
|
258
|
+
{
|
259
|
+
uint64_t tmp64[80 + 8];
|
260
|
+
|
261
|
+
SHA512_Pad(state, tmp64);
|
262
|
+
be64enc_vect(out, state->state, 64);
|
263
|
+
sodium_memzero((void *) tmp64, sizeof tmp64);
|
264
|
+
sodium_memzero((void *) state, sizeof *state);
|
265
|
+
|
266
|
+
return 0;
|
267
|
+
}
|
268
|
+
|
269
|
+
int
|
270
|
+
crypto_hash_sha512(unsigned char *out, const unsigned char *in,
|
271
|
+
unsigned long long inlen)
|
272
|
+
{
|
273
|
+
crypto_hash_sha512_state state;
|
274
|
+
|
275
|
+
crypto_hash_sha512_init(&state);
|
276
|
+
crypto_hash_sha512_update(&state, in, inlen);
|
277
|
+
crypto_hash_sha512_final(&state, out);
|
278
|
+
|
279
|
+
return 0;
|
280
|
+
}
|