b529253bea
This imports upstream's scrypt implementation, though it's been heavily revised. I lost track of words vs. blocks vs. bigger blocks too many times in the original code and introduced a typedef for the fixed-width Salsa20 blocks. The downside is going from bytes to blocks is a bit trickier, so I took advantage of our little-endian assumption. This also adds an missing check for N < 2^32. Upstream's code is making this assumption in Integerify. I'll send that change back upstream. I've also removed the weird edge case where a NULL out_key parameter means to validate N/r/p against max_mem and nothing else. That's just in there to get a different error code out of their PKCS#12 code. Performance-wise, the cleanup appears to be the same (up to what little precision I was able to get here), but an optimization to use bitwise AND rather than modulus makes us measurably faster. Though scrypt isn't a fast operation to begin with, so hopefully it isn't anyone's bottleneck. This CL does not route scrypt up to the PKCS#12 code, though we could write our own version of that if we need to later. BUG=chromium:731993 Change-Id: Ib2f43344017ed37b6bafd85a2c2b103d695020b8 Reviewed-on: https://boringssl-review.googlesource.com/17084 Reviewed-by: Adam Langley <agl@google.com>
53 lines
2.3 KiB
CMake
53 lines
2.3 KiB
CMake
# This file contains source lists that are also consumed by
|
|
# generate_build_files.py.
|
|
#
|
|
# TODO(davidben): Move the other source lists into this file.
|
|
|
|
set(
|
|
CRYPTO_TEST_DATA
|
|
|
|
crypto/cipher_extra/test/aes_128_cbc_sha1_ssl3_tests.txt
|
|
crypto/cipher_extra/test/aes_128_cbc_sha1_tls_implicit_iv_tests.txt
|
|
crypto/cipher_extra/test/aes_128_cbc_sha1_tls_tests.txt
|
|
crypto/cipher_extra/test/aes_128_cbc_sha256_tls_tests.txt
|
|
crypto/cipher_extra/test/aes_128_ctr_hmac_sha256.txt
|
|
crypto/cipher_extra/test/aes_128_gcm_siv_tests.txt
|
|
crypto/cipher_extra/test/aes_128_gcm_tests.txt
|
|
crypto/cipher_extra/test/aes_256_cbc_sha1_ssl3_tests.txt
|
|
crypto/cipher_extra/test/aes_256_cbc_sha1_tls_implicit_iv_tests.txt
|
|
crypto/cipher_extra/test/aes_256_cbc_sha1_tls_tests.txt
|
|
crypto/cipher_extra/test/aes_256_cbc_sha256_tls_tests.txt
|
|
crypto/cipher_extra/test/aes_256_cbc_sha384_tls_tests.txt
|
|
crypto/cipher_extra/test/aes_256_ctr_hmac_sha256.txt
|
|
crypto/cipher_extra/test/aes_256_gcm_siv_tests.txt
|
|
crypto/cipher_extra/test/aes_256_gcm_tests.txt
|
|
crypto/cipher_extra/test/chacha20_poly1305_tests.txt
|
|
crypto/cipher_extra/test/cipher_tests.txt
|
|
crypto/cipher_extra/test/des_ede3_cbc_sha1_ssl3_tests.txt
|
|
crypto/cipher_extra/test/des_ede3_cbc_sha1_tls_implicit_iv_tests.txt
|
|
crypto/cipher_extra/test/des_ede3_cbc_sha1_tls_tests.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_128_cbc.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_128_ctr.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_128_gcm.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_192_cbc.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_192_ctr.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_256_cbc.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_256_ctr.txt
|
|
crypto/cipher_extra/test/nist_cavp/aes_256_gcm.txt
|
|
crypto/cipher_extra/test/nist_cavp/tdes_cbc.txt
|
|
crypto/cipher_extra/test/nist_cavp/tdes_ecb.txt
|
|
crypto/curve25519/ed25519_tests.txt
|
|
crypto/ecdh/ecdh_tests.txt
|
|
crypto/evp/evp_tests.txt
|
|
crypto/evp/scrypt_tests.txt
|
|
crypto/fipsmodule/aes/aes_tests.txt
|
|
crypto/fipsmodule/bn/bn_tests.txt
|
|
crypto/fipsmodule/ec/p256-x86_64_tests.txt
|
|
crypto/fipsmodule/ecdsa/ecdsa_sign_tests.txt
|
|
crypto/fipsmodule/ecdsa/ecdsa_verify_tests.txt
|
|
crypto/fipsmodule/modes/gcm_tests.txt
|
|
crypto/fipsmodule/rand/ctrdrbg_vectors.txt
|
|
crypto/hmac_extra/hmac_tests.txt
|
|
crypto/poly1305/poly1305_tests.txt
|
|
)
|