Add different certificate signature algorithms to benchmarks

bindings/rust/bench/.gitignore

@@ -0,0 +1 @@
+*.pem

bindings/rust/bench/README.md

@@ -4,7 +4,7 @@ We use to Criterion.rs to benchmark s2n-tls against two commonly used TLS librar
 
 ## Setup 
 
-Setup is easy! Just have OpenSSL installed and generate Rust bindings for s2n-tls using `bindings/rust/generate.sh`.
+Setup is easy! Just have OpenSSL installed, generate Rust bindings for s2n-tls using `../generate.sh`, and generate certs using `certs/generate_certs.sh`.
 
 ## Running benchmarks
 
@@ -20,7 +20,7 @@ To remove external factors, we use custom IO with our benchmarks, bypassing the
 
 ### Certificate generation
 
-All certs are stored in `certs/` and can be regenerated using `certs/generate_certs.sh`. There is one root cert that directly signs the server and client certs that are used in benchmarking. Currently, we use ECDSA with `secp384r1`.
+There is one root cert that directly signs the server and client certs that are used in benchmarking. We currently bench RSA and ECDSA certs.
 
 ### Negotiation parameters
 

bindings/rust/bench/benches/handshake.rs

@@ -2,10 +2,12 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use bench::{
-    CryptoConfig,
+    CipherSuite, CryptoConfig,
     ECGroup::{self, *},
     HandshakeType::{self, *},
-    OpenSslHarness, RustlsHarness, S2NHarness, TlsBenchHarness,
+    OpenSslHarness, RustlsHarness, S2NHarness,
+    SigType::{self, *},
+    TlsBenchHarness,
 };
 use criterion::{
     criterion_group, criterion_main, measurement::WallTime, BatchSize, BenchmarkGroup, Criterion,
@@ -17,15 +19,13 @@ pub fn bench_handshake_params(c: &mut Criterion) {
         bench_group: &mut BenchmarkGroup<WallTime>,
         handshake_type: HandshakeType,
         ec_group: ECGroup,
+        sig_type: SigType,
     ) {
         bench_group.bench_function(type_name::<T>(), |b| {
             b.iter_batched_ref(
                 || {
                     T::new(
-                        CryptoConfig {
-                            cipher_suite: Default::default(),
-                            ec_group,
-                        },
+                        CryptoConfig::new(CipherSuite::default(), ec_group, sig_type),
                         handshake_type,
                     )
                     .unwrap()
@@ -40,19 +40,30 @@ pub fn bench_handshake_params(c: &mut Criterion) {
 
     for handshake_type in [ServerAuth, MutualAuth] {
         for ec_group in [SECP256R1, X25519] {
-            let mut bench_group =
-                c.benchmark_group(format!("handshake-{:?}-{:?}", handshake_type, ec_group));
-            bench_handshake_for_library::<S2NHarness>(&mut bench_group, handshake_type, ec_group);
-            bench_handshake_for_library::<RustlsHarness>(
-                &mut bench_group,
-                handshake_type,
-                ec_group,
-            );
-            bench_handshake_for_library::<OpenSslHarness>(
-                &mut bench_group,
-                handshake_type,
-                ec_group,
-            );
+            for sig_type in [Rsa2048, Rsa3072, Rsa4096, Ec384] {
+                let mut bench_group = c.benchmark_group(format!(
+                    "handshake-{:?}-{:?}-{:?}",
+                    handshake_type, ec_group, sig_type
+                ));
+                bench_handshake_for_library::<S2NHarness>(
+                    &mut bench_group,
+                    handshake_type,
+                    ec_group,
+                    sig_type,
+                );
+                bench_handshake_for_library::<RustlsHarness>(
+                    &mut bench_group,
+                    handshake_type,
+                    ec_group,
+                    sig_type,
+                );
+                bench_handshake_for_library::<OpenSslHarness>(
+                    &mut bench_group,
+                    handshake_type,
+                    ec_group,
+                    sig_type,
+                );
+            }
         }
     }
 }

bindings/rust/bench/benches/throughput.rs

@@ -3,7 +3,8 @@
 
 use bench::{
     CipherSuite::{self, *},
-    CryptoConfig, OpenSslHarness, RustlsHarness, S2NHarness, TlsBenchHarness,
+    CryptoConfig, ECGroup, HandshakeType, OpenSslHarness, RustlsHarness, S2NHarness, SigType,
+    TlsBenchHarness,
 };
 use criterion::{
     criterion_group, criterion_main, measurement::WallTime, BatchSize, BenchmarkGroup, Criterion,
@@ -24,11 +25,8 @@ pub fn bench_throughput_cipher_suite(c: &mut Criterion) {
             b.iter_batched_ref(
                 || {
                     let mut harness = T::new(
-                        CryptoConfig {
-                            cipher_suite,
-                            ec_group: Default::default(),
-                        },
-                        Default::default(),
+                        CryptoConfig::new(cipher_suite, ECGroup::default(), SigType::default()),
+                        HandshakeType::default(),
                     )
                     .unwrap();
                     harness.handshake().unwrap();

bindings/rust/bench/certs/generate_certs.sh

@@ -6,36 +6,59 @@
 # immediately bail if any command fails
 set -e
 
+# go to directory script is located in
 pushd "$(dirname "$0")"
 
-echo "generating CA private key and certificate"
-openssl req -nodes -new -x509 -keyout ca-key.pem -out ca-cert.pem -days 65536 -config config/ca.cnf
+# Generates certs with given algorithms and bits in $1$2/, ex. ec384/
+# $1: rsa or ec
+# $2: number of bits
+cert-gen () {
+    echo -e "\n----- generating certs for $1$2 -----\n"
 
-# secp384r1 is an arbitrarily chosen curve that is supported by the default
-# security policy in s2n-tls.
-# https://github.com/aws/s2n-tls/blob/main/docs/USAGE-GUIDE.md#chart-security-policy-version-to-supported-curvesgroups
-echo "generating server private key and CSR"
-openssl req  -new -nodes -newkey ec -pkeyopt ec_paramgen_curve:secp384r1 -keyout server-key.pem -out server.csr -config config/server.cnf
+    key_family=$1
+    key_size=$2
 
-echo "generating client private key and CSR"
-openssl req  -new -nodes -newkey ec -pkeyopt ec_paramgen_curve:secp384r1 -keyout client-key.pem -out client.csr -config config/client.cnf
+    # set openssl argument name
+    if [[ $key_family == rsa ]]; then
+        local argname=rsa_keygen_bits:
+    elif [[ $key_family == ec ]]; then
+        local argname=ec_paramgen_curve:P-
+    fi
 
-echo "generating server certificate and signing it"
-openssl x509 -days 65536 -req -in server.csr -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out server-cert.pem -extensions req_ext -extfile config/server.cnf
+    # make directory for certs
+    mkdir -p $key_family$key_size
+    cd $key_family$key_size
 
-echo "generating client certificate and signing it"
-openssl x509 -days 65536 -req -in client.csr -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out client-cert.pem -extensions req_ext -extfile config/client.cnf
+    echo "generating CA private key and certificate"
+    openssl req -new -nodes -x509 -newkey $key_family -pkeyopt $argname$key_size -keyout  ca-key.pem -out ca-cert.pem -days 65536 -config ../config/ca.cnf
 
-echo "verifying generated certificates"
-openssl verify -CAfile ca-cert.pem server-cert.pem
-openssl verify -CAfile ca-cert.pem client-cert.pem
+    echo "generating server private key and CSR"
+    openssl req  -new -nodes -newkey $key_family -pkeyopt $argname$key_size -keyout server-key.pem -out server.csr -config ../config/server.cnf
 
-cat server-cert.pem ca-cert.pem > server-fullchain.pem
-cat client-cert.pem ca-cert.pem > client-fullchain.pem
+    echo "generating client private key and CSR"
+    openssl req  -new -nodes -newkey $key_family -pkeyopt $argname$key_size -keyout client-key.pem -out client.csr -config ../config/client.cnf
 
-echo "cleaning up temporary files"
-rm server.csr
-rm client.csr
-rm ca-key.pem
+    echo "generating server certificate and signing it"
+    openssl x509 -days 65536 -req -in server.csr -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out server-cert.pem -extensions req_ext -extfile ../config/server.cnf
+
+    echo "generating client certificate and signing it"
+    openssl x509 -days 65536 -req -in client.csr -CA ca-cert.pem -CAkey ca-key.pem -CAcreateserial -out client-cert.pem -extensions req_ext -extfile ../config/client.cnf
+
+    echo "verifying generated certificates"
+    openssl verify -CAfile ca-cert.pem server-cert.pem
+    openssl verify -CAfile ca-cert.pem client-cert.pem
+
+    echo "cleaning up temporary files"
+    rm server.csr
+    rm client.csr
+    rm ca-key.pem
+
+    cd ..
+}
+
+cert-gen ec 384
+cert-gen rsa 2048
+cert-gen rsa 3072
+cert-gen rsa 4096
 
 popd