Refactored: Moved Variable provider to new branch feature/variable_provider

Author: kraemv

.github/workflows/libssl.yaml

@@ -261,7 +261,7 @@ jobs:
           make package-${{ matrix.package }} PROFILE=release
 
       - name: Archive package
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v5
         with:
           name: ${{ matrix.package }} package built on ${{ matrix.container }} ${{ matrix.version }}
           path: target/dist/*.${{ matrix.package }}

src/lib.rs

@@ -13,9 +13,7 @@ use openssl_sys::{
 };
 
 use rustls::client::Resumption;
-use rustls::crypto::aws_lc_rs as provider;
-use rustls::crypto::aws_lc_rs::Ticketer;
-use rustls::crypto::SupportedKxGroup;
+use rustls::crypto::{aws_lc_rs as provider, SupportedKxGroup};
 use rustls::pki_types::{CertificateDer, ServerName};
 use rustls::server::{Accepted, Acceptor, ProducesTickets};
 use rustls::{
@@ -103,7 +101,7 @@ pub struct SslCipher {
     pub standard_name: &'static CStr,
     pub version: &'static CStr,
     pub description: &'static CStr,
-    pub rustls: CipherSuite,
+    rustls: &'static rustls::SupportedCipherSuite,
 }
 
 impl SslCipher {
@@ -135,7 +133,7 @@ impl SslCipher {
     }
 
     pub fn protocol_id(&self) -> u16 {
-        u16::from(self.rustls)
+        u16::from(self.rustls.suite())
     }
 
     pub fn openssl_id(&self) -> u32 {
@@ -144,102 +142,102 @@ impl SslCipher {
 }
 
 static TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
     auth: constants::NID_AUTH_ECDSA,
     kx: constants::NID_KX_ECDHE,
     bits: 128,
     openssl_name: c"ECDHE-ECDSA-AES128-GCM-SHA256",
     standard_name: c"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
     version: c"TLSv1.2",
     description: c"ECDHE-ECDSA-AES128-GCM-SHA256  TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AESGCM(128)            Mac=AEAD\n",
-    rustls: CipherSuite::TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
 };
 
 static TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
     auth: constants::NID_AUTH_ECDSA,
     kx: constants::NID_KX_ECDHE,
     bits: 256,
     openssl_name: c"ECDHE-ECDSA-AES256-GCM-SHA384",
     standard_name: c"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
     version: c"TLSv1.2",
     description: c"ECDHE-ECDSA-AES256-GCM-SHA384  TLSv1.2 Kx=ECDH     Au=ECDSA Enc=AESGCM(256)            Mac=AEAD\n",
-    rustls: CipherSuite::TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,
 };
 
 static TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
     auth: constants::NID_AUTH_ECDSA,
     kx: constants::NID_KX_ECDHE,
     bits: 256,
     openssl_name: c"ECDHE-ECDSA-CHACHA20-POLY1305",
     standard_name: c"TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256",
-    rustls: CipherSuite::TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305_SHA256,
     version: c"TLSv1.2",
     description: c"ECDHE-ECDSA-CHACHA20-POLY1305  TLSv1.2 Kx=ECDH     Au=ECDSA Enc=CHACHA20/POLY1305(256) Mac=AEAD\n",
 };
 
 static TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
     auth: constants::NID_AUTH_RSA,
     kx: constants::NID_KX_ECDHE,
     bits: 128,
     openssl_name: c"ECDHE-RSA-AES128-GCM-SHA256",
     standard_name: c"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
     version: c"TLSv1.2",
     description: c"ECDHE-RSA-AES128-GCM-SHA256    TLSv1.2 Kx=ECDH     Au=RSA   Enc=AESGCM(128)            Mac=AEAD\n",
-    rustls: CipherSuite::TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
 };
 
 static TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
     auth: constants::NID_AUTH_RSA,
     kx: constants::NID_KX_ECDHE,
     bits: 256,
     openssl_name: c"ECDHE-RSA-AES256-GCM-SHA384",
     standard_name: c"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
     version: c"TLSv1.2",
     description: c"ECDHE-RSA-AES256-GCM-SHA384    TLSv1.2 Kx=ECDH     Au=RSA   Enc=AESGCM(256)            Mac=AEAD\n",
-    rustls: CipherSuite::TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
 };
 
 static TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
     auth: constants::NID_AUTH_RSA,
     kx: constants::NID_KX_ECDHE,
     bits: 256,
     openssl_name: c"ECDHE-RSA-CHACHA20-POLY1305",
     standard_name: c"TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256",
     version: c"TLSv1.2",
     description: c"ECDHE-RSA-CHACHA20-POLY1305    TLSv1.2 Kx=ECDH     Au=RSA   Enc=CHACHA20/POLY1305(256) Mac=AEAD\n",
-    rustls: CipherSuite::TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305_SHA256,
 };
 
 static TLS13_AES_128_GCM_SHA256: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS13_AES_128_GCM_SHA256,
     auth: constants::NID_AUTH_ANY,
     kx: constants::NID_KX_ANY,
     bits: 128,
     openssl_name: c"TLS_AES_128_GCM_SHA256",
     standard_name: c"TLS_AES_128_GCM_SHA256",
     version: c"TLSv1.3",
     description: c"TLS_AES_128_GCM_SHA256         TLSv1.3 Kx=any      Au=any   Enc=AESGCM(128)            Mac=AEAD\n",
-    rustls: CipherSuite::TLS13_AES_128_GCM_SHA256,
 };
 
 static TLS13_AES_256_GCM_SHA384: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS13_AES_256_GCM_SHA384,
     auth: constants::NID_AUTH_ANY,
     kx: constants::NID_KX_ANY,
     bits: 256,
     openssl_name: c"TLS_AES_256_GCM_SHA384",
     standard_name: c"TLS_AES_256_GCM_SHA384",
     version: c"TLSv1.3",
     description: c"TLS_AES_256_GCM_SHA384         TLSv1.3 Kx=any      Au=any   Enc=AESGCM(256)            Mac=AEAD\n",
-    rustls: CipherSuite::TLS13_AES_256_GCM_SHA384,
 };
 
 static TLS13_CHACHA20_POLY1305_SHA256: SslCipher = SslCipher {
+    rustls: &provider::cipher_suite::TLS13_CHACHA20_POLY1305_SHA256,
     auth: constants::NID_AUTH_ANY,
     kx: constants::NID_KX_ANY,
     bits: 256,
     openssl_name: c"TLS_CHACHA20_POLY1305_SHA256",
     standard_name: c"TLS_CHACHA20_POLY1305_SHA256",
     version: c"TLSv1.3",
     description: c"TLS_CHACHA20_POLY1305_SHA256   TLSv1.3 Kx=any      Au=any   Enc=CHACHA20/POLY1305(256) Mac=AEAD\n",
-    rustls: CipherSuite::TLS13_CHACHA20_POLY1305_SHA256,
 };
 
 #[allow(dead_code)]
@@ -624,7 +622,7 @@ impl SslContext {
         // a ticketer. Doing so is wasteful for a client, and incompatible with miri
         // (due to calls to a foreign function, `RAND_bytes`).
         let ticketer = match !method.server_versions.is_empty() && cfg!(not(miri)) {
-            true => Ticketer::new().ok(),
+            true => provider::Ticketer::new().ok(),
             false => None,
         };
         Self {