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
@@ -22,7 +22,8 @@ int encode_string(char *dst, size_t dst_len, argon2_context *ctx,
|
|
22
22
|
|
23
23
|
/*
|
24
24
|
* Decodes an Argon2 hash string into the provided structure 'ctx'.
|
25
|
-
* The fields ctx.saltlen, ctx.adlen, ctx.outlen set the maximal salt, ad, out
|
25
|
+
* The fields ctx.saltlen, ctx.adlen, ctx.outlen set the maximal salt, ad, out
|
26
|
+
* length values
|
26
27
|
* that are allowed; invalid input string causes an error
|
27
28
|
*
|
28
29
|
* Returned value is ARGON2_OK on success.
|
@@ -0,0 +1,247 @@
|
|
1
|
+
/*
|
2
|
+
* Argon2 source code package
|
3
|
+
*
|
4
|
+
* Written by Daniel Dinu and Dmitry Khovratovich, 2015
|
5
|
+
*
|
6
|
+
* This work is licensed under a Creative Commons CC0 1.0 License/Waiver.
|
7
|
+
*
|
8
|
+
* You should have received a copy of the CC0 Public Domain Dedication along
|
9
|
+
* with
|
10
|
+
* this software. If not, see
|
11
|
+
* <http://creativecommons.org/publicdomain/zero/1.0/>.
|
12
|
+
*/
|
13
|
+
|
14
|
+
#include <stdint.h>
|
15
|
+
#include <stdlib.h>
|
16
|
+
#include <string.h>
|
17
|
+
|
18
|
+
#include "argon2-core.h"
|
19
|
+
#include "argon2.h"
|
20
|
+
#include "private/common.h"
|
21
|
+
#include "private/sse2_64_32.h"
|
22
|
+
|
23
|
+
#if defined(HAVE_AVX2INTRIN_H) && defined(HAVE_EMMINTRIN_H) && \
|
24
|
+
defined(HAVE_TMMINTRIN_H) && defined(HAVE_SMMINTRIN_H)
|
25
|
+
|
26
|
+
# ifdef __GNUC__
|
27
|
+
# pragma GCC target("sse2")
|
28
|
+
# pragma GCC target("ssse3")
|
29
|
+
# pragma GCC target("sse4.1")
|
30
|
+
# pragma GCC target("avx2")
|
31
|
+
# endif
|
32
|
+
|
33
|
+
# ifdef _MSC_VER
|
34
|
+
# include <intrin.h> /* for _mm_set_epi64x */
|
35
|
+
# endif
|
36
|
+
#include <emmintrin.h>
|
37
|
+
#include <immintrin.h>
|
38
|
+
#include <smmintrin.h>
|
39
|
+
#include <tmmintrin.h>
|
40
|
+
|
41
|
+
# include "blamka-round-avx2.h"
|
42
|
+
|
43
|
+
static void
|
44
|
+
fill_block(__m256i *state, const uint8_t *ref_block, uint8_t *next_block)
|
45
|
+
{
|
46
|
+
__m256i block_XY[ARGON2_HWORDS_IN_BLOCK];
|
47
|
+
uint32_t i;
|
48
|
+
|
49
|
+
for (i = 0; i < ARGON2_HWORDS_IN_BLOCK; i++) {
|
50
|
+
block_XY[i] = state[i] = _mm256_xor_si256(
|
51
|
+
state[i], _mm256_loadu_si256((__m256i const *) (&ref_block[32 * i])));
|
52
|
+
}
|
53
|
+
|
54
|
+
for (i = 0; i < 4; ++i) {
|
55
|
+
BLAKE2_ROUND_1(state[8 * i + 0], state[8 * i + 4], state[8 * i + 1], state[8 * i + 5],
|
56
|
+
state[8 * i + 2], state[8 * i + 6], state[8 * i + 3], state[8 * i + 7]);
|
57
|
+
}
|
58
|
+
|
59
|
+
for (i = 0; i < 4; ++i) {
|
60
|
+
BLAKE2_ROUND_2(state[ 0 + i], state[ 4 + i], state[ 8 + i], state[12 + i],
|
61
|
+
state[16 + i], state[20 + i], state[24 + i], state[28 + i]);
|
62
|
+
}
|
63
|
+
|
64
|
+
for (i = 0; i < ARGON2_HWORDS_IN_BLOCK; i++) {
|
65
|
+
state[i] = _mm256_xor_si256(state[i], block_XY[i]);
|
66
|
+
_mm256_storeu_si256((__m256i *) (&next_block[32 * i]), state[i]);
|
67
|
+
}
|
68
|
+
}
|
69
|
+
|
70
|
+
static void
|
71
|
+
fill_block_with_xor(__m256i *state, const uint8_t *ref_block,
|
72
|
+
uint8_t *next_block)
|
73
|
+
{
|
74
|
+
__m256i block_XY[ARGON2_HWORDS_IN_BLOCK];
|
75
|
+
uint32_t i;
|
76
|
+
|
77
|
+
for (i = 0; i < ARGON2_HWORDS_IN_BLOCK; i++) {
|
78
|
+
state[i] = _mm256_xor_si256(
|
79
|
+
state[i], _mm256_loadu_si256((__m256i const *) (&ref_block[32 * i])));
|
80
|
+
block_XY[i] = _mm256_xor_si256(
|
81
|
+
state[i], _mm256_loadu_si256((__m256i const *) (&next_block[32 * i])));
|
82
|
+
}
|
83
|
+
|
84
|
+
for (i = 0; i < 4; ++i) {
|
85
|
+
BLAKE2_ROUND_1(state[8 * i + 0], state[8 * i + 4], state[8 * i + 1], state[8 * i + 5],
|
86
|
+
state[8 * i + 2], state[8 * i + 6], state[8 * i + 3], state[8 * i + 7]);
|
87
|
+
}
|
88
|
+
|
89
|
+
for (i = 0; i < 4; ++i) {
|
90
|
+
BLAKE2_ROUND_2(state[ 0 + i], state[ 4 + i], state[ 8 + i], state[12 + i],
|
91
|
+
state[16 + i], state[20 + i], state[24 + i], state[28 + i]);
|
92
|
+
}
|
93
|
+
|
94
|
+
for (i = 0; i < ARGON2_HWORDS_IN_BLOCK; i++) {
|
95
|
+
state[i] = _mm256_xor_si256(state[i], block_XY[i]);
|
96
|
+
_mm256_storeu_si256((__m256i *) (&next_block[32 * i]), state[i]);
|
97
|
+
}
|
98
|
+
}
|
99
|
+
|
100
|
+
static void
|
101
|
+
generate_addresses(const argon2_instance_t *instance,
|
102
|
+
const argon2_position_t *position, uint64_t *pseudo_rands)
|
103
|
+
{
|
104
|
+
block address_block, input_block, tmp_block;
|
105
|
+
uint32_t i;
|
106
|
+
|
107
|
+
init_block_value(&address_block, 0);
|
108
|
+
init_block_value(&input_block, 0);
|
109
|
+
|
110
|
+
if (instance != NULL && position != NULL) {
|
111
|
+
input_block.v[0] = position->pass;
|
112
|
+
input_block.v[1] = position->lane;
|
113
|
+
input_block.v[2] = position->slice;
|
114
|
+
input_block.v[3] = instance->memory_blocks;
|
115
|
+
input_block.v[4] = instance->passes;
|
116
|
+
input_block.v[5] = instance->type;
|
117
|
+
|
118
|
+
for (i = 0; i < instance->segment_length; ++i) {
|
119
|
+
if (i % ARGON2_ADDRESSES_IN_BLOCK == 0) {
|
120
|
+
/* Temporary zero-initialized blocks */
|
121
|
+
__m256i zero_block[ARGON2_HWORDS_IN_BLOCK];
|
122
|
+
__m256i zero2_block[ARGON2_HWORDS_IN_BLOCK];
|
123
|
+
|
124
|
+
memset(zero_block, 0, sizeof(zero_block));
|
125
|
+
memset(zero2_block, 0, sizeof(zero2_block));
|
126
|
+
init_block_value(&address_block, 0);
|
127
|
+
init_block_value(&tmp_block, 0);
|
128
|
+
/* Increasing index counter */
|
129
|
+
input_block.v[6]++;
|
130
|
+
/* First iteration of G */
|
131
|
+
fill_block_with_xor(zero_block, (uint8_t *) &input_block.v,
|
132
|
+
(uint8_t *) &tmp_block.v);
|
133
|
+
/* Second iteration of G */
|
134
|
+
fill_block_with_xor(zero2_block, (uint8_t *) &tmp_block.v,
|
135
|
+
(uint8_t *) &address_block.v);
|
136
|
+
}
|
137
|
+
|
138
|
+
pseudo_rands[i] = address_block.v[i % ARGON2_ADDRESSES_IN_BLOCK];
|
139
|
+
}
|
140
|
+
}
|
141
|
+
}
|
142
|
+
|
143
|
+
int
|
144
|
+
fill_segment_avx2(const argon2_instance_t *instance,
|
145
|
+
argon2_position_t position)
|
146
|
+
{
|
147
|
+
block *ref_block = NULL, *curr_block = NULL;
|
148
|
+
uint64_t pseudo_rand, ref_index, ref_lane;
|
149
|
+
uint32_t prev_offset, curr_offset;
|
150
|
+
uint32_t starting_index, i;
|
151
|
+
__m256i state[32];
|
152
|
+
int data_independent_addressing = 1;
|
153
|
+
|
154
|
+
/* Pseudo-random values that determine the reference block position */
|
155
|
+
uint64_t *pseudo_rands = NULL;
|
156
|
+
|
157
|
+
if (instance == NULL) {
|
158
|
+
return ARGON2_OK;
|
159
|
+
}
|
160
|
+
|
161
|
+
if (instance->type == Argon2_id &&
|
162
|
+
(position.pass != 0 || position.slice >= ARGON2_SYNC_POINTS / 2)) {
|
163
|
+
data_independent_addressing = 0;
|
164
|
+
}
|
165
|
+
|
166
|
+
pseudo_rands =
|
167
|
+
(uint64_t *) malloc(sizeof(uint64_t) * instance->segment_length);
|
168
|
+
if (pseudo_rands == NULL) {
|
169
|
+
return ARGON2_MEMORY_ALLOCATION_ERROR;
|
170
|
+
}
|
171
|
+
|
172
|
+
if (data_independent_addressing) {
|
173
|
+
generate_addresses(instance, &position, pseudo_rands);
|
174
|
+
}
|
175
|
+
|
176
|
+
starting_index = 0;
|
177
|
+
|
178
|
+
if ((0 == position.pass) && (0 == position.slice)) {
|
179
|
+
starting_index = 2; /* we have already generated the first two blocks */
|
180
|
+
}
|
181
|
+
|
182
|
+
/* Offset of the current block */
|
183
|
+
curr_offset = position.lane * instance->lane_length +
|
184
|
+
position.slice * instance->segment_length + starting_index;
|
185
|
+
|
186
|
+
if (0 == curr_offset % instance->lane_length) {
|
187
|
+
/* Last block in this lane */
|
188
|
+
prev_offset = curr_offset + instance->lane_length - 1;
|
189
|
+
} else {
|
190
|
+
/* Previous block */
|
191
|
+
prev_offset = curr_offset - 1;
|
192
|
+
}
|
193
|
+
|
194
|
+
memcpy(state, ((instance->region->memory + prev_offset)->v),
|
195
|
+
ARGON2_BLOCK_SIZE);
|
196
|
+
|
197
|
+
for (i = starting_index; i < instance->segment_length;
|
198
|
+
++i, ++curr_offset, ++prev_offset) {
|
199
|
+
/*1.1 Rotating prev_offset if needed */
|
200
|
+
if (curr_offset % instance->lane_length == 1) {
|
201
|
+
prev_offset = curr_offset - 1;
|
202
|
+
}
|
203
|
+
|
204
|
+
/* 1.2 Computing the index of the reference block */
|
205
|
+
/* 1.2.1 Taking pseudo-random value from the previous block */
|
206
|
+
if (data_independent_addressing) {
|
207
|
+
#pragma warning(push)
|
208
|
+
#pragma warning(disable : 6385)
|
209
|
+
pseudo_rand = pseudo_rands[i];
|
210
|
+
#pragma warning(pop)
|
211
|
+
} else {
|
212
|
+
pseudo_rand = instance->region->memory[prev_offset].v[0];
|
213
|
+
}
|
214
|
+
|
215
|
+
/* 1.2.2 Computing the lane of the reference block */
|
216
|
+
ref_lane = ((pseudo_rand >> 32)) % instance->lanes;
|
217
|
+
|
218
|
+
if ((position.pass == 0) && (position.slice == 0)) {
|
219
|
+
/* Can not reference other lanes yet */
|
220
|
+
ref_lane = position.lane;
|
221
|
+
}
|
222
|
+
|
223
|
+
/* 1.2.3 Computing the number of possible reference block within the
|
224
|
+
* lane.
|
225
|
+
*/
|
226
|
+
position.index = i;
|
227
|
+
ref_index = index_alpha(instance, &position, pseudo_rand & 0xFFFFFFFF,
|
228
|
+
ref_lane == position.lane);
|
229
|
+
|
230
|
+
/* 2 Creating a new block */
|
231
|
+
ref_block = instance->region->memory +
|
232
|
+
instance->lane_length * ref_lane + ref_index;
|
233
|
+
curr_block = instance->region->memory + curr_offset;
|
234
|
+
if (position.pass != 0) {
|
235
|
+
fill_block_with_xor(state, (uint8_t *) ref_block->v,
|
236
|
+
(uint8_t *) curr_block->v);
|
237
|
+
} else {
|
238
|
+
fill_block(state, (uint8_t *) ref_block->v,
|
239
|
+
(uint8_t *) curr_block->v);
|
240
|
+
}
|
241
|
+
}
|
242
|
+
|
243
|
+
free(pseudo_rands);
|
244
|
+
|
245
|
+
return ARGON2_OK;
|
246
|
+
}
|
247
|
+
#endif
|
@@ -15,14 +15,15 @@
|
|
15
15
|
#include <stdlib.h>
|
16
16
|
#include <string.h>
|
17
17
|
|
18
|
-
#include "argon2.h"
|
19
18
|
#include "argon2-core.h"
|
20
|
-
#include "argon2
|
19
|
+
#include "argon2.h"
|
21
20
|
#include "blamka-round-ref.h"
|
21
|
+
#include "private/common.h"
|
22
22
|
|
23
|
-
static void
|
24
|
-
|
25
|
-
|
23
|
+
static void
|
24
|
+
fill_block(const block *prev_block, const block *ref_block, block *next_block)
|
25
|
+
{
|
26
|
+
block blockR, block_tmp;
|
26
27
|
unsigned i;
|
27
28
|
|
28
29
|
copy_block(&blockR, ref_block);
|
@@ -57,16 +58,20 @@ static void fill_block(const block *prev_block, const block *ref_block,
|
|
57
58
|
xor_block(next_block, &blockR);
|
58
59
|
}
|
59
60
|
|
60
|
-
static void
|
61
|
-
|
62
|
-
|
61
|
+
static void
|
62
|
+
fill_block_with_xor(const block *prev_block, const block *ref_block,
|
63
|
+
block *next_block)
|
64
|
+
{
|
65
|
+
block blockR, block_tmp;
|
63
66
|
unsigned i;
|
64
67
|
|
65
68
|
copy_block(&blockR, ref_block);
|
66
69
|
xor_block(&blockR, prev_block);
|
67
70
|
copy_block(&block_tmp, &blockR);
|
68
|
-
xor_block(&block_tmp,
|
69
|
-
|
71
|
+
xor_block(&block_tmp,
|
72
|
+
next_block); /* Saving the next block contents for XOR over */
|
73
|
+
/* Now blockR = ref_block + prev_block and bloc_tmp = ref_block + prev_block
|
74
|
+
* + next_block */
|
70
75
|
/* Apply Blake2 on columns of 64-bit words: (0,1,...,15) , then
|
71
76
|
(16,17,..31)... finally (112,113,...127) */
|
72
77
|
for (i = 0; i < 8; ++i) {
|
@@ -103,10 +108,11 @@ static void fill_block_with_xor(const block *prev_block, const block *ref_block,
|
|
103
108
|
* @param pseudo_rands Pointer to the array of 64-bit values
|
104
109
|
* @pre pseudo_rands must point to @a instance->segment_length allocated values
|
105
110
|
*/
|
106
|
-
static void
|
107
|
-
|
108
|
-
|
109
|
-
|
111
|
+
static void
|
112
|
+
generate_addresses(const argon2_instance_t *instance,
|
113
|
+
const argon2_position_t *position, uint64_t *pseudo_rands)
|
114
|
+
{
|
115
|
+
block zero_block, input_block, address_block, tmp_block;
|
110
116
|
uint32_t i;
|
111
117
|
|
112
118
|
init_block_value(&zero_block, 0);
|
@@ -134,23 +140,29 @@ static void generate_addresses(const argon2_instance_t *instance,
|
|
134
140
|
}
|
135
141
|
}
|
136
142
|
|
137
|
-
int
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
uint32_t prev_offset, curr_offset;
|
142
|
-
uint32_t starting_index;
|
143
|
-
uint32_t i;
|
144
|
-
const int data_independent_addressing = 1; /* instance->type == Argon2_i */
|
143
|
+
int
|
144
|
+
fill_segment_ref(const argon2_instance_t *instance, argon2_position_t position)
|
145
|
+
{
|
146
|
+
block *ref_block = NULL, *curr_block = NULL;
|
145
147
|
/* Pseudo-random values that determine the reference block position */
|
146
148
|
uint64_t *pseudo_rands = NULL;
|
149
|
+
uint64_t pseudo_rand, ref_index, ref_lane;
|
150
|
+
uint32_t prev_offset, curr_offset;
|
151
|
+
uint32_t starting_index;
|
152
|
+
uint32_t i;
|
153
|
+
int data_independent_addressing = 1;
|
147
154
|
|
148
155
|
if (instance == NULL) {
|
149
156
|
return ARGON2_OK;
|
150
157
|
}
|
151
158
|
|
159
|
+
if (instance->type == Argon2_id &&
|
160
|
+
(position.pass != 0 || position.slice >= ARGON2_SYNC_POINTS / 2)) {
|
161
|
+
data_independent_addressing = 0;
|
162
|
+
}
|
163
|
+
|
152
164
|
pseudo_rands =
|
153
|
-
(uint64_t *)malloc(sizeof(uint64_t) * (instance->segment_length));
|
165
|
+
(uint64_t *) malloc(sizeof(uint64_t) * (instance->segment_length));
|
154
166
|
|
155
167
|
if (pseudo_rands == NULL) {
|
156
168
|
return ARGON2_MEMORY_ALLOCATION_ERROR;
|
@@ -189,7 +201,7 @@ int fill_segment_ref(const argon2_instance_t *instance,
|
|
189
201
|
/* 1.2.1 Taking pseudo-random value from the previous block */
|
190
202
|
if (data_independent_addressing) {
|
191
203
|
#pragma warning(push)
|
192
|
-
#pragma warning(disable: 6385)
|
204
|
+
#pragma warning(disable : 6385)
|
193
205
|
pseudo_rand = pseudo_rands[i];
|
194
206
|
#pragma warning(pop)
|
195
207
|
} else {
|
@@ -212,13 +224,15 @@ int fill_segment_ref(const argon2_instance_t *instance,
|
|
212
224
|
ref_lane == position.lane);
|
213
225
|
|
214
226
|
/* 2 Creating a new block */
|
215
|
-
ref_block =
|
216
|
-
|
227
|
+
ref_block = instance->region->memory +
|
228
|
+
instance->lane_length * ref_lane + ref_index;
|
217
229
|
curr_block = instance->region->memory + curr_offset;
|
218
230
|
if (position.pass != 0) {
|
219
|
-
fill_block_with_xor(instance->region->memory + prev_offset,
|
231
|
+
fill_block_with_xor(instance->region->memory + prev_offset,
|
232
|
+
ref_block, curr_block);
|
220
233
|
} else {
|
221
|
-
fill_block(instance->region->memory + prev_offset, ref_block,
|
234
|
+
fill_block(instance->region->memory + prev_offset, ref_block,
|
235
|
+
curr_block);
|
222
236
|
}
|
223
237
|
}
|
224
238
|
|
@@ -226,4 +240,3 @@ int fill_segment_ref(const argon2_instance_t *instance,
|
|
226
240
|
|
227
241
|
return ARGON2_OK;
|
228
242
|
}
|
229
|
-
|
@@ -15,57 +15,67 @@
|
|
15
15
|
#include <stdlib.h>
|
16
16
|
#include <string.h>
|
17
17
|
|
18
|
-
#
|
19
|
-
|
18
|
+
#include "argon2-core.h"
|
19
|
+
#include "argon2.h"
|
20
|
+
#include "private/common.h"
|
21
|
+
#include "private/sse2_64_32.h"
|
20
22
|
|
21
|
-
#
|
22
|
-
#pragma GCC target("ssse3")
|
23
|
+
#if defined(HAVE_EMMINTRIN_H) && defined(HAVE_TMMINTRIN_H)
|
23
24
|
|
24
|
-
#ifdef
|
25
|
-
#
|
26
|
-
#
|
27
|
-
#
|
28
|
-
#include <tmmintrin.h>
|
25
|
+
# ifdef __GNUC__
|
26
|
+
# pragma GCC target("sse2")
|
27
|
+
# pragma GCC target("ssse3")
|
28
|
+
# endif
|
29
29
|
|
30
|
-
#
|
31
|
-
#include
|
32
|
-
#
|
33
|
-
#include
|
30
|
+
# ifdef _MSC_VER
|
31
|
+
# include <intrin.h> /* for _mm_set_epi64x */
|
32
|
+
# endif
|
33
|
+
# include <emmintrin.h>
|
34
|
+
# include <tmmintrin.h>
|
35
|
+
|
36
|
+
# include "blamka-round-ssse3.h"
|
34
37
|
|
35
|
-
static void
|
36
|
-
|
38
|
+
static void
|
39
|
+
fill_block(__m128i *state, const uint8_t *ref_block, uint8_t *next_block)
|
40
|
+
{
|
41
|
+
__m128i block_XY[ARGON2_OWORDS_IN_BLOCK];
|
37
42
|
uint32_t i;
|
38
43
|
|
39
44
|
for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) {
|
40
45
|
block_XY[i] = state[i] = _mm_xor_si128(
|
41
|
-
state[i], _mm_loadu_si128((__m128i const *)(&ref_block[16 * i])));
|
46
|
+
state[i], _mm_loadu_si128((__m128i const *) (&ref_block[16 * i])));
|
42
47
|
}
|
43
48
|
|
44
49
|
for (i = 0; i < 8; ++i) {
|
45
50
|
BLAKE2_ROUND(state[8 * i + 0], state[8 * i + 1], state[8 * i + 2],
|
46
|
-
|
47
|
-
|
51
|
+
state[8 * i + 3], state[8 * i + 4], state[8 * i + 5],
|
52
|
+
state[8 * i + 6], state[8 * i + 7]);
|
48
53
|
}
|
49
54
|
|
50
55
|
for (i = 0; i < 8; ++i) {
|
51
56
|
BLAKE2_ROUND(state[8 * 0 + i], state[8 * 1 + i], state[8 * 2 + i],
|
52
|
-
|
53
|
-
|
57
|
+
state[8 * 3 + i], state[8 * 4 + i], state[8 * 5 + i],
|
58
|
+
state[8 * 6 + i], state[8 * 7 + i]);
|
54
59
|
}
|
55
60
|
|
56
61
|
for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) {
|
57
62
|
state[i] = _mm_xor_si128(state[i], block_XY[i]);
|
58
|
-
_mm_storeu_si128((__m128i *)(&next_block[16 * i]), state[i]);
|
63
|
+
_mm_storeu_si128((__m128i *) (&next_block[16 * i]), state[i]);
|
59
64
|
}
|
60
65
|
}
|
61
66
|
|
62
|
-
static void
|
63
|
-
|
67
|
+
static void
|
68
|
+
fill_block_with_xor(__m128i *state, const uint8_t *ref_block,
|
69
|
+
uint8_t *next_block)
|
70
|
+
{
|
71
|
+
__m128i block_XY[ARGON2_OWORDS_IN_BLOCK];
|
64
72
|
uint32_t i;
|
65
73
|
|
66
74
|
for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) {
|
67
|
-
state[i] = _mm_xor_si128(
|
68
|
-
|
75
|
+
state[i] = _mm_xor_si128(
|
76
|
+
state[i], _mm_loadu_si128((__m128i const *) (&ref_block[16 * i])));
|
77
|
+
block_XY[i] = _mm_xor_si128(
|
78
|
+
state[i], _mm_loadu_si128((__m128i const *) (&next_block[16 * i])));
|
69
79
|
}
|
70
80
|
|
71
81
|
for (i = 0; i < 8; ++i) {
|
@@ -82,14 +92,15 @@ static void fill_block_with_xor(__m128i *state, const uint8_t *ref_block, uint8_
|
|
82
92
|
|
83
93
|
for (i = 0; i < ARGON2_OWORDS_IN_BLOCK; i++) {
|
84
94
|
state[i] = _mm_xor_si128(state[i], block_XY[i]);
|
85
|
-
_mm_storeu_si128((__m128i *)(&next_block[16 * i]), state[i]);
|
95
|
+
_mm_storeu_si128((__m128i *) (&next_block[16 * i]), state[i]);
|
86
96
|
}
|
87
97
|
}
|
88
98
|
|
89
|
-
static void
|
90
|
-
|
91
|
-
|
92
|
-
|
99
|
+
static void
|
100
|
+
generate_addresses(const argon2_instance_t *instance,
|
101
|
+
const argon2_position_t *position, uint64_t *pseudo_rands)
|
102
|
+
{
|
103
|
+
block address_block, input_block, tmp_block;
|
93
104
|
uint32_t i;
|
94
105
|
|
95
106
|
init_block_value(&address_block, 0);
|
@@ -108,6 +119,7 @@ static void generate_addresses(const argon2_instance_t *instance,
|
|
108
119
|
/* Temporary zero-initialized blocks */
|
109
120
|
__m128i zero_block[ARGON2_OWORDS_IN_BLOCK];
|
110
121
|
__m128i zero2_block[ARGON2_OWORDS_IN_BLOCK];
|
122
|
+
|
111
123
|
memset(zero_block, 0, sizeof(zero_block));
|
112
124
|
memset(zero2_block, 0, sizeof(zero2_block));
|
113
125
|
init_block_value(&address_block, 0);
|
@@ -115,9 +127,11 @@ static void generate_addresses(const argon2_instance_t *instance,
|
|
115
127
|
/* Increasing index counter */
|
116
128
|
input_block.v[6]++;
|
117
129
|
/* First iteration of G */
|
118
|
-
fill_block_with_xor(zero_block, (uint8_t *)&input_block.v,
|
130
|
+
fill_block_with_xor(zero_block, (uint8_t *) &input_block.v,
|
131
|
+
(uint8_t *) &tmp_block.v);
|
119
132
|
/* Second iteration of G */
|
120
|
-
fill_block_with_xor(zero2_block, (uint8_t *)&tmp_block.v,
|
133
|
+
fill_block_with_xor(zero2_block, (uint8_t *) &tmp_block.v,
|
134
|
+
(uint8_t *) &address_block.v);
|
121
135
|
}
|
122
136
|
|
123
137
|
pseudo_rands[i] = address_block.v[i % ARGON2_ADDRESSES_IN_BLOCK];
|
@@ -125,14 +139,16 @@ static void generate_addresses(const argon2_instance_t *instance,
|
|
125
139
|
}
|
126
140
|
}
|
127
141
|
|
128
|
-
int
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
142
|
+
int
|
143
|
+
fill_segment_ssse3(const argon2_instance_t *instance,
|
144
|
+
argon2_position_t position)
|
145
|
+
{
|
146
|
+
block *ref_block = NULL, *curr_block = NULL;
|
147
|
+
uint64_t pseudo_rand, ref_index, ref_lane;
|
148
|
+
uint32_t prev_offset, curr_offset;
|
149
|
+
uint32_t starting_index, i;
|
150
|
+
__m128i state[64];
|
151
|
+
int data_independent_addressing = 1;
|
136
152
|
|
137
153
|
/* Pseudo-random values that determine the reference block position */
|
138
154
|
uint64_t *pseudo_rands = NULL;
|
@@ -141,8 +157,13 @@ int fill_segment_ssse3(const argon2_instance_t *instance,
|
|
141
157
|
return ARGON2_OK;
|
142
158
|
}
|
143
159
|
|
160
|
+
if (instance->type == Argon2_id &&
|
161
|
+
(position.pass != 0 || position.slice >= ARGON2_SYNC_POINTS / 2)) {
|
162
|
+
data_independent_addressing = 0;
|
163
|
+
}
|
164
|
+
|
144
165
|
pseudo_rands =
|
145
|
-
(uint64_t *)malloc(sizeof(uint64_t) * instance->segment_length);
|
166
|
+
(uint64_t *) malloc(sizeof(uint64_t) * instance->segment_length);
|
146
167
|
if (pseudo_rands == NULL) {
|
147
168
|
return ARGON2_MEMORY_ALLOCATION_ERROR;
|
148
169
|
}
|
@@ -169,7 +190,8 @@ int fill_segment_ssse3(const argon2_instance_t *instance,
|
|
169
190
|
prev_offset = curr_offset - 1;
|
170
191
|
}
|
171
192
|
|
172
|
-
memcpy(state, ((instance->region->memory + prev_offset)->v),
|
193
|
+
memcpy(state, ((instance->region->memory + prev_offset)->v),
|
194
|
+
ARGON2_BLOCK_SIZE);
|
173
195
|
|
174
196
|
for (i = starting_index; i < instance->segment_length;
|
175
197
|
++i, ++curr_offset, ++prev_offset) {
|
@@ -182,7 +204,7 @@ int fill_segment_ssse3(const argon2_instance_t *instance,
|
|
182
204
|
/* 1.2.1 Taking pseudo-random value from the previous block */
|
183
205
|
if (data_independent_addressing) {
|
184
206
|
#pragma warning(push)
|
185
|
-
#pragma warning(disable: 6385)
|
207
|
+
#pragma warning(disable : 6385)
|
186
208
|
pseudo_rand = pseudo_rands[i];
|
187
209
|
#pragma warning(pop)
|
188
210
|
} else {
|
@@ -205,13 +227,15 @@ int fill_segment_ssse3(const argon2_instance_t *instance,
|
|
205
227
|
ref_lane == position.lane);
|
206
228
|
|
207
229
|
/* 2 Creating a new block */
|
208
|
-
ref_block =
|
209
|
-
|
230
|
+
ref_block = instance->region->memory +
|
231
|
+
instance->lane_length * ref_lane + ref_index;
|
210
232
|
curr_block = instance->region->memory + curr_offset;
|
211
233
|
if (position.pass != 0) {
|
212
|
-
fill_block_with_xor(state, (uint8_t *)ref_block->v,
|
234
|
+
fill_block_with_xor(state, (uint8_t *) ref_block->v,
|
235
|
+
(uint8_t *) curr_block->v);
|
213
236
|
} else {
|
214
|
-
fill_block(state, (uint8_t *)ref_block->v,
|
237
|
+
fill_block(state, (uint8_t *) ref_block->v,
|
238
|
+
(uint8_t *) curr_block->v);
|
215
239
|
}
|
216
240
|
}
|
217
241
|
|