From b7187880b48e5e2f080c2a0cc43455d8d32fa3df Mon Sep 17 00:00:00 2001 From: Joe Birr-Pixton Date: Wed, 3 Jul 2024 10:12:54 +0100 Subject: [PATCH] add ecdsa+eddsa for aes-256 suite tests This is suite used for comparative handshake benchmarks with openssl. --- admin/bench-measure.mk | 1 + rustls/examples/internal/bench_impl.rs | 18 +++++++++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/admin/bench-measure.mk b/admin/bench-measure.mk index 5567ad1e..0cdcf627 100644 --- a/admin/bench-measure.mk +++ b/admin/bench-measure.mk @@ -31,6 +31,7 @@ measure: $(BENCH) $^ bulk TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256 $^ bulk TLS13_AES_256_GCM_SHA384 $^ handshake TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 + $^ handshake TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384 $^ handshake-resume TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 $^ handshake-ticket TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 $^ handshake TLS13_AES_256_GCM_SHA384 diff --git a/rustls/examples/internal/bench_impl.rs b/rustls/examples/internal/bench_impl.rs index dc7e0cf8..7cae53de 100644 --- a/rustls/examples/internal/bench_impl.rs +++ b/rustls/examples/internal/bench_impl.rs @@ -1127,7 +1127,7 @@ static ALL_BENCHMARKS: &[BenchmarkParam] = &[ #[cfg(feature = "tls12")] BenchmarkParam::new( KeyType::EcdsaP256, - cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256, + cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, &rustls::version::TLS12, ), #[cfg(feature = "tls12")] @@ -1136,6 +1136,12 @@ static ALL_BENCHMARKS: &[BenchmarkParam] = &[ cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, &rustls::version::TLS12, ), + #[cfg(feature = "tls12")] + BenchmarkParam::new( + KeyType::Ed25519, + cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384, + &rustls::version::TLS12, + ), #[cfg(not(feature = "fips"))] BenchmarkParam::new( KeyType::Rsa2048, @@ -1147,6 +1153,16 @@ static ALL_BENCHMARKS: &[BenchmarkParam] = &[ cipher_suite::TLS13_AES_256_GCM_SHA384, &rustls::version::TLS13, ), + BenchmarkParam::new( + KeyType::EcdsaP256, + cipher_suite::TLS13_AES_256_GCM_SHA384, + &rustls::version::TLS13, + ), + BenchmarkParam::new( + KeyType::Ed25519, + cipher_suite::TLS13_AES_256_GCM_SHA384, + &rustls::version::TLS13, + ), BenchmarkParam::new( KeyType::Rsa2048, cipher_suite::TLS13_AES_128_GCM_SHA256,