rbnacl-libsodium 0.4.5 → 0.5.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/rbnacl/libsodium/version.rb +1 -1
- data/vendor/libsodium/AUTHORS +14 -9
- data/vendor/libsodium/ChangeLog +26 -0
- data/vendor/libsodium/LICENSE +1 -1
- data/vendor/libsodium/Makefile.am +1 -0
- data/vendor/libsodium/README.markdown +185 -46
- data/vendor/libsodium/THANKS +10 -0
- data/vendor/libsodium/builds/msvc/properties/Common.props +21 -0
- data/vendor/libsodium/builds/msvc/properties/DLL.props +16 -0
- data/vendor/libsodium/builds/msvc/properties/Debug.props +29 -0
- data/vendor/libsodium/builds/msvc/properties/DebugDEXE.props +21 -0
- data/vendor/libsodium/builds/msvc/properties/DebugDLL.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/DebugLEXE.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/DebugLIB.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/DebugLTCG.props +19 -0
- data/vendor/libsodium/builds/msvc/properties/DebugSEXE.props +21 -0
- data/vendor/libsodium/builds/msvc/properties/EXE.props +17 -0
- data/vendor/libsodium/builds/msvc/properties/LIB.props +16 -0
- data/vendor/libsodium/builds/msvc/properties/LTCG.props +13 -0
- data/vendor/libsodium/builds/msvc/properties/Link.props +21 -0
- data/vendor/libsodium/builds/msvc/properties/Messages.props +15 -0
- data/vendor/libsodium/builds/msvc/properties/Output.props +30 -0
- data/vendor/libsodium/builds/msvc/properties/Release.props +41 -0
- data/vendor/libsodium/builds/msvc/properties/ReleaseDEXE.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/ReleaseDLL.props +19 -0
- data/vendor/libsodium/builds/msvc/properties/ReleaseLEXE.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/ReleaseLIB.props +19 -0
- data/vendor/libsodium/builds/msvc/properties/ReleaseLTCG.props +19 -0
- data/vendor/libsodium/builds/msvc/properties/ReleaseSEXE.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/Win32.props +20 -0
- data/vendor/libsodium/builds/msvc/properties/x64.props +23 -0
- data/vendor/libsodium/builds/msvc/resource.h +0 -0
- data/vendor/libsodium/builds/msvc/resource.rc +0 -0
- data/vendor/libsodium/builds/msvc/version.h +29 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium.import.props +52 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium.import.xml +17 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium.sln +79 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.props +43 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj +345 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.vcxproj.filters +1037 -0
- data/vendor/libsodium/builds/msvc/vs2010/libsodium/libsodium.xml +15 -0
- data/vendor/libsodium/builds/msvc/vs2010/test/test.props +37 -0
- data/vendor/libsodium/builds/msvc/vs2010/test/test.runner.bat +78 -0
- data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj +220 -0
- data/vendor/libsodium/builds/msvc/vs2010/test/test.vcxproj.filters +168 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium.import.props +52 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium.import.xml +17 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium.sln +79 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.props +43 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj +345 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.vcxproj.filters +1037 -0
- data/vendor/libsodium/builds/msvc/vs2012/libsodium/libsodium.xml +15 -0
- data/vendor/libsodium/builds/msvc/vs2012/test/test.props +37 -0
- data/vendor/libsodium/builds/msvc/vs2012/test/test.runner.bat +78 -0
- data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj +220 -0
- data/vendor/libsodium/builds/msvc/vs2012/test/test.vcxproj.filters +168 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium.import.props +52 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium.import.xml +17 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium.sln +81 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.props +43 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj +345 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.vcxproj.filters +1037 -0
- data/vendor/libsodium/builds/msvc/vs2013/libsodium/libsodium.xml +15 -0
- data/vendor/libsodium/builds/msvc/vs2013/test/test.props +37 -0
- data/vendor/libsodium/builds/msvc/vs2013/test/test.runner.bat +78 -0
- data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj +220 -0
- data/vendor/libsodium/builds/msvc/vs2013/test/test.vcxproj.filters +168 -0
- data/vendor/libsodium/configure.ac +87 -68
- data/vendor/libsodium/dist-build/Makefile.am +10 -0
- data/vendor/libsodium/dist-build/android-arm.sh +3 -0
- data/vendor/libsodium/dist-build/android-armv7.sh +3 -0
- data/vendor/libsodium/dist-build/android-build.sh +37 -0
- data/vendor/libsodium/dist-build/android-mips.sh +3 -0
- data/vendor/libsodium/dist-build/android-x86.sh +3 -0
- data/vendor/libsodium/dist-build/emscripten.sh +13 -0
- data/vendor/libsodium/dist-build/{iphone.sh → ios.sh} +2 -2
- data/vendor/libsodium/dist-build/msys2-win32.sh +10 -0
- data/vendor/libsodium/dist-build/msys2-win64.sh +10 -0
- data/vendor/libsodium/libsodium.vcxproj +25 -13
- data/vendor/libsodium/libsodium.vcxproj.filters +60 -24
- data/vendor/libsodium/msvc-scripts/process.bat +3 -7
- data/vendor/libsodium/packaging/nuget/package.bat +13 -0
- data/vendor/libsodium/packaging/nuget/package.config +4 -0
- data/vendor/libsodium/packaging/nuget/package.gsl +255 -0
- data/vendor/libsodium/packaging/nuget/package.nuspec +93 -0
- data/vendor/libsodium/packaging/nuget/package.targets +128 -0
- data/vendor/libsodium/packaging/nuget/package.xml +22 -0
- data/vendor/libsodium/src/libsodium/Makefile.am +32 -20
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/auth_hmacsha256_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/{ref → cp}/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/cp/hmac_hmacsha256.c +110 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/{ref → cp}/verify_hmacsha256.c +0 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/auth_hmacsha512_api.c +11 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/api.h +9 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/hmac_hmacsha512.c +110 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512/cp/verify_hmacsha512.c +10 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/auth_hmacsha512256_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/{ref → cp}/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/cp/hmac_hmacsha512256.c +54 -0
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/{ref → cp}/verify_hmacsha512256.c +2 -1
- data/vendor/libsodium/src/libsodium/crypto_box/crypto_box_easy.c +94 -0
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/box_curve25519xsalsa20poly1305_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_box/curve25519xsalsa20poly1305/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/core_hsalsa20_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_core/hsalsa20/ref2/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_core/salsa20/core_salsa20_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_core/salsa20/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_core/salsa2012/core_salsa2012_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_core/salsa2012/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_core/salsa208/core_salsa208_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_core/salsa208/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/generichash_blake2_api.c +15 -5
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/api.h +0 -2
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2.h +14 -6
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/blake2b-ref.c +95 -0
- data/vendor/libsodium/src/libsodium/crypto_generichash/blake2/ref/generichash_blake2b.c +50 -3
- data/vendor/libsodium/src/libsodium/crypto_generichash/crypto_generichash.c +4 -10
- data/vendor/libsodium/src/libsodium/crypto_hash/crypto_hash.c +11 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/{ref → cp}/api.h +3 -1
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/cp/hash_sha256.c +294 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/hash_sha256_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/{ref → cp}/api.h +3 -1
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/cp/hash_sha512.c +321 -0
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/hash_sha512_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/auth_poly1305_donna.c +51 -127
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna.h +12 -0
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna32.h +221 -0
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/poly1305_donna64.h +209 -0
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/onetimeauth_poly1305_try.c +1 -140
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/crypto_scrypt-common.c +250 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/crypto_scrypt.h +100 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/nosse/pwhash_scryptxsalsa208sha256_nosse.c +302 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/pbkdf2-sha256.c +94 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/pbkdf2-sha256.h +45 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/pwhash_scryptxsalsa208sha256.c +172 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/scrypt_platform.c +96 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/sse/pwhash_scryptxsalsa208sha256_sse.c +391 -0
- data/vendor/libsodium/src/libsodium/crypto_pwhash/scryptxsalsa208sha256/sysendian.h +146 -0
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/api.h +2 -2
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/donna_c64/smult_curve25519_donna_c64.c +39 -9
- data/vendor/libsodium/src/libsodium/crypto_scalarmult/curve25519/ref/api.h +2 -2
- data/vendor/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox.c +6 -0
- data/vendor/libsodium/src/libsodium/crypto_secretbox/crypto_secretbox_easy.c +94 -0
- data/vendor/libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_secretbox/xsalsa20poly1305/secretbox_xsalsa20poly1305_api.c +3 -3
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_shorthash/siphash24/shorthash_siphash24_api.c +3 -3
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/ge_scalarmult_base.c +6 -0
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/keypair.c +5 -3
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/open.c +28 -18
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/ref10/sign.c +14 -9
- data/vendor/libsodium/src/libsodium/crypto_sign/ed25519/sign_ed25519_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_sign/edwards25519sha512batch/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_sign/edwards25519sha512batch/sign_edwards25519sha512batch_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/afternm_aes128ctr.c +21 -21
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/int128.h +6 -0
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/portable/xor_afternm_aes128ctr.c +42 -42
- data/vendor/libsodium/src/libsodium/crypto_stream/aes128ctr/stream_aes128ctr_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-be.h +4 -4
- data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes-table-le.h +4 -4
- data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/aes256-ctr.c +15 -14
- data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/hongjun/ecrypt-sync.h +1 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/aes256estream/stream_aes256estream_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/amd64_xmm6/stream_salsa20_amd64_xmm6.S +153 -160
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/api.h +2 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/stream_salsa20_ref.c +9 -3
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/ref/xor_salsa20_ref.c +9 -3
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa20/stream_salsa20_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa2012/stream_salsa2012_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/salsa208/stream_salsa208_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/ref/api.h +0 -1
- data/vendor/libsodium/src/libsodium/crypto_stream/xsalsa20/stream_xsalsa20_api.c +0 -5
- data/vendor/libsodium/src/libsodium/crypto_verify/64/ref/api.h +2 -0
- data/vendor/libsodium/src/libsodium/crypto_verify/64/ref/verify_64.c +72 -0
- data/vendor/libsodium/src/libsodium/crypto_verify/64/verify_64_api.c +6 -0
- data/vendor/libsodium/src/libsodium/include/Makefile.am +6 -7
- data/vendor/libsodium/src/libsodium/include/sodium.h +4 -3
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha256.h +31 -9
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512.h +58 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_auth_hmacsha512256.h +26 -9
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_box.h +13 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_box_curve25519xsalsa20poly1305.h +38 -24
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_core_hsalsa20.h +6 -11
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_core_salsa20.h +6 -11
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_core_salsa2012.h +6 -11
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_core_salsa208.h +6 -11
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash.h +7 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_generichash_blake2b.h +36 -16
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash.h +13 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha256.h +25 -7
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hash_sha512.h +25 -7
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305.h +5 -5
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_donna.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_pwhash_scryptxsalsa208sha256.h +48 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h +31 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox.h +17 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_secretbox_xsalsa20poly1305.h +21 -11
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_shorthash.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_shorthash_siphash24.h +8 -7
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_ed25519.h +16 -17
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_sign_edwards25519sha512batch.h +18 -14
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_aes128ctr.h +18 -18
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_aes256estream.h +19 -18
- data/vendor/libsodium/src/libsodium/include/sodium/{crypto_stream_salsa20.h.in → crypto_stream_salsa20.h} +8 -19
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa2012.h +8 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_salsa208.h +8 -8
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_stream_xsalsa20.h +10 -11
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_verify_16.h +1 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_verify_32.h +1 -4
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_verify_64.h +22 -0
- data/vendor/libsodium/src/libsodium/include/sodium/randombytes.h +3 -0
- data/vendor/libsodium/src/libsodium/include/sodium/runtime.h +27 -0
- data/vendor/libsodium/src/libsodium/include/sodium/utils.h +15 -3
- data/vendor/libsodium/src/libsodium/randombytes/randombytes.c +3 -1
- data/vendor/libsodium/src/libsodium/randombytes/salsa20/randombytes_salsa20_random.c +18 -7
- data/vendor/libsodium/src/libsodium/randombytes/sysrandom/randombytes_sysrandom.c +57 -9
- data/vendor/libsodium/src/libsodium/sodium/compat.c +62 -0
- data/vendor/libsodium/src/libsodium/sodium/core.c +2 -0
- data/vendor/libsodium/src/libsodium/sodium/runtime.c +134 -0
- data/vendor/libsodium/src/libsodium/sodium/utils.c +100 -8
- data/vendor/libsodium/test/default/Makefile.am +63 -3
- data/vendor/libsodium/test/default/auth6.c +21 -0
- data/vendor/libsodium/test/default/auth6.exp +8 -0
- data/vendor/libsodium/test/default/auth7.c +37 -0
- data/vendor/libsodium/test/default/auth7.exp +0 -0
- data/vendor/libsodium/test/default/box_easy.c +59 -0
- data/vendor/libsodium/test/default/box_easy.exp +19 -0
- data/vendor/libsodium/test/default/box_easy2.c +31 -0
- data/vendor/libsodium/test/default/box_easy2.exp +1 -0
- data/vendor/libsodium/test/default/cmptest.h +7 -1
- data/vendor/libsodium/test/default/generichash3.c +36 -0
- data/vendor/libsodium/test/default/generichash3.exp +64 -0
- data/vendor/libsodium/test/default/pwhash.c +59 -0
- data/vendor/libsodium/test/default/pwhash.exp +2 -0
- data/vendor/libsodium/test/default/scalarmult7.c +0 -2
- data/vendor/libsodium/test/default/scalarmult8.c +0 -2
- data/vendor/libsodium/test/default/secretbox_easy.c +51 -0
- data/vendor/libsodium/test/default/secretbox_easy.exp +19 -0
- data/vendor/libsodium/test/default/secretbox_easy2.c +27 -0
- data/vendor/libsodium/test/default/secretbox_easy2.exp +1 -0
- data/vendor/libsodium/test/default/sign.c +1106 -0
- data/vendor/libsodium/test/default/sign.exp +3 -0
- data/vendor/libsodium/test/default/sodium_utils.c +8 -0
- data/vendor/libsodium/test/default/sodium_utils.exp +2 -1
- data/vendor/libsodium/test/default/sodium_version.c +1 -1
- data/vendor/libsodium/test/default/verify1.c +34 -0
- data/vendor/libsodium/test/default/verify1.exp +6 -0
- metadata +138 -33
- data/vendor/libsodium/dist-build/android.sh +0 -48
- data/vendor/libsodium/dist-build/msys.sh +0 -9
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha256/ref/hmac_hmacsha256.c +0 -83
- data/vendor/libsodium/src/libsodium/crypto_auth/hmacsha512256/ref/hmac_hmacsha512256.c +0 -86
- data/vendor/libsodium/src/libsodium/crypto_hash/sha256/ref/hash_sha256.c +0 -69
- data/vendor/libsodium/src/libsodium/crypto_hash/sha512/ref/hash_sha512.c +0 -71
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha256/checksum +0 -1
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha256/hashblocks_sha256_api.c +0 -16
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha256/ref/api.h +0 -9
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha256/ref/blocks_sha256.c +0 -212
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha512/checksum +0 -1
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha512/hashblocks_sha512_api.c +0 -16
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha512/ref/api.h +0 -9
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/sha512/ref/blocks_sha512.c +0 -239
- data/vendor/libsodium/src/libsodium/crypto_hashblocks/try.c +0 -78
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/53/api.h +0 -8
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/53/auth_poly1305_53.c +0 -1661
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/53/verify_poly1305_53.c +0 -10
- data/vendor/libsodium/src/libsodium/crypto_onetimeauth/poly1305/donna/portable-jane.h +0 -772
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hashblocks_sha256.h +0 -32
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_hashblocks_sha512.h +0 -32
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_onetimeauth_poly1305_53.h +0 -34
- data/vendor/libsodium/src/libsodium/include/sodium/crypto_scalarmult_curve25519.h.in +0 -44
@@ -0,0 +1,96 @@
|
|
1
|
+
/*-
|
2
|
+
* Copyright 2013 Alexander Peslyak
|
3
|
+
* All rights reserved.
|
4
|
+
*
|
5
|
+
* Redistribution and use in source and binary forms, with or without
|
6
|
+
* modification, are permitted.
|
7
|
+
*
|
8
|
+
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
|
9
|
+
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
|
10
|
+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
|
11
|
+
* ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
|
12
|
+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
13
|
+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
|
14
|
+
* OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
|
15
|
+
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
|
16
|
+
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
|
17
|
+
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
|
18
|
+
* SUCH DAMAGE.
|
19
|
+
*/
|
20
|
+
|
21
|
+
#ifdef HAVE_SYS_MMAN_H
|
22
|
+
# include <sys/mman.h>
|
23
|
+
#endif
|
24
|
+
#include <errno.h>
|
25
|
+
#include <stdlib.h>
|
26
|
+
|
27
|
+
#include "crypto_scrypt.h"
|
28
|
+
#include "runtime.h"
|
29
|
+
|
30
|
+
void *
|
31
|
+
alloc_region(escrypt_region_t * region, size_t size)
|
32
|
+
{
|
33
|
+
uint8_t * base, * aligned;
|
34
|
+
#ifdef MAP_ANON
|
35
|
+
if ((base = (uint8_t *) mmap(NULL, size, PROT_READ | PROT_WRITE,
|
36
|
+
#ifdef MAP_NOCORE
|
37
|
+
MAP_ANON | MAP_PRIVATE | MAP_NOCORE,
|
38
|
+
#else
|
39
|
+
MAP_ANON | MAP_PRIVATE,
|
40
|
+
#endif
|
41
|
+
-1, 0)) == MAP_FAILED)
|
42
|
+
base = NULL;
|
43
|
+
aligned = base;
|
44
|
+
#elif defined(HAVE_POSIX_MEMALIGN)
|
45
|
+
if ((errno = posix_memalign((void **) &base, 64, size)) != 0)
|
46
|
+
base = NULL;
|
47
|
+
aligned = base;
|
48
|
+
#else
|
49
|
+
base = aligned = NULL;
|
50
|
+
if (size + 63 < size)
|
51
|
+
errno = ENOMEM;
|
52
|
+
else if ((base = (uint8_t *) malloc(size + 63)) != NULL) {
|
53
|
+
aligned = base + 63;
|
54
|
+
aligned -= (uintptr_t)aligned & 63;
|
55
|
+
}
|
56
|
+
#endif
|
57
|
+
region->base = base;
|
58
|
+
region->aligned = aligned;
|
59
|
+
region->size = base ? size : 0;
|
60
|
+
return aligned;
|
61
|
+
}
|
62
|
+
|
63
|
+
static inline void
|
64
|
+
init_region(escrypt_region_t * region)
|
65
|
+
{
|
66
|
+
region->base = region->aligned = NULL;
|
67
|
+
region->size = 0;
|
68
|
+
}
|
69
|
+
|
70
|
+
int
|
71
|
+
free_region(escrypt_region_t * region)
|
72
|
+
{
|
73
|
+
if (region->base) {
|
74
|
+
#ifdef MAP_ANON
|
75
|
+
if (munmap(region->base, region->size))
|
76
|
+
return -1;
|
77
|
+
#else
|
78
|
+
free(region->base);
|
79
|
+
#endif
|
80
|
+
}
|
81
|
+
init_region(region);
|
82
|
+
return 0;
|
83
|
+
}
|
84
|
+
|
85
|
+
int
|
86
|
+
escrypt_init_local(escrypt_local_t * local)
|
87
|
+
{
|
88
|
+
init_region(local);
|
89
|
+
return 0;
|
90
|
+
}
|
91
|
+
|
92
|
+
int
|
93
|
+
escrypt_free_local(escrypt_local_t * local)
|
94
|
+
{
|
95
|
+
return free_region(local);
|
96
|
+
}
|
@@ -0,0 +1,391 @@
|
|
1
|
+
/*-
|
2
|
+
* Copyright 2009 Colin Percival
|
3
|
+
* Copyright 2012,2013 Alexander Peslyak
|
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
|
+
* This file was originally written by Colin Percival as part of the Tarsnap
|
28
|
+
* online backup system.
|
29
|
+
*/
|
30
|
+
|
31
|
+
#if defined(HAVE_EMMINTRIN_H) || defined(_MSC_VER)
|
32
|
+
#if __GNUC__
|
33
|
+
# pragma GCC target("sse2")
|
34
|
+
#endif
|
35
|
+
#include <emmintrin.h>
|
36
|
+
#if defined(__XOP__) && defined(DISABLED)
|
37
|
+
# include <x86intrin.h>
|
38
|
+
#endif
|
39
|
+
|
40
|
+
#include <errno.h>
|
41
|
+
#include <limits.h>
|
42
|
+
#include <stdint.h>
|
43
|
+
#include <stdlib.h>
|
44
|
+
#include <string.h>
|
45
|
+
|
46
|
+
#include "../pbkdf2-sha256.h"
|
47
|
+
#include "../sysendian.h"
|
48
|
+
#include "../crypto_scrypt.h"
|
49
|
+
|
50
|
+
#if defined(__XOP__) && defined(DISABLED)
|
51
|
+
#define ARX(out, in1, in2, s) \
|
52
|
+
out = _mm_xor_si128(out, _mm_roti_epi32(_mm_add_epi32(in1, in2), s));
|
53
|
+
#else
|
54
|
+
#define ARX(out, in1, in2, s) \
|
55
|
+
{ \
|
56
|
+
__m128i T = _mm_add_epi32(in1, in2); \
|
57
|
+
out = _mm_xor_si128(out, _mm_slli_epi32(T, s)); \
|
58
|
+
out = _mm_xor_si128(out, _mm_srli_epi32(T, 32-s)); \
|
59
|
+
}
|
60
|
+
#endif
|
61
|
+
|
62
|
+
#define SALSA20_2ROUNDS \
|
63
|
+
/* Operate on "columns". */ \
|
64
|
+
ARX(X1, X0, X3, 7) \
|
65
|
+
ARX(X2, X1, X0, 9) \
|
66
|
+
ARX(X3, X2, X1, 13) \
|
67
|
+
ARX(X0, X3, X2, 18) \
|
68
|
+
\
|
69
|
+
/* Rearrange data. */ \
|
70
|
+
X1 = _mm_shuffle_epi32(X1, 0x93); \
|
71
|
+
X2 = _mm_shuffle_epi32(X2, 0x4E); \
|
72
|
+
X3 = _mm_shuffle_epi32(X3, 0x39); \
|
73
|
+
\
|
74
|
+
/* Operate on "rows". */ \
|
75
|
+
ARX(X3, X0, X1, 7) \
|
76
|
+
ARX(X2, X3, X0, 9) \
|
77
|
+
ARX(X1, X2, X3, 13) \
|
78
|
+
ARX(X0, X1, X2, 18) \
|
79
|
+
\
|
80
|
+
/* Rearrange data. */ \
|
81
|
+
X1 = _mm_shuffle_epi32(X1, 0x39); \
|
82
|
+
X2 = _mm_shuffle_epi32(X2, 0x4E); \
|
83
|
+
X3 = _mm_shuffle_epi32(X3, 0x93);
|
84
|
+
|
85
|
+
/**
|
86
|
+
* Apply the salsa20/8 core to the block provided in (X0 ... X3) ^ (Z0 ... Z3).
|
87
|
+
*/
|
88
|
+
#define SALSA20_8_XOR(in, out) \
|
89
|
+
{ \
|
90
|
+
__m128i Y0 = X0 = _mm_xor_si128(X0, (in)[0]); \
|
91
|
+
__m128i Y1 = X1 = _mm_xor_si128(X1, (in)[1]); \
|
92
|
+
__m128i Y2 = X2 = _mm_xor_si128(X2, (in)[2]); \
|
93
|
+
__m128i Y3 = X3 = _mm_xor_si128(X3, (in)[3]); \
|
94
|
+
SALSA20_2ROUNDS \
|
95
|
+
SALSA20_2ROUNDS \
|
96
|
+
SALSA20_2ROUNDS \
|
97
|
+
SALSA20_2ROUNDS \
|
98
|
+
(out)[0] = X0 = _mm_add_epi32(X0, Y0); \
|
99
|
+
(out)[1] = X1 = _mm_add_epi32(X1, Y1); \
|
100
|
+
(out)[2] = X2 = _mm_add_epi32(X2, Y2); \
|
101
|
+
(out)[3] = X3 = _mm_add_epi32(X3, Y3); \
|
102
|
+
}
|
103
|
+
|
104
|
+
/**
|
105
|
+
* blockmix_salsa8(Bin, Bout, r):
|
106
|
+
* Compute Bout = BlockMix_{salsa20/8, r}(Bin). The input Bin must be 128r
|
107
|
+
* bytes in length; the output Bout must also be the same size.
|
108
|
+
*/
|
109
|
+
static inline void
|
110
|
+
blockmix_salsa8(const __m128i * Bin, __m128i * Bout, size_t r)
|
111
|
+
{
|
112
|
+
__m128i X0, X1, X2, X3;
|
113
|
+
size_t i;
|
114
|
+
|
115
|
+
/* 1: X <-- B_{2r - 1} */
|
116
|
+
X0 = Bin[8 * r - 4];
|
117
|
+
X1 = Bin[8 * r - 3];
|
118
|
+
X2 = Bin[8 * r - 2];
|
119
|
+
X3 = Bin[8 * r - 1];
|
120
|
+
|
121
|
+
/* 3: X <-- H(X \xor B_i) */
|
122
|
+
/* 4: Y_i <-- X */
|
123
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
124
|
+
SALSA20_8_XOR(Bin, Bout)
|
125
|
+
|
126
|
+
/* 2: for i = 0 to 2r - 1 do */
|
127
|
+
r--;
|
128
|
+
for (i = 0; i < r;) {
|
129
|
+
/* 3: X <-- H(X \xor B_i) */
|
130
|
+
/* 4: Y_i <-- X */
|
131
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
132
|
+
SALSA20_8_XOR(&Bin[i * 8 + 4], &Bout[(r + i) * 4 + 4])
|
133
|
+
|
134
|
+
i++;
|
135
|
+
|
136
|
+
/* 3: X <-- H(X \xor B_i) */
|
137
|
+
/* 4: Y_i <-- X */
|
138
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
139
|
+
SALSA20_8_XOR(&Bin[i * 8], &Bout[i * 4])
|
140
|
+
}
|
141
|
+
|
142
|
+
/* 3: X <-- H(X \xor B_i) */
|
143
|
+
/* 4: Y_i <-- X */
|
144
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
145
|
+
SALSA20_8_XOR(&Bin[i * 8 + 4], &Bout[(r + i) * 4 + 4])
|
146
|
+
}
|
147
|
+
|
148
|
+
#define XOR4(in) \
|
149
|
+
X0 = _mm_xor_si128(X0, (in)[0]); \
|
150
|
+
X1 = _mm_xor_si128(X1, (in)[1]); \
|
151
|
+
X2 = _mm_xor_si128(X2, (in)[2]); \
|
152
|
+
X3 = _mm_xor_si128(X3, (in)[3]);
|
153
|
+
|
154
|
+
#define XOR4_2(in1, in2) \
|
155
|
+
X0 = _mm_xor_si128((in1)[0], (in2)[0]); \
|
156
|
+
X1 = _mm_xor_si128((in1)[1], (in2)[1]); \
|
157
|
+
X2 = _mm_xor_si128((in1)[2], (in2)[2]); \
|
158
|
+
X3 = _mm_xor_si128((in1)[3], (in2)[3]);
|
159
|
+
|
160
|
+
static inline uint32_t
|
161
|
+
blockmix_salsa8_xor(const __m128i * Bin1, const __m128i * Bin2, __m128i * Bout,
|
162
|
+
size_t r)
|
163
|
+
{
|
164
|
+
__m128i X0, X1, X2, X3;
|
165
|
+
size_t i;
|
166
|
+
|
167
|
+
/* 1: X <-- B_{2r - 1} */
|
168
|
+
XOR4_2(&Bin1[8 * r - 4], &Bin2[8 * r - 4])
|
169
|
+
|
170
|
+
/* 3: X <-- H(X \xor B_i) */
|
171
|
+
/* 4: Y_i <-- X */
|
172
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
173
|
+
XOR4(Bin1)
|
174
|
+
SALSA20_8_XOR(Bin2, Bout)
|
175
|
+
|
176
|
+
/* 2: for i = 0 to 2r - 1 do */
|
177
|
+
r--;
|
178
|
+
for (i = 0; i < r;) {
|
179
|
+
/* 3: X <-- H(X \xor B_i) */
|
180
|
+
/* 4: Y_i <-- X */
|
181
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
182
|
+
XOR4(&Bin1[i * 8 + 4])
|
183
|
+
SALSA20_8_XOR(&Bin2[i * 8 + 4], &Bout[(r + i) * 4 + 4])
|
184
|
+
|
185
|
+
i++;
|
186
|
+
|
187
|
+
/* 3: X <-- H(X \xor B_i) */
|
188
|
+
/* 4: Y_i <-- X */
|
189
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
190
|
+
XOR4(&Bin1[i * 8])
|
191
|
+
SALSA20_8_XOR(&Bin2[i * 8], &Bout[i * 4])
|
192
|
+
}
|
193
|
+
|
194
|
+
/* 3: X <-- H(X \xor B_i) */
|
195
|
+
/* 4: Y_i <-- X */
|
196
|
+
/* 6: B' <-- (Y_0, Y_2 ... Y_{2r-2}, Y_1, Y_3 ... Y_{2r-1}) */
|
197
|
+
XOR4(&Bin1[i * 8 + 4])
|
198
|
+
SALSA20_8_XOR(&Bin2[i * 8 + 4], &Bout[(r + i) * 4 + 4])
|
199
|
+
|
200
|
+
return _mm_cvtsi128_si32(X0);
|
201
|
+
}
|
202
|
+
|
203
|
+
#undef ARX
|
204
|
+
#undef SALSA20_2ROUNDS
|
205
|
+
#undef SALSA20_8_XOR
|
206
|
+
#undef XOR4
|
207
|
+
#undef XOR4_2
|
208
|
+
|
209
|
+
/**
|
210
|
+
* integerify(B, r):
|
211
|
+
* Return the result of parsing B_{2r-1} as a little-endian integer.
|
212
|
+
*/
|
213
|
+
static inline uint32_t
|
214
|
+
integerify(const void * B, size_t r)
|
215
|
+
{
|
216
|
+
return *(const uint32_t *)((uintptr_t)(B) + (2 * r - 1) * 64);
|
217
|
+
}
|
218
|
+
|
219
|
+
/**
|
220
|
+
* smix(B, r, N, V, XY):
|
221
|
+
* Compute B = SMix_r(B, N). The input B must be 128r bytes in length;
|
222
|
+
* the temporary storage V must be 128rN bytes in length; the temporary
|
223
|
+
* storage XY must be 256r + 64 bytes in length. The value N must be a
|
224
|
+
* power of 2 greater than 1. The arrays B, V, and XY must be aligned to a
|
225
|
+
* multiple of 64 bytes.
|
226
|
+
*/
|
227
|
+
static void
|
228
|
+
smix(uint8_t * B, size_t r, uint32_t N, void * V, void * XY)
|
229
|
+
{
|
230
|
+
size_t s = 128 * r;
|
231
|
+
__m128i * X = (__m128i *) V, * Y;
|
232
|
+
uint32_t * X32 = (uint32_t *) V;
|
233
|
+
uint32_t i, j;
|
234
|
+
size_t k;
|
235
|
+
|
236
|
+
/* 1: X <-- B */
|
237
|
+
/* 3: V_i <-- X */
|
238
|
+
for (k = 0; k < 2 * r; k++) {
|
239
|
+
for (i = 0; i < 16; i++) {
|
240
|
+
X32[k * 16 + i] =
|
241
|
+
le32dec(&B[(k * 16 + (i * 5 % 16)) * 4]);
|
242
|
+
}
|
243
|
+
}
|
244
|
+
|
245
|
+
/* 2: for i = 0 to N - 1 do */
|
246
|
+
for (i = 1; i < N - 1; i += 2) {
|
247
|
+
/* 4: X <-- H(X) */
|
248
|
+
/* 3: V_i <-- X */
|
249
|
+
Y = (__m128i *)((uintptr_t)(V) + i * s);
|
250
|
+
blockmix_salsa8(X, Y, r);
|
251
|
+
|
252
|
+
/* 4: X <-- H(X) */
|
253
|
+
/* 3: V_i <-- X */
|
254
|
+
X = (__m128i *)((uintptr_t)(V) + (i + 1) * s);
|
255
|
+
blockmix_salsa8(Y, X, r);
|
256
|
+
}
|
257
|
+
|
258
|
+
/* 4: X <-- H(X) */
|
259
|
+
/* 3: V_i <-- X */
|
260
|
+
Y = (__m128i *)((uintptr_t)(V) + i * s);
|
261
|
+
blockmix_salsa8(X, Y, r);
|
262
|
+
|
263
|
+
/* 4: X <-- H(X) */
|
264
|
+
/* 3: V_i <-- X */
|
265
|
+
X = (__m128i *) XY;
|
266
|
+
blockmix_salsa8(Y, X, r);
|
267
|
+
|
268
|
+
X32 = (uint32_t *) XY;
|
269
|
+
Y = (__m128i *)((uintptr_t)(XY) + s);
|
270
|
+
|
271
|
+
/* 7: j <-- Integerify(X) mod N */
|
272
|
+
j = integerify(X, r) & (N - 1);
|
273
|
+
|
274
|
+
/* 6: for i = 0 to N - 1 do */
|
275
|
+
for (i = 0; i < N; i += 2) {
|
276
|
+
__m128i * V_j = (__m128i *)((uintptr_t)(V) + j * s);
|
277
|
+
|
278
|
+
/* 8: X <-- H(X \xor V_j) */
|
279
|
+
/* 7: j <-- Integerify(X) mod N */
|
280
|
+
j = blockmix_salsa8_xor(X, V_j, Y, r) & (N - 1);
|
281
|
+
V_j = (__m128i *)((uintptr_t)(V) + j * s);
|
282
|
+
|
283
|
+
/* 8: X <-- H(X \xor V_j) */
|
284
|
+
/* 7: j <-- Integerify(X) mod N */
|
285
|
+
j = blockmix_salsa8_xor(Y, V_j, X, r) & (N - 1);
|
286
|
+
}
|
287
|
+
|
288
|
+
/* 10: B' <-- X */
|
289
|
+
for (k = 0; k < 2 * r; k++) {
|
290
|
+
for (i = 0; i < 16; i++) {
|
291
|
+
le32enc(&B[(k * 16 + (i * 5 % 16)) * 4],
|
292
|
+
X32[k * 16 + i]);
|
293
|
+
}
|
294
|
+
}
|
295
|
+
}
|
296
|
+
|
297
|
+
/**
|
298
|
+
* escrypt_kdf(local, passwd, passwdlen, salt, saltlen,
|
299
|
+
* N, r, p, buf, buflen):
|
300
|
+
* Compute scrypt(passwd[0 .. passwdlen - 1], salt[0 .. saltlen - 1], N, r,
|
301
|
+
* p, buflen) and write the result into buf. The parameters r, p, and buflen
|
302
|
+
* must satisfy r * p < 2^30 and buflen <= (2^32 - 1) * 32. The parameter N
|
303
|
+
* must be a power of 2 greater than 1.
|
304
|
+
*
|
305
|
+
* Return 0 on success; or -1 on error.
|
306
|
+
*/
|
307
|
+
int
|
308
|
+
escrypt_kdf_sse(escrypt_local_t * local,
|
309
|
+
const uint8_t * passwd, size_t passwdlen,
|
310
|
+
const uint8_t * salt, size_t saltlen,
|
311
|
+
uint64_t N, uint32_t _r, uint32_t _p,
|
312
|
+
uint8_t * buf, size_t buflen)
|
313
|
+
{
|
314
|
+
size_t B_size, V_size, XY_size, need;
|
315
|
+
uint8_t * B;
|
316
|
+
uint32_t * V, * XY;
|
317
|
+
size_t r = _r, p = _p;
|
318
|
+
uint32_t i;
|
319
|
+
|
320
|
+
/* Sanity-check parameters. */
|
321
|
+
#if SIZE_MAX > UINT32_MAX
|
322
|
+
if (buflen > (((uint64_t)(1) << 32) - 1) * 32) {
|
323
|
+
errno = EFBIG;
|
324
|
+
return -1;
|
325
|
+
}
|
326
|
+
#endif
|
327
|
+
if ((uint64_t)(r) * (uint64_t)(p) >= (1 << 30)) {
|
328
|
+
errno = EFBIG;
|
329
|
+
return -1;
|
330
|
+
}
|
331
|
+
if (N > UINT32_MAX) {
|
332
|
+
errno = EFBIG;
|
333
|
+
return -1;
|
334
|
+
}
|
335
|
+
if (((N & (N - 1)) != 0) || (N < 2)) {
|
336
|
+
errno = EINVAL;
|
337
|
+
return -1;
|
338
|
+
}
|
339
|
+
if (r == 0 || p == 0) {
|
340
|
+
errno = EINVAL;
|
341
|
+
return -1;
|
342
|
+
}
|
343
|
+
if ((r > SIZE_MAX / 128 / p) ||
|
344
|
+
#if SIZE_MAX / 256 <= UINT32_MAX
|
345
|
+
(r > SIZE_MAX / 256) ||
|
346
|
+
#endif
|
347
|
+
(N > SIZE_MAX / 128 / r)) {
|
348
|
+
errno = ENOMEM;
|
349
|
+
return -1;
|
350
|
+
}
|
351
|
+
|
352
|
+
/* Allocate memory. */
|
353
|
+
B_size = (size_t)128 * r * p;
|
354
|
+
V_size = (size_t)128 * r * N;
|
355
|
+
need = B_size + V_size;
|
356
|
+
if (need < V_size) {
|
357
|
+
errno = ENOMEM;
|
358
|
+
return -1;
|
359
|
+
}
|
360
|
+
XY_size = (size_t)256 * r + 64;
|
361
|
+
need += XY_size;
|
362
|
+
if (need < XY_size) {
|
363
|
+
errno = ENOMEM;
|
364
|
+
return -1;
|
365
|
+
}
|
366
|
+
if (local->size < need) {
|
367
|
+
if (free_region(local))
|
368
|
+
return -1;
|
369
|
+
if (!alloc_region(local, need))
|
370
|
+
return -1;
|
371
|
+
}
|
372
|
+
B = (uint8_t *)local->aligned;
|
373
|
+
V = (uint32_t *)((uint8_t *)B + B_size);
|
374
|
+
XY = (uint32_t *)((uint8_t *)V + V_size);
|
375
|
+
|
376
|
+
/* 1: (B_0 ... B_{p-1}) <-- PBKDF2(P, S, 1, p * MFLen) */
|
377
|
+
PBKDF2_SHA256(passwd, passwdlen, salt, saltlen, 1, B, B_size);
|
378
|
+
|
379
|
+
/* 2: for i = 0 to p - 1 do */
|
380
|
+
for (i = 0; i < p; i++) {
|
381
|
+
/* 3: B_i <-- MF(B_i, N) */
|
382
|
+
smix(&B[(size_t)128 * i * r], r, N, V, XY);
|
383
|
+
}
|
384
|
+
|
385
|
+
/* 5: DK <-- PBKDF2(P, B, 1, dkLen) */
|
386
|
+
PBKDF2_SHA256(passwd, passwdlen, B, B_size, 1, buf, buflen);
|
387
|
+
|
388
|
+
/* Success! */
|
389
|
+
return 0;
|
390
|
+
}
|
391
|
+
#endif
|