Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing algorithms to benchmark #2056

Merged
merged 9 commits into from
Mar 8, 2025
Merged

Add missing algorithms to benchmark #2056

Changes from 7 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
15d890e
Add missing algorithms
nhatnghiho Dec 11, 2024
7cba6d2
Fix memory issue
nhatnghiho Dec 12, 2024
e1125cd
Merge branch 'main' into benchmark-algo-update
nhatnghiho Dec 12, 2024
935383d
Exclude unsupported algs from older library versions
nhatnghiho Dec 13, 2024
9fb0005
Fix incomplete type issue
nhatnghiho Dec 13, 2024
0aeac07
Merge branch 'main' into benchmark-algo-update
justsmth Dec 30, 2024
f762ee9
Merge branch 'main' into benchmark-algo-update
justsmth Feb 20, 2025
a516372
Merge remote-tracking branch 'upstream/main' into benchmark-algo-update
nhatnghiho Mar 7, 2025
7945aca
Fix more algs
nhatnghiho Mar 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion tool/speed.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,8 @@ static bool SpeedHashChunk(const EVP_MD *md, std::string name,

return EVP_DigestInit_ex(ctx.get(), md, NULL /* ENGINE */) &&
EVP_DigestUpdate(ctx.get(), input.get(), chunk_len) &&
EVP_DigestFinal_ex(ctx.get(), digest, &md_len);
(EVP_MD_flags(md) & EVP_MD_FLAG_XOF) ?
EVP_DigestFinalXOF(ctx.get(), digest, 32) : EVP_DigestFinal_ex(ctx.get(), digest, &md_len);
})) {
fprintf(stderr, "EVP_DigestInit_ex failed.\n");
ERR_print_errors_fp(stderr);
Expand Down Expand Up @@ -2805,11 +2806,13 @@ bool Speed(const std::vector<std::string> &args) {
!SpeedEvpCipherGeneric(EVP_aes_192_ctr(), "EVP-AES-192-CTR", kTLSADLen, selected) ||
!SpeedEvpCipherGeneric(EVP_aes_256_ctr(), "EVP-AES-256-CTR", kTLSADLen, selected) ||
!SpeedAES256XTS("AES-256-XTS", selected) ||
!SpeedEvpCipherGeneric(EVP_rc4(), "EVP-RC4", kTLSADLen, selected) ||
// OpenSSL 3.0 doesn't allow MD4 calls
#if !defined(OPENSSL_3_0_BENCHMARK)
!SpeedHash(EVP_md4(), "MD4", selected) ||
#endif
!SpeedHash(EVP_md5(), "MD5", selected) ||
!SpeedHash(EVP_md5_sha1(), "MD5-SHA-1", selected) ||
!SpeedHash(EVP_sha1(), "SHA-1", selected) ||
!SpeedHash(EVP_sha224(), "SHA-224", selected) ||
!SpeedHash(EVP_sha256(), "SHA-256", selected) ||
Expand All @@ -2821,6 +2824,15 @@ bool Speed(const std::vector<std::string> &args) {
!SpeedHash(EVP_sha3_256(), "SHA3-256", selected) ||
!SpeedHash(EVP_sha3_384(), "SHA3-384", selected) ||
!SpeedHash(EVP_sha3_512(), "SHA3-512", selected) ||
#endif
#if (!defined(OPENSSL_1_0_BENCHMARK) && !defined(BORINGSSL_BENCHMARK) && !defined(OPENSSL_IS_AWSLC)) || AWSLC_API_VERSION >= 31
// OpenSSL 1.0 and BoringSSL don't support SHAKE
!SpeedHash(EVP_shake128(), "SHAKE-128", selected) ||
!SpeedHash(EVP_shake256(), "SHAKE-256", selected) ||
#endif
#if (!defined(BORINGSSL_BENCHMARK) && !defined(OPENSSL_IS_AWSLC)) || AWSLC_API_VERSION >= 20
// BoringSSL doesn't support ripemd160
!SpeedHash(EVP_ripemd160(), "RIPEMD-160", selected) ||
#endif
!SpeedHmac(EVP_md5(), "HMAC-MD5", selected) ||
!SpeedHmac(EVP_sha1(), "HMAC-SHA1", selected) ||
Expand Down
Loading