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
@@ -0,0 +1,388 @@
|
|
1
|
+
|
2
|
+
#define TEST_NAME "pwhash_argon2id"
|
3
|
+
#include "cmptest.h"
|
4
|
+
|
5
|
+
#define OUT_LEN 128
|
6
|
+
#define OPSLIMIT 3
|
7
|
+
#define MEMLIMIT 5000000
|
8
|
+
|
9
|
+
static void
|
10
|
+
tv(void)
|
11
|
+
{
|
12
|
+
static struct {
|
13
|
+
const char * passwd_hex;
|
14
|
+
size_t passwd_len;
|
15
|
+
const char * salt_hex;
|
16
|
+
size_t outlen;
|
17
|
+
unsigned long long opslimit;
|
18
|
+
size_t memlimit;
|
19
|
+
unsigned int lanes;
|
20
|
+
} tests[] = {
|
21
|
+
{ "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0"
|
22
|
+
"65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d"
|
23
|
+
"a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5"
|
24
|
+
"8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6",
|
25
|
+
127,
|
26
|
+
"5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2",
|
27
|
+
155, 5, 7256678, 1 },
|
28
|
+
{ "e125cee61c8cb7778d9e5ad0a6f5d978ce9f84de213a8556d9ffe202020ab4a6ed"
|
29
|
+
"9074a4eb3416f9b168f137510f3a30b70b96cbfa219ff99f6c6eaffb15c06b60e0"
|
30
|
+
"0cc2890277f0fd3c622115772f7048adaebed86e",
|
31
|
+
86,
|
32
|
+
"f1192dd5dc2368b9cd421338b22433455ee0a3699f9379a08b9650ea2c126f0d",
|
33
|
+
250, 4, 7849083, 1 },
|
34
|
+
{ "92263cbf6ac376499f68a4289d3bb59e5a22335eba63a32e6410249155b956b6a3"
|
35
|
+
"b48d4a44906b18b897127300b375b8f834f1ceffc70880a885f47c33876717e392"
|
36
|
+
"be57f7da3ae58da4fd1f43daa7e44bb82d3717af4319349c24cd31e46d295856b0"
|
37
|
+
"441b6b289992a11ced1cc3bf3011604590244a3eb737ff221129215e4e4347f491"
|
38
|
+
"5d41292b5173d196eb9add693be5319fdadc242906178bb6c0286c9b6ca6012746"
|
39
|
+
"711f58c8c392016b2fdfc09c64f0f6b6ab7b",
|
40
|
+
183,
|
41
|
+
"3b840e20e9555e9fb031c4ba1f1747ce25cc1d0ff664be676b9b4a90641ff194",
|
42
|
+
249, 3, 7994791, 1 },
|
43
|
+
{ "027b6d8e8c8c474e9b69c7d9ed4f9971e8e1ce2f6ba95048414c3970f0f09b70e3"
|
44
|
+
"b6c5ae05872b3d8678705b7d381829c351a5a9c88c233569b35d6b0b809df44b64"
|
45
|
+
"51a9c273f1150e2ef8a0b5437eb701e373474cd44b97ef0248ebce2ca0400e1b53"
|
46
|
+
"f3d86221eca3f18eb45b702b9172440f774a82cbf1f6f525df30a6e293c873cce6"
|
47
|
+
"9bb078ed1f0d31e7f9b8062409f37f19f8550aae",
|
48
|
+
152,
|
49
|
+
"eb2a3056a09ad2d7d7f975bcd707598f24cd32518cde3069f2e403b34bfee8a5", 5,
|
50
|
+
4, 1397645, 1 },
|
51
|
+
{ "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b82"
|
52
|
+
"ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc097d"
|
53
|
+
"43ced68642bfb8bbbdd0f50b30118f5e",
|
54
|
+
82,
|
55
|
+
"39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258",
|
56
|
+
190, 3, 1432947, 1 },
|
57
|
+
{ "c7b09aec680e7b42fedd7fc792e78b2f6c1bea8f4a884320b648f81e8cf515e8ba"
|
58
|
+
"9dcfb11d43c4aae114c1734aa69ca82d44998365db9c93744fa28b63fd16000e82"
|
59
|
+
"61cbbe083e7e2da1e5f696bde0834fe53146d7e0e35e7de9920d041f5a5621aabe"
|
60
|
+
"02da3e2b09b405b77937efef3197bd5772e41fdb73fb5294478e45208063b5f58e"
|
61
|
+
"089dbeb6d6342a909c1307b3fff5fe2cf4da56bdae50848f",
|
62
|
+
156,
|
63
|
+
"039c056d933b475032777edbaffac50f143f64c123329ed9cf59e3b65d3f43b6",
|
64
|
+
178, 3, 4886999, 1 },
|
65
|
+
{ "b540beb016a5366524d4605156493f9874514a5aa58818cd0c6dfffaa9e90205f1"
|
66
|
+
"7b",
|
67
|
+
34,
|
68
|
+
"44071f6d181561670bda728d43fb79b443bb805afdebaf98622b5165e01b15fb",
|
69
|
+
231, 1, 1631659, 1 },
|
70
|
+
{ "a14975c26c088755a8b715ff2528d647cd343987fcf4aa25e7194a8417fb2b4b3f"
|
71
|
+
"7268da9f3182b4cfb22d138b2749d673a47ecc7525dd15a0a3c66046971784bb63"
|
72
|
+
"d7eae24cc84f2631712075a10e10a96b0e0ee67c43e01c423cb9c44e5371017e9c"
|
73
|
+
"496956b632158da3fe12addecb88912e6759bc37f9af2f45af72c5cae3b179ffb6"
|
74
|
+
"76a697de6ebe45cd4c16d4a9d642d29ddc0186a0a48cb6cd62bfc3dd229d313b30"
|
75
|
+
"1560971e740e2cf1f99a9a090a5b283f35475057e96d7064e2e0fc81984591068d"
|
76
|
+
"55a3b4169f22cccb0745a2689407ea1901a0a766eb99",
|
77
|
+
220,
|
78
|
+
"3d968b2752b8838431165059319f3ff8910b7b8ecb54ea01d3f54769e9d98daf",
|
79
|
+
167, 3, 1784128, 1 },
|
80
|
+
};
|
81
|
+
char passwd[256];
|
82
|
+
unsigned char salt[crypto_pwhash_argon2id_SALTBYTES];
|
83
|
+
unsigned char out[256];
|
84
|
+
char out_hex[256 * 2 + 1];
|
85
|
+
size_t i = 0U;
|
86
|
+
|
87
|
+
do {
|
88
|
+
sodium_hex2bin((unsigned char *) passwd, sizeof passwd,
|
89
|
+
tests[i].passwd_hex, strlen(tests[i].passwd_hex), NULL,
|
90
|
+
NULL, NULL);
|
91
|
+
sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex,
|
92
|
+
strlen(tests[i].salt_hex), NULL, NULL, NULL);
|
93
|
+
if (crypto_pwhash_argon2id(out, (unsigned long long) tests[i].outlen, passwd,
|
94
|
+
tests[i].passwd_len, (const unsigned char *) salt,
|
95
|
+
tests[i].opslimit, tests[i].memlimit,
|
96
|
+
crypto_pwhash_argon2id_alg_argon2id13()) != 0) {
|
97
|
+
printf("[tv] pwhash failure (maybe intentional): [%u]\n",
|
98
|
+
(unsigned int) i);
|
99
|
+
continue;
|
100
|
+
}
|
101
|
+
sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen);
|
102
|
+
printf("%s\n", out_hex);
|
103
|
+
} while (++i < (sizeof tests) / (sizeof tests[0]));
|
104
|
+
}
|
105
|
+
|
106
|
+
static void
|
107
|
+
tv2(void)
|
108
|
+
{
|
109
|
+
static struct {
|
110
|
+
const char * passwd_hex;
|
111
|
+
size_t passwd_len;
|
112
|
+
const char * salt_hex;
|
113
|
+
size_t outlen;
|
114
|
+
unsigned long long opslimit;
|
115
|
+
size_t memlimit;
|
116
|
+
unsigned int lanes;
|
117
|
+
} tests[] = {
|
118
|
+
{ "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0"
|
119
|
+
"65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d"
|
120
|
+
"a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5"
|
121
|
+
"8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6",
|
122
|
+
127,
|
123
|
+
"5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2",
|
124
|
+
155, 4, 1397645, 1 },
|
125
|
+
{ "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0"
|
126
|
+
"65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d"
|
127
|
+
"a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5"
|
128
|
+
"8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6",
|
129
|
+
127,
|
130
|
+
"5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2",
|
131
|
+
155, 3, 1397645, 1 },
|
132
|
+
};
|
133
|
+
char passwd[256];
|
134
|
+
unsigned char salt[crypto_pwhash_argon2id_SALTBYTES];
|
135
|
+
unsigned char out[256];
|
136
|
+
char out_hex[256 * 2 + 1];
|
137
|
+
size_t i = 0U;
|
138
|
+
|
139
|
+
do {
|
140
|
+
sodium_hex2bin((unsigned char *) passwd, sizeof passwd,
|
141
|
+
tests[i].passwd_hex, strlen(tests[i].passwd_hex), NULL,
|
142
|
+
NULL, NULL);
|
143
|
+
sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex,
|
144
|
+
strlen(tests[i].salt_hex), NULL, NULL, NULL);
|
145
|
+
if (crypto_pwhash_argon2id(out, (unsigned long long) tests[i].outlen, passwd,
|
146
|
+
tests[i].passwd_len, (const unsigned char *) salt,
|
147
|
+
tests[i].opslimit, tests[i].memlimit,
|
148
|
+
crypto_pwhash_argon2id_alg_argon2id13()) != 0) {
|
149
|
+
printf("[tv2] pwhash failure: [%u]\n", (unsigned int) i);
|
150
|
+
continue;
|
151
|
+
}
|
152
|
+
sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen);
|
153
|
+
printf("%s\n", out_hex);
|
154
|
+
} while (++i < (sizeof tests) / (sizeof tests[0]));
|
155
|
+
|
156
|
+
if (crypto_pwhash_argon2id(out, sizeof out, "password", strlen("password"), salt, 3,
|
157
|
+
1ULL << 12, 0) != -1) {
|
158
|
+
printf("[tv2] pwhash should have failed (0)\n");
|
159
|
+
}
|
160
|
+
if (crypto_pwhash_argon2id(out, sizeof out, "password", strlen("password"), salt, 3,
|
161
|
+
1, crypto_pwhash_argon2id_alg_argon2id13()) != -1) {
|
162
|
+
printf("[tv2] pwhash should have failed (1)\n");
|
163
|
+
}
|
164
|
+
if (crypto_pwhash_argon2id(out, sizeof out, "password", strlen("password"), salt, 3,
|
165
|
+
1ULL << 12, crypto_pwhash_argon2id_alg_argon2id13()) != -1) {
|
166
|
+
printf("[tv2] pwhash should have failed (2)\n");
|
167
|
+
}
|
168
|
+
if (crypto_pwhash_argon2id(out, sizeof out, "password", strlen("password"), salt, 2,
|
169
|
+
1ULL << 12, crypto_pwhash_argon2id_alg_argon2id13()) != -1) {
|
170
|
+
printf("[tv2] pwhash should have failed (3)\n");
|
171
|
+
}
|
172
|
+
if (crypto_pwhash_argon2id(out, 15, "password", strlen("password"), salt, 3,
|
173
|
+
1ULL << 12, crypto_pwhash_argon2id_alg_argon2id13()) != -1) {
|
174
|
+
printf("[tv2] pwhash with a short output length should have failed\n");
|
175
|
+
}
|
176
|
+
if (crypto_pwhash_argon2id(out, sizeof out, "password", 0x100000000ULL, salt, 3,
|
177
|
+
1ULL << 12, crypto_pwhash_argon2id_alg_argon2id13()) != -1) {
|
178
|
+
printf("[tv2] pwhash with a long password length should have failed\n");
|
179
|
+
}
|
180
|
+
}
|
181
|
+
|
182
|
+
static void
|
183
|
+
tv3(void)
|
184
|
+
{
|
185
|
+
static struct {
|
186
|
+
const char *passwd;
|
187
|
+
const char *out;
|
188
|
+
} tests[] = {
|
189
|
+
{ "",
|
190
|
+
"$argon2i$v=19$m=4096,t=1,p=1$X1NhbHQAAAAAAAAAAAAAAA$bWh++"
|
191
|
+
"MKN1OiFHKgIWTLvIi1iHicmHH7+Fv3K88ifFfI" },
|
192
|
+
{ "",
|
193
|
+
"$argon2i$v=19$m=2048,t=4,p=1$SWkxaUhpY21ISDcrRnYzSw$Mbg/"
|
194
|
+
"Eck1kpZir5T9io7C64cpffdTBaORgyriLQFgQj8" },
|
195
|
+
{ "^T5H$JYt39n%K*j:W]!1s?vg!:jGi]Ax?..l7[p0v:1jHTpla9;]bUN;?bWyCbtqg ",
|
196
|
+
"$argon2i$v=19$m=4096,t=3,p=2$X1NhbHQAAAAAAAAAAAAAAA$z/QMiU4lQxGsYNc/"
|
197
|
+
"+K/bizwsA1P11UG2dj/7+aILJ4I" },
|
198
|
+
{ "K3S=KyH#)36_?]LxeR8QNKw6X=gFbxai$C%29V*",
|
199
|
+
"$argon2i$v=19$m=4096,t=3,p=1$X1NhbHQAAAAAAAAAAAAAAA$fu2Wsecyt+"
|
200
|
+
"yPnBvSvYN16oP5ozRmkp0ixJ1YL19V3Uo" }
|
201
|
+
};
|
202
|
+
char *out;
|
203
|
+
char *passwd;
|
204
|
+
size_t i = 0U;
|
205
|
+
|
206
|
+
do {
|
207
|
+
out = (char *) sodium_malloc(strlen(tests[i].out) + 1U);
|
208
|
+
assert(out != NULL);
|
209
|
+
memcpy(out, tests[i].out, strlen(tests[i].out) + 1U);
|
210
|
+
passwd = (char *) sodium_malloc(strlen(tests[i].passwd) + 1U);
|
211
|
+
assert(passwd != NULL);
|
212
|
+
memcpy(passwd, tests[i].passwd, strlen(tests[i].passwd) + 1U);
|
213
|
+
if (crypto_pwhash_argon2id_str_verify(out, passwd, strlen(passwd)) != 0) {
|
214
|
+
printf("[tv3] pwhash_argon2id_str failure (maybe intentional): [%u]\n",
|
215
|
+
(unsigned int) i);
|
216
|
+
continue;
|
217
|
+
}
|
218
|
+
sodium_free(out);
|
219
|
+
sodium_free(passwd);
|
220
|
+
} while (++i < (sizeof tests) / (sizeof tests[0]));
|
221
|
+
}
|
222
|
+
|
223
|
+
int
|
224
|
+
main(void)
|
225
|
+
{
|
226
|
+
char *str_out;
|
227
|
+
char *str_out2;
|
228
|
+
char *salt;
|
229
|
+
const char *passwd = "Correct Horse Battery Staple";
|
230
|
+
|
231
|
+
tv();
|
232
|
+
tv2();
|
233
|
+
tv3();
|
234
|
+
salt = (char *) sodium_malloc(crypto_pwhash_argon2id_SALTBYTES);
|
235
|
+
str_out = (char *) sodium_malloc(crypto_pwhash_argon2id_STRBYTES);
|
236
|
+
str_out2 = (char *) sodium_malloc(crypto_pwhash_argon2id_STRBYTES);
|
237
|
+
memcpy(salt, ">A 16-bytes salt", crypto_pwhash_argon2id_SALTBYTES);
|
238
|
+
if (crypto_pwhash_argon2id_str(str_out, passwd, strlen(passwd), OPSLIMIT,
|
239
|
+
MEMLIMIT) != 0) {
|
240
|
+
printf("pwhash_argon2id_str failure: %s\n", strerror(errno));
|
241
|
+
return 1;
|
242
|
+
}
|
243
|
+
exit(0);
|
244
|
+
if (crypto_pwhash_argon2id_str(str_out2, passwd, strlen(passwd), OPSLIMIT,
|
245
|
+
MEMLIMIT) != 0) {
|
246
|
+
printf("pwhash_argon2id_str(2) failure\n");
|
247
|
+
return 1;
|
248
|
+
}
|
249
|
+
if (strcmp(str_out, str_out2) == 0) {
|
250
|
+
printf("pwhash_argon2id_str() doesn't generate different salts\n");
|
251
|
+
}
|
252
|
+
if (sodium_is_zero((const unsigned char *) str_out + strlen(str_out),
|
253
|
+
crypto_pwhash_argon2id_STRBYTES - strlen(str_out)) != 1 ||
|
254
|
+
sodium_is_zero((const unsigned char *) str_out2 + strlen(str_out2),
|
255
|
+
crypto_pwhash_argon2id_STRBYTES - strlen(str_out2)) != 1) {
|
256
|
+
printf("pwhash_argon2id_str() doesn't properly pad with zeros\n");
|
257
|
+
}
|
258
|
+
if (crypto_pwhash_argon2id_str_verify(str_out, passwd, strlen(passwd)) != 0) {
|
259
|
+
printf("pwhash_argon2id_str_verify(1) failure\n");
|
260
|
+
}
|
261
|
+
str_out[14]++;
|
262
|
+
if (crypto_pwhash_argon2id_str_verify(str_out, passwd, strlen(passwd)) != -1) {
|
263
|
+
printf("pwhash_argon2id_str_verify(2) failure\n");
|
264
|
+
}
|
265
|
+
str_out[14]--;
|
266
|
+
assert(str_out[crypto_pwhash_argon2id_STRBYTES - 1U] == 0);
|
267
|
+
|
268
|
+
if (crypto_pwhash_argon2id_str(str_out2, passwd, 0x100000000ULL, OPSLIMIT,
|
269
|
+
MEMLIMIT) != -1) {
|
270
|
+
printf("pwhash_argon2id_str() with a large password should have failed\n");
|
271
|
+
return 1;
|
272
|
+
}
|
273
|
+
if (crypto_pwhash_argon2id_str(str_out2, passwd, strlen(passwd), 1, MEMLIMIT) !=
|
274
|
+
-1) {
|
275
|
+
printf("pwhash_argon2id_str() with a small opslimit should have failed\n");
|
276
|
+
return 1;
|
277
|
+
}
|
278
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$m=65536,t=2,p=1c29tZXNhbHQ"
|
279
|
+
"$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
|
280
|
+
"password", 0x100000000ULL) != -1) {
|
281
|
+
printf("pwhash_argon2id_str_verify(invalid(0)) failure\n");
|
282
|
+
}
|
283
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$m=65536,t=2,p=1c29tZXNhbHQ"
|
284
|
+
"$9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
|
285
|
+
"password", strlen("password")) != -1) {
|
286
|
+
printf("pwhash_argon2id_str_verify(invalid(1)) failure %d\n", errno);
|
287
|
+
}
|
288
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
|
289
|
+
"9sTbSlTio3Biev89thdrlKKiCaYsjjYVJxGAL3swxpQ",
|
290
|
+
"password", strlen("password")) != -1) {
|
291
|
+
printf("pwhash_argon2id_str_verify(invalid(2)) failure\n");
|
292
|
+
}
|
293
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$m=65536,t=2,p=1$c29tZXNhbHQ"
|
294
|
+
"$b2G3seW+uPzerwQQC+/E1K50CLLO7YXy0JRcaTuswRo",
|
295
|
+
"password", strlen("password")) != -1) {
|
296
|
+
printf("pwhash_argon2id_str_verify(invalid(3)) failure\n");
|
297
|
+
}
|
298
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$v=19$m=65536,t=2,p=1c29tZXNhbHQ"
|
299
|
+
"$wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA",
|
300
|
+
"password", strlen("password")) != -1) {
|
301
|
+
printf("pwhash_argon2id_str_verify(invalid(4)) failure\n");
|
302
|
+
}
|
303
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
|
304
|
+
"wWKIMhR9lyDFvRz9YTZweHKfbftvj+qf+YFY4NeBbtA",
|
305
|
+
"password", strlen("password")) != -1) {
|
306
|
+
printf("pwhash_argon2id_str_verify(invalid(5)) failure\n");
|
307
|
+
}
|
308
|
+
if (crypto_pwhash_argon2id_str_verify("$argon2i$v=19$m=65536,t=2,p=1$c29tZXNhbHQ"
|
309
|
+
"$8iIuixkI73Js3G1uMbezQXD0b8LG4SXGsOwoQkdAQIM",
|
310
|
+
"password", strlen("password")) != -1) {
|
311
|
+
printf("pwhash_argon2id_str_verify(invalid(6)) failure\n");
|
312
|
+
}
|
313
|
+
if (crypto_pwhash_argon2id_str_verify(
|
314
|
+
"$argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw"
|
315
|
+
"$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M",
|
316
|
+
"password", strlen("password")) != 0) {
|
317
|
+
printf("pwhash_argon2id_str_verify(valid(7)) failure\n");
|
318
|
+
}
|
319
|
+
if (crypto_pwhash_argon2id_str_verify(
|
320
|
+
"$argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw"
|
321
|
+
"$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M",
|
322
|
+
"passwore", strlen("passwore")) != -1 || errno != EINVAL) {
|
323
|
+
printf("pwhash_argon2id_str_verify(invalid(7)) failure\n");
|
324
|
+
}
|
325
|
+
if (crypto_pwhash_argon2id_str_verify(
|
326
|
+
"$Argon2i$v=19$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw"
|
327
|
+
"$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M",
|
328
|
+
"password", strlen("password")) != -1 || errno != EINVAL) {
|
329
|
+
printf("pwhash_argon2id_str_verify(invalid(8)) failure\n");
|
330
|
+
}
|
331
|
+
if (crypto_pwhash_argon2id_str_verify(
|
332
|
+
"$argon2i$v=1$m=4096,t=3,p=2$b2RpZHVlamRpc29kaXNrdw"
|
333
|
+
"$TNnWIwlu1061JHrnCqIAmjs3huSxYIU+0jWipu7Kc9M",
|
334
|
+
"password", strlen("password")) != -1 || errno != EINVAL) {
|
335
|
+
printf("pwhash_argon2id_str_verify(invalid(9)) failure\n");
|
336
|
+
}
|
337
|
+
assert(crypto_pwhash_argon2id_bytes_min() > 0U);
|
338
|
+
assert(crypto_pwhash_argon2id_bytes_max() > crypto_pwhash_argon2id_bytes_min());
|
339
|
+
assert(crypto_pwhash_argon2id_passwd_max() > crypto_pwhash_argon2id_passwd_min());
|
340
|
+
assert(crypto_pwhash_argon2id_saltbytes() > 0U);
|
341
|
+
assert(crypto_pwhash_argon2id_strbytes() > 1U);
|
342
|
+
assert(crypto_pwhash_argon2id_strbytes() > strlen(crypto_pwhash_argon2id_strprefix()));
|
343
|
+
|
344
|
+
assert(crypto_pwhash_argon2id_opslimit_min() > 0U);
|
345
|
+
assert(crypto_pwhash_argon2id_opslimit_max() > 0U);
|
346
|
+
assert(crypto_pwhash_argon2id_memlimit_min() > 0U);
|
347
|
+
assert(crypto_pwhash_argon2id_memlimit_max() > 0U);
|
348
|
+
assert(crypto_pwhash_argon2id_opslimit_interactive() > 0U);
|
349
|
+
assert(crypto_pwhash_argon2id_memlimit_interactive() > 0U);
|
350
|
+
assert(crypto_pwhash_argon2id_opslimit_moderate() > 0U);
|
351
|
+
assert(crypto_pwhash_argon2id_memlimit_moderate() > 0U);
|
352
|
+
assert(crypto_pwhash_argon2id_opslimit_sensitive() > 0U);
|
353
|
+
assert(crypto_pwhash_argon2id_memlimit_sensitive() > 0U);
|
354
|
+
|
355
|
+
assert(crypto_pwhash_argon2id_bytes_min() == crypto_pwhash_argon2id_BYTES_MIN);
|
356
|
+
assert(crypto_pwhash_argon2id_bytes_max() == crypto_pwhash_argon2id_BYTES_MAX);
|
357
|
+
assert(crypto_pwhash_argon2id_passwd_min() == crypto_pwhash_argon2id_PASSWD_MIN);
|
358
|
+
assert(crypto_pwhash_argon2id_passwd_max() == crypto_pwhash_argon2id_PASSWD_MAX);
|
359
|
+
assert(crypto_pwhash_argon2id_saltbytes() == crypto_pwhash_argon2id_SALTBYTES);
|
360
|
+
assert(crypto_pwhash_argon2id_strbytes() == crypto_pwhash_argon2id_STRBYTES);
|
361
|
+
|
362
|
+
assert(crypto_pwhash_argon2id_opslimit_min() == crypto_pwhash_argon2id_OPSLIMIT_MIN);
|
363
|
+
assert(crypto_pwhash_argon2id_opslimit_max() == crypto_pwhash_argon2id_OPSLIMIT_MAX);
|
364
|
+
assert(crypto_pwhash_argon2id_memlimit_min() == crypto_pwhash_argon2id_MEMLIMIT_MIN);
|
365
|
+
assert(crypto_pwhash_argon2id_memlimit_max() == crypto_pwhash_argon2id_MEMLIMIT_MAX);
|
366
|
+
assert(crypto_pwhash_argon2id_opslimit_interactive() ==
|
367
|
+
crypto_pwhash_argon2id_OPSLIMIT_INTERACTIVE);
|
368
|
+
assert(crypto_pwhash_argon2id_memlimit_interactive() ==
|
369
|
+
crypto_pwhash_argon2id_MEMLIMIT_INTERACTIVE);
|
370
|
+
assert(crypto_pwhash_argon2id_opslimit_moderate() ==
|
371
|
+
crypto_pwhash_argon2id_OPSLIMIT_MODERATE);
|
372
|
+
assert(crypto_pwhash_argon2id_memlimit_moderate() ==
|
373
|
+
crypto_pwhash_argon2id_MEMLIMIT_MODERATE);
|
374
|
+
assert(crypto_pwhash_argon2id_opslimit_sensitive() ==
|
375
|
+
crypto_pwhash_argon2id_OPSLIMIT_SENSITIVE);
|
376
|
+
assert(crypto_pwhash_argon2id_memlimit_sensitive() ==
|
377
|
+
crypto_pwhash_argon2id_MEMLIMIT_SENSITIVE);
|
378
|
+
|
379
|
+
assert(crypto_pwhash_argon2id_alg_argon2id13() == crypto_pwhash_argon2id_ALG_ARGON2ID13);
|
380
|
+
|
381
|
+
sodium_free(salt);
|
382
|
+
sodium_free(str_out);
|
383
|
+
sodium_free(str_out2);
|
384
|
+
|
385
|
+
printf("OK\n");
|
386
|
+
|
387
|
+
return 0;
|
388
|
+
}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
18acec5d6507739f203d1f5d9f1d862f7c2cdac4f19d2bdff64487e60d969e3ced615337b9eec6ac4461c6ca07f0939741e57c24d0005c7ea171a0ee1e7348249d135b38f222e4dad7b9a033ed83f5ca27277393e316582033c74affe2566a2bea47f91f0fd9fe49ece7e1f79f3ad6e9b23e0277c8ecc4b313225748dd2a80f5679534a0700e246a79a49b3f74eb89ec6205fe1eeb941c73b1fcf1
|
2
|
+
26bab5f101560e48c711da4f05e81f5a3802b7a93d5155b9cab153069cc42b8e9f910bfead747652a0708d70e4de0bada37218bd203a1201c36b42f9a269b675b1f30cfc36f35a3030e9c7f57dfba0d341a974c1886f708c3e8297efbfe411bb9d51375264bd7c70d57a8a56fc9de2c1c97c08776803ec2cd0140bba8e61dc0f4ad3d3d1a89b4b710af81bfe35a0eea193e18a6da0f5ec05542c9eefc4584458e1da715611ba09617384748bd43b9bf1f3a6df4ecd091d0875e08d6e2fd8a5c7ce08904b5160cd38167b76ec76ef2d310049055a564da23d4ebd2b87e421cc33c401e12d5cd8d936c9baf75ebdfb557d342d2858fc781da31860
|
3
|
+
6eb45e668582d63788ca8f6e930ca60b045a795fca987344f9a7a135aa3b5132b50a34a3864c26581f1f56dd0bcbfafbfa92cd9bff6b24a734cfe88f854aef4bda0a7983120f44936e8ff31d29728ac08ccce6f3f916b3c63962755c23a1fa9bb4e8823fc867bfd18f28980d94bc5874423ab7f96cc0ab78d8fa21fbd00cd3a1d96a73fa439ccc3fc4eab1590677b06cc78b0f674dfb680f23022fb902022dd8620803229c6ddf79a8156ccfce48bbd76c05ab670634f206e5b2e896230baa74a856964dbd8511acb71d75a1506766a125d8ce037f1db72086ebc3bccaefbd8cd9380167c2530386544ebfbeadbe237784d102bb92a10fd242
|
4
|
+
[tv] pwhash failure (maybe intentional): [3]
|
5
|
+
08d8cd330c57e1b4643241d05bb468ba4ee4e932cd0858816be9ef15360b27bbd06a87130ee92222be267a29b81f5ae8fe8613324cfc4832dc49387fd0602f1c57b4d0f3855db94fb7e12eb05f9a484aed4a4307abf586cd3d55c809bc081541e00b682772fb2066504ff935b8ebc551a2083882f874bc0fae68e56848ae34c91097c3bf0cca8e75c0797eef3efde3f75e005815018db3cf7c109a812264c4de69dcb22322dbbcfa447f5b00ecd1b04a7be1569c8e556adb7bba48adf81d
|
6
|
+
d6e9d6cabd42fb9ba7162fe9b8e41d59d3c7034756cb460c9affe393308bd0225ce0371f2e6c3ca32aca2002bf2d3909c6b6e7dfc4a00e850ff4f570f8f749d4bb6f0091e554be67a9095ae1eefaa1a933316cbec3c2fd4a14a5b6941bda9b7eabd821d79abde2475a53af1a8571c7ee46460be415882e0b393f48c12f740a6a72cba9773000602e13b40d3dfa6ac1d4ec43a838b7e3e165fecad4b2498389e60a3ff9f0f8f4b9fca1126e64f49501e38690
|
7
|
+
[tv] pwhash failure (maybe intentional): [6]
|
8
|
+
4e702bc5f891df884c6ddaa243aa846ce3c087fe930fef0f36b3c2be34164ccc295db509254743f18f947159c813bcd5dd8d94a3aec93bbe57605d1fad1aef1112687c3d4ef1cb329d21f1632f626818d766915d886e8d819e4b0b9c9307f4b6afc081e13b0cf31db382ff1bf05a16aac7af696336d75e99f82163e0f371e1d25c4add808e215697ad3f779a51a462f8bf52610af21fc69dba6b072606f2dabca7d4ae1d91d919
|
9
|
+
2d232f9dc4de96628b2a4c2b39ceb6a813011fb74a3ba1da096761fabe08f563bd91366aba5c5e35aecd98643cabc16ce560dca261a963230a1fa2af52f2413a57a827c6ee13bcec0c123d195914a55700ccb5756196a86fb9cb4aeacccc0e6dd850f4386b705aaae147ea347543b7fbe24553d9da41f1b335b6e9980cdb966cf7b48520eb42a7269380c885dbefbccf447851fcacbe1753a5b9e1
|
10
|
+
34b207147fb7ef83e1ca1a97e30aa6e08ea9b6b1048c59c9c13050dff33e76ce3c440d7f018f817e6b8593e78f339ba633b9d7ec3519b5eafbcc4bc2d20b5136bbc7e5b7e92ff37d024bbbecf5738f718ab22c8adcdb82ceffc233b8ad61f91850abdfe8bb119775d9c4243ec1ac761dfbd132489228dfeab5268c7f0ddc29f56b957d1b76c874cdd77e16139e0df9b847248fd782c9a1147b8480
|
11
|
+
[tv3] pwhash_argon2id_str failure (maybe intentional): [0]
|
12
|
+
[tv3] pwhash_argon2id_str failure (maybe intentional): [1]
|
13
|
+
[tv3] pwhash_argon2id_str failure (maybe intentional): [2]
|
14
|
+
[tv3] pwhash_argon2id_str failure (maybe intentional): [3]
|
15
|
+
pwhash_argon2id_str failure
|
@@ -6,89 +6,90 @@
|
|
6
6
|
#define OPSLIMIT 1000000
|
7
7
|
#define MEMLIMIT 10000000
|
8
8
|
|
9
|
-
static void
|
9
|
+
static void
|
10
|
+
tv(void)
|
10
11
|
{
|
11
12
|
static struct {
|
12
|
-
const char
|
13
|
-
size_t
|
14
|
-
const char
|
15
|
-
size_t
|
16
|
-
unsigned long long
|
17
|
-
size_t
|
13
|
+
const char * passwd_hex;
|
14
|
+
size_t passwdlen;
|
15
|
+
const char * salt_hex;
|
16
|
+
size_t outlen;
|
17
|
+
unsigned long long opslimit;
|
18
|
+
size_t memlimit;
|
18
19
|
} tests[] = {
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
28
|
-
|
29
|
-
|
30
|
-
|
31
|
-
|
32
|
-
|
33
|
-
|
34
|
-
|
35
|
-
|
36
|
-
|
37
|
-
|
38
|
-
|
39
|
-
|
40
|
-
|
41
|
-
|
42
|
-
|
43
|
-
|
44
|
-
|
45
|
-
|
46
|
-
|
47
|
-
|
48
|
-
|
49
|
-
|
50
|
-
|
51
|
-
|
52
|
-
|
53
|
-
|
54
|
-
|
55
|
-
|
56
|
-
|
57
|
-
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
76
|
-
|
77
|
-
|
78
|
-
|
79
|
-
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
20
|
+
{ "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0"
|
21
|
+
"65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d"
|
22
|
+
"a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5"
|
23
|
+
"8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6",
|
24
|
+
127,
|
25
|
+
"5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2",
|
26
|
+
155, 481326, 7256678 },
|
27
|
+
{ "e125cee61c8cb7778d9e5ad0a6f5d978ce9f84de213a8556d9ffe202020ab4a6ed"
|
28
|
+
"9074a4eb3416f9b168f137510f3a30b70b96cbfa219ff99f6c6eaffb15c06b60e0"
|
29
|
+
"0cc2890277f0fd3c622115772f7048adaebed86e",
|
30
|
+
86,
|
31
|
+
"f1192dd5dc2368b9cd421338b22433455ee0a3699f9379a08b9650ea2c126f0d",
|
32
|
+
250, 535778, 7849083 },
|
33
|
+
{ "92263cbf6ac376499f68a4289d3bb59e5a22335eba63a32e6410249155b956b6a3"
|
34
|
+
"b48d4a44906b18b897127300b375b8f834f1ceffc70880a885f47c33876717e392"
|
35
|
+
"be57f7da3ae58da4fd1f43daa7e44bb82d3717af4319349c24cd31e46d295856b0"
|
36
|
+
"441b6b289992a11ced1cc3bf3011604590244a3eb737ff221129215e4e4347f491"
|
37
|
+
"5d41292b5173d196eb9add693be5319fdadc242906178bb6c0286c9b6ca6012746"
|
38
|
+
"711f58c8c392016b2fdfc09c64f0f6b6ab7b",
|
39
|
+
183,
|
40
|
+
"3b840e20e9555e9fb031c4ba1f1747ce25cc1d0ff664be676b9b4a90641ff194",
|
41
|
+
249, 311757, 7994791 },
|
42
|
+
{ "027b6d8e8c8c474e9b69c7d9ed4f9971e8e1ce2f6ba95048414c3970f0f09b70e3"
|
43
|
+
"b6c5ae05872b3d8678705b7d381829c351a5a9c88c233569b35d6b0b809df44b64"
|
44
|
+
"51a9c273f1150e2ef8a0b5437eb701e373474cd44b97ef0248ebce2ca0400e1b53"
|
45
|
+
"f3d86221eca3f18eb45b702b9172440f774a82cbf1f6f525df30a6e293c873cce6"
|
46
|
+
"9bb078ed1f0d31e7f9b8062409f37f19f8550aae",
|
47
|
+
152,
|
48
|
+
"eb2a3056a09ad2d7d7f975bcd707598f24cd32518cde3069f2e403b34bfee8a5", 5,
|
49
|
+
643464, 1397645 },
|
50
|
+
{ "4a857e2ee8aa9b6056f2424e84d24a72473378906ee04a46cb05311502d5250b82"
|
51
|
+
"ad86b83c8f20a23dbb74f6da60b0b6ecffd67134d45946ac8ebfb3064294bc097d"
|
52
|
+
"43ced68642bfb8bbbdd0f50b30118f5e",
|
53
|
+
82,
|
54
|
+
"39d82eef32010b8b79cc5ba88ed539fbaba741100f2edbeca7cc171ffeabf258",
|
55
|
+
190, 758010, 5432947 },
|
56
|
+
{ "1845e375479537e9dd4f4486d5c91ac72775d66605eeb11a787b78a7745f1fd005"
|
57
|
+
"2d526c67235dbae1b2a4d575a74cb551c8e9096c593a497aee74ba3047d911358e"
|
58
|
+
"de57bc27c9ea1829824348daaab606217cc931dcb6627787bd6e4e5854f0e8",
|
59
|
+
97,
|
60
|
+
"3ee91a805aa62cfbe8dce29a2d9a44373a5006f4a4ce24022aca9cecb29d1473",
|
61
|
+
212, 233177, 13101817 },
|
62
|
+
{ "c7b09aec680e7b42fedd7fc792e78b2f6c1bea8f4a884320b648f81e8cf515e8ba"
|
63
|
+
"9dcfb11d43c4aae114c1734aa69ca82d44998365db9c93744fa28b63fd16000e82"
|
64
|
+
"61cbbe083e7e2da1e5f696bde0834fe53146d7e0e35e7de9920d041f5a5621aabe"
|
65
|
+
"02da3e2b09b405b77937efef3197bd5772e41fdb73fb5294478e45208063b5f58e"
|
66
|
+
"089dbeb6d6342a909c1307b3fff5fe2cf4da56bdae50848f",
|
67
|
+
156,
|
68
|
+
"039c056d933b475032777edbaffac50f143f64c123329ed9cf59e3b65d3f43b6",
|
69
|
+
178, 234753, 4886999 },
|
70
|
+
{ "8f3a06e2fd8711350a517bb12e31f3d3423e8dc0bb14aac8240fca0995938d59bb"
|
71
|
+
"37bd0a7dfc9c9cc0705684b46612e8c8b1d6655fb0f9887562bb9899791a0250d1"
|
72
|
+
"320f945eda48cdc20c233f40a5bb0a7e3ac5ad7250ce684f68fc0b8c9633bfd75a"
|
73
|
+
"ad116525af7bdcdbbdb4e00ab163fd4df08f243f12557e",
|
74
|
+
122,
|
75
|
+
"90631f686a8c3dbc0703ffa353bc1fdf35774568ac62406f98a13ed8f47595fd",
|
76
|
+
55, 695191, 15738350 },
|
77
|
+
{ "b540beb016a5366524d4605156493f9874514a5aa58818cd0c6dfffaa9e90205f1"
|
78
|
+
"7b",
|
79
|
+
34,
|
80
|
+
"44071f6d181561670bda728d43fb79b443bb805afdebaf98622b5165e01b15fb",
|
81
|
+
231, 78652, 6631659 },
|
82
|
+
{ "a14975c26c088755a8b715ff2528d647cd343987fcf4aa25e7194a8417fb2b4b3f"
|
83
|
+
"7268da9f3182b4cfb22d138b2749d673a47ecc7525dd15a0a3c66046971784bb63"
|
84
|
+
"d7eae24cc84f2631712075a10e10a96b0e0ee67c43e01c423cb9c44e5371017e9c"
|
85
|
+
"496956b632158da3fe12addecb88912e6759bc37f9af2f45af72c5cae3b179ffb6"
|
86
|
+
"76a697de6ebe45cd4c16d4a9d642d29ddc0186a0a48cb6cd62bfc3dd229d313b30"
|
87
|
+
"1560971e740e2cf1f99a9a090a5b283f35475057e96d7064e2e0fc81984591068d"
|
88
|
+
"55a3b4169f22cccb0745a2689407ea1901a0a766eb99",
|
89
|
+
220,
|
90
|
+
"3d968b2752b8838431165059319f3ff8910b7b8ecb54ea01d3f54769e9d98daf",
|
91
|
+
167, 717248, 10784179 },
|
92
|
+
};
|
92
93
|
char passwd[256];
|
93
94
|
unsigned char salt[crypto_pwhash_scryptsalsa208sha256_SALTBYTES];
|
94
95
|
unsigned char out[256];
|
@@ -102,10 +103,9 @@ static void tv(void)
|
|
102
103
|
sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex,
|
103
104
|
strlen(tests[i].salt_hex), NULL, NULL, NULL);
|
104
105
|
if (crypto_pwhash_scryptsalsa208sha256(
|
105
|
-
out, (unsigned long long) tests[i].outlen,
|
106
|
-
|
107
|
-
|
108
|
-
tests[i].memlimit) != 0) {
|
106
|
+
out, (unsigned long long) tests[i].outlen, passwd,
|
107
|
+
tests[i].passwdlen, (const unsigned char *) salt,
|
108
|
+
tests[i].opslimit, tests[i].memlimit) != 0) {
|
109
109
|
printf("pwhash failure\n");
|
110
110
|
}
|
111
111
|
sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen);
|
@@ -113,31 +113,32 @@ static void tv(void)
|
|
113
113
|
} while (++i < (sizeof tests) / (sizeof tests[0]));
|
114
114
|
}
|
115
115
|
|
116
|
-
static void
|
116
|
+
static void
|
117
|
+
tv2(void)
|
117
118
|
{
|
118
119
|
static struct {
|
119
|
-
const char
|
120
|
-
size_t
|
121
|
-
const char
|
122
|
-
size_t
|
123
|
-
unsigned long long
|
124
|
-
size_t
|
120
|
+
const char * passwd_hex;
|
121
|
+
size_t passwdlen;
|
122
|
+
const char * salt_hex;
|
123
|
+
size_t outlen;
|
124
|
+
unsigned long long opslimit;
|
125
|
+
size_t memlimit;
|
125
126
|
} tests[] = {
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
127
|
+
{ "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0"
|
128
|
+
"65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d"
|
129
|
+
"a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5"
|
130
|
+
"8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6",
|
131
|
+
127,
|
132
|
+
"5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2",
|
133
|
+
155, 64, 1397645 },
|
134
|
+
{ "a347ae92bce9f80f6f595a4480fc9c2fe7e7d7148d371e9487d75f5c23008ffae0"
|
135
|
+
"65577a928febd9b1973a5a95073acdbeb6a030cfc0d79caa2dc5cd011cef02c08d"
|
136
|
+
"a232d76d52dfbca38ca8dcbd665b17d1665f7cf5fe59772ec909733b24de97d6f5"
|
137
|
+
"8d220b20c60d7c07ec1fd93c52c31020300c6c1facd77937a597c7a6",
|
138
|
+
127,
|
139
|
+
"5541fbc995d5c197ba290346d2c559dedf405cf97e5f95482143202f9e74f5c2",
|
140
|
+
155, 32768, 1397645 },
|
141
|
+
};
|
141
142
|
char passwd[256];
|
142
143
|
unsigned char salt[crypto_pwhash_scryptsalsa208sha256_SALTBYTES];
|
143
144
|
unsigned char out[256];
|
@@ -145,16 +146,15 @@ static void tv2(void)
|
|
145
146
|
size_t i = 0U;
|
146
147
|
|
147
148
|
do {
|
148
|
-
sodium_hex2bin((unsigned char *)passwd, sizeof passwd,
|
149
|
+
sodium_hex2bin((unsigned char *) passwd, sizeof passwd,
|
149
150
|
tests[i].passwd_hex, strlen(tests[i].passwd_hex), NULL,
|
150
151
|
NULL, NULL);
|
151
152
|
sodium_hex2bin(salt, sizeof salt, tests[i].salt_hex,
|
152
153
|
strlen(tests[i].salt_hex), NULL, NULL, NULL);
|
153
154
|
if (crypto_pwhash_scryptsalsa208sha256(
|
154
|
-
out, (unsigned long long) tests[i].outlen,
|
155
|
-
|
156
|
-
|
157
|
-
tests[i].memlimit) != 0) {
|
155
|
+
out, (unsigned long long) tests[i].outlen, passwd,
|
156
|
+
tests[i].passwdlen, (const unsigned char *) salt,
|
157
|
+
tests[i].opslimit, tests[i].memlimit) != 0) {
|
158
158
|
printf("pwhash failure\n");
|
159
159
|
}
|
160
160
|
sodium_bin2hex(out_hex, sizeof out_hex, out, tests[i].outlen);
|
@@ -162,111 +162,109 @@ static void tv2(void)
|
|
162
162
|
} while (++i < (sizeof tests) / (sizeof tests[0]));
|
163
163
|
}
|
164
164
|
|
165
|
-
static void
|
165
|
+
static void
|
166
|
+
tv3(void)
|
166
167
|
{
|
167
168
|
static struct {
|
168
169
|
const char *passwd;
|
169
170
|
const char *out;
|
170
171
|
} tests[] = {
|
171
|
-
|
172
|
-
|
173
|
-
|
174
|
-
|
175
|
-
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
200
|
-
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
172
|
+
{ "^T5H$JYt39n%K*j:W]!1s?vg!:jGi]Ax?..l7[p0v:1jHTpla9;]bUN;?bWyCbtqg "
|
173
|
+
"nrDFal+Jxl3,2`#^tFSu%v_+7iYse8-cCkNf!tD=KrW)",
|
174
|
+
"$7$B6....1....75gBMAGwfFWZqBdyF3WdTQnWdUsuTiWjG1fF9c1jiSD$tc8RoB3."
|
175
|
+
"Em3/zNgMLWo2u00oGIoTyJv4fl3Fl8Tix72" },
|
176
|
+
{ "bl72h6#y<':MFRZ>B IA1=NRkCKS%W8`1I.2uQxJN0g)N N aTt^4K!Iw5r "
|
177
|
+
"H6;crDsv^a55j9tsk'/GqweZn;cdk6+F_St6:#*=?ZCD_lw>.",
|
178
|
+
"$7$A6....3....Iahc6qM0.UQJHVgE4h9oa1/"
|
179
|
+
"4OWlWLm9CCtfguvz6bQD$QnXCo3M7nIqtry2WKsUZ5gQ.mY0wAlJu."
|
180
|
+
"WUhtE8vF66" },
|
181
|
+
{ "Py "
|
182
|
+
">e.5b+tLo@rL`dC2k@eJ&4eVl!W=JJ4+k&mAt@gt',FS1JjqKW3aq21:]^kna`"
|
183
|
+
"mde7kVkN5NrpKUptu)@4*b&?BE_sJMG1=&@`3GBCV]Wg7xwgo7x3El",
|
184
|
+
"$7$96..../....f6bEusKt79kK4wdYN0ki2nw4bJQ7P3rN6k3BSigsK/"
|
185
|
+
"D$Dsvuw7vXj5xijmrb/NOhdgoyK/OiSIYv88cEtl9Cik7" },
|
186
|
+
{ "2vj;Um]FKOL27oam(:Uo8+UmSTvb1FD*h?jk_,S=;RDgF-$Fjk?]9yvfxe@fN^!NN("
|
187
|
+
"Cuml?+2Raa",
|
188
|
+
"$7$86....I....7XwIxLtCx4VphmFeUa6OGuGJrFaIaYzDiLNu/"
|
189
|
+
"tyUPhD$U3q5GCEqCWxMwh.YQHDJrlg7FIZgViv9pcXE3h1vg61" },
|
190
|
+
{ "CT=[9uUoGav,J`kU+348tA50ue#sL:ABZ3QgF+r[#vh:tTOiL>s8tv%,Jeo]jH/"
|
191
|
+
"_4^i(*jD-_ku[9Ko[=86 06V",
|
192
|
+
"$7$A6....2....R3.bjH6YS9wz9z8Jsj.3weGQ3J80ZZElGw2oVux1TP6$"
|
193
|
+
"i5u6lFzXDHaIgYEICinLD6WNaovbiXP8SnLrDRdKgA9" },
|
194
|
+
{ "J#wNn`hDgOpTHNI.w^1a70%f,.9V_m038H_JIJQln`vdWnn/"
|
195
|
+
"rmILR?9H5g(+`;@H(2VosN9Fgk[WEjaBr'yB9Q19-imNa04[Mk5kvGcSn-TV",
|
196
|
+
"$7$B6....1....Dj1y.4mF1J9XmT/6IDskYdCLaPFJTq9xcCwXQ1DpT92$92/"
|
197
|
+
"hYfZLRq1nTLyIz.uc/dC6wLqwnsoqpkadrCXusm6" },
|
198
|
+
{ "j4BS38Asa;p)[K+9TY!3YDj<LK-`nLVXQw9%*QfM",
|
199
|
+
"$7$B6....1....5Ods8mojVwXJq4AywF/uI9BdMSiJ/zT8hQP/"
|
200
|
+
"4cB68VC$nk4ExHNXJ802froj51/1wJTrSZvTIyyK7PecOxRRaz0" },
|
201
|
+
{ "M.R>Qw+!qJb]>pP :_.9`dxM9k [eR7Y!yL-3)sNs[R,j_/^ "
|
202
|
+
"TH=5ny'15>6UXWcQW^6D%XCsO[vN[%ReA-`tV1vW(Nt*0KVK#]45P_A",
|
203
|
+
"$7$B6....1....D/"
|
204
|
+
"eyk8N5y6Z8YVQEsw521cTx.9zzLuK7YDs1KMMh.o4$alfW8ZbsUWnXc."
|
205
|
+
"vqon2zoljVk24Tt1.IsCuo2KurvS2" },
|
206
|
+
{ "K3S=KyH#)36_?]LxeR8QNKw6X=gFb'ai$C%29V* "
|
207
|
+
"tyh^Wo$TN-#Q4qkmtTCf0LLb.^E$0uykkP",
|
208
|
+
"$7$B6....1....CuBuU97xgAage8whp/"
|
209
|
+
"JNKobo0TFbsORGVbfcQIefyP8$aqalP."
|
210
|
+
"XofGViB8EPLONqHma8vs1xc9uTIMYh9CgE.S8" },
|
211
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
212
|
+
"$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
213
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
213
214
|
|
214
|
-
|
215
|
+
/* Invalid pwhash strings */
|
215
216
|
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
225
|
-
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
233
|
-
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
253
|
-
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
264
|
-
|
265
|
-
|
266
|
-
|
267
|
-
};
|
268
|
-
char *out;
|
269
|
-
char *passwd;
|
217
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
218
|
+
"$7$A6....1....$TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4"
|
219
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
220
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
221
|
+
"$7$.6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
222
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
223
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
224
|
+
"$7$A.....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
225
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
226
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
227
|
+
"$7$A6.........TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
228
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
229
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
230
|
+
"$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i44269$"
|
231
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AH" },
|
232
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
233
|
+
"$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
234
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx54269" },
|
235
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
236
|
+
"$7^A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
237
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
238
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
239
|
+
"$7$!6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
240
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
241
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
242
|
+
"$7$A!....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
243
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
244
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
245
|
+
"$7$A6....!....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
246
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
247
|
+
{ "",
|
248
|
+
"$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
249
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
250
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
251
|
+
"$7fA6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4#"
|
252
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
253
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
254
|
+
"$7$AX....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
255
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
256
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
257
|
+
"$7$A6....1!...TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
258
|
+
"a4ik5hGDN7foMuHOW.cp.CtX01UyCeO0.JAG.AHPpx5" },
|
259
|
+
{ "Y0!?iQa9M%5ekffW(`", "$7$A6....1" },
|
260
|
+
{ "Y0!?iQa9M%5ekffW(`", "$7$" },
|
261
|
+
{ "Y0!?iQa9M%5ekffW(`", "" },
|
262
|
+
{ "Y0!?iQa9M%5ekffW(`",
|
263
|
+
"$7$A6....1....TrXs5Zk6s8sWHpQgWDIXTR8kUU3s6Jc3s.DtdS8M2i4$"
|
264
|
+
"" },
|
265
|
+
};
|
266
|
+
char * out;
|
267
|
+
char * passwd;
|
270
268
|
size_t i = 0U;
|
271
269
|
|
272
270
|
do {
|
@@ -276,31 +274,31 @@ static void tv3(void)
|
|
276
274
|
passwd = (char *) sodium_malloc(strlen(tests[i].passwd) + 1U);
|
277
275
|
assert(passwd != NULL);
|
278
276
|
memcpy(passwd, tests[i].passwd, strlen(tests[i].passwd) + 1U);
|
279
|
-
if (crypto_pwhash_scryptsalsa208sha256_str_verify
|
280
|
-
|
281
|
-
printf("pwhash_str failure: [%u]\n", (unsigned int)i);
|
277
|
+
if (crypto_pwhash_scryptsalsa208sha256_str_verify(
|
278
|
+
out, passwd, strlen(passwd)) != 0) {
|
279
|
+
printf("pwhash_str failure: [%u]\n", (unsigned int) i);
|
282
280
|
}
|
283
281
|
sodium_free(out);
|
284
282
|
sodium_free(passwd);
|
285
283
|
} while (++i < (sizeof tests) / (sizeof tests[0]));
|
286
284
|
}
|
287
285
|
|
288
|
-
int
|
286
|
+
int
|
287
|
+
main(void)
|
289
288
|
{
|
290
|
-
char
|
291
|
-
char
|
292
|
-
char
|
289
|
+
char * str_out;
|
290
|
+
char * str_out2;
|
291
|
+
char * salt;
|
293
292
|
const char *passwd = "Correct Horse Battery Staple";
|
294
293
|
|
295
294
|
tv();
|
296
295
|
tv2();
|
297
296
|
tv3();
|
298
|
-
salt = (char *)
|
299
|
-
|
300
|
-
|
301
|
-
|
302
|
-
|
303
|
-
sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES);
|
297
|
+
salt = (char *) sodium_malloc(crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
|
298
|
+
str_out =
|
299
|
+
(char *) sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES);
|
300
|
+
str_out2 =
|
301
|
+
(char *) sodium_malloc(crypto_pwhash_scryptsalsa208sha256_STRBYTES);
|
304
302
|
memcpy(salt, "[<~A 32-bytes salt for scrypt~>]",
|
305
303
|
crypto_pwhash_scryptsalsa208sha256_SALTBYTES);
|
306
304
|
if (crypto_pwhash_scryptsalsa208sha256_str(str_out, passwd, strlen(passwd),
|
@@ -323,17 +321,27 @@ int main(void)
|
|
323
321
|
printf("pwhash_str_verify failure\n");
|
324
322
|
}
|
325
323
|
str_out[14]++;
|
326
|
-
if (crypto_pwhash_scryptsalsa208sha256_str_verify(
|
327
|
-
|
324
|
+
if (crypto_pwhash_scryptsalsa208sha256_str_verify(str_out, passwd,
|
325
|
+
strlen(passwd)) == 0) {
|
328
326
|
printf("pwhash_str_verify(2) failure\n");
|
329
327
|
}
|
330
328
|
str_out[14]--;
|
331
329
|
|
332
330
|
assert(str_out[crypto_pwhash_scryptsalsa208sha256_STRBYTES - 1U] == 0);
|
331
|
+
assert(crypto_pwhash_scryptsalsa208sha256_bytes_min() > 0U);
|
332
|
+
assert(crypto_pwhash_scryptsalsa208sha256_bytes_max() >
|
333
|
+
crypto_pwhash_scryptsalsa208sha256_bytes_min());
|
334
|
+
assert(crypto_pwhash_scryptsalsa208sha256_passwd_max() >
|
335
|
+
crypto_pwhash_scryptsalsa208sha256_passwd_min());
|
333
336
|
assert(crypto_pwhash_scryptsalsa208sha256_saltbytes() > 0U);
|
334
337
|
assert(crypto_pwhash_scryptsalsa208sha256_strbytes() > 1U);
|
335
338
|
assert(crypto_pwhash_scryptsalsa208sha256_strbytes() >
|
336
339
|
strlen(crypto_pwhash_scryptsalsa208sha256_strprefix()));
|
340
|
+
|
341
|
+
assert(crypto_pwhash_scryptsalsa208sha256_opslimit_min() > 0U);
|
342
|
+
assert(crypto_pwhash_scryptsalsa208sha256_opslimit_max() > 0U);
|
343
|
+
assert(crypto_pwhash_scryptsalsa208sha256_memlimit_min() > 0U);
|
344
|
+
assert(crypto_pwhash_scryptsalsa208sha256_memlimit_max() > 0U);
|
337
345
|
assert(crypto_pwhash_scryptsalsa208sha256_opslimit_interactive() > 0U);
|
338
346
|
assert(crypto_pwhash_scryptsalsa208sha256_memlimit_interactive() > 0U);
|
339
347
|
assert(crypto_pwhash_scryptsalsa208sha256_opslimit_sensitive() > 0U);
|