From 9f5ca713895a2d16e5c63a4d2c0d8d76da1f2103 Mon Sep 17 00:00:00 2001 From: Daniel McCarney Date: Sat, 28 Dec 2024 10:35:24 -0500 Subject: [PATCH] replace aws_lc_rs feat with aws-lc-rs We made a mistake using underscores in the original Rustls and Webpki features. We patched over this in Rustls with an alias. Since we're making semver incompat changes, let's fix it here properly. --- .github/workflows/ci.yml | 10 +++--- Cargo.toml | 2 +- src/lib.rs | 38 ++++++++++---------- src/verify_cert.rs | 2 +- tests/better_tls.rs | 4 +-- tests/client_auth.rs | 2 +- tests/client_auth_revocation.rs | 4 +-- tests/custom_ekus.rs | 2 +- tests/generate.py | 6 ++-- tests/integration.rs | 2 +- tests/signatures.rs | 64 ++++++++++++++++----------------- tests/tls_server_certs.rs | 2 +- 12 files changed, 69 insertions(+), 69 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7c0b92ec..83aadb75 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -111,7 +111,7 @@ jobs: - --features=alloc - --all-features - --no-default-features - - --no-default-features --features alloc,std,aws_lc_rs + - --no-default-features --features alloc,std,aws-lc-rs mode: - # debug @@ -127,7 +127,7 @@ jobs: - features: --features=alloc - features: --no-default-features - features: --no-default-features --features alloc,std - - features: --no-default-features --features alloc,std,aws_lc_rs + - features: --no-default-features --features alloc,std,aws-lc-rs - features: --all-features mode: --release - features: --all-features @@ -189,17 +189,17 @@ jobs: host_os: ubuntu-latest # check aws-lc-rs alone - - features: --no-default-features --features alloc,std,aws_lc_rs + - features: --no-default-features --features alloc,std,aws-lc-rs mode: # debug rust_channel: stable host_os: macos-latest - - features: --no-default-features --features alloc,std,aws_lc_rs + - features: --no-default-features --features alloc,std,aws-lc-rs mode: # debug rust_channel: stable host_os: windows-latest - - features: --no-default-features --features alloc,std,aws_lc_rs + - features: --no-default-features --features alloc,std,aws-lc-rs mode: # debug rust_channel: stable host_os: ubuntu-latest diff --git a/Cargo.toml b/Cargo.toml index cf50ea47..0eccea16 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -75,7 +75,7 @@ name = "webpki" [features] default = ["std", "ring"] alloc = ["ring?/alloc", "pki-types/alloc"] -aws_lc_rs = ["dep:aws-lc-rs"] +aws-lc-rs = ["dep:aws-lc-rs"] ring = ["dep:ring"] std = ["alloc", "pki-types/std"] diff --git a/src/lib.rs b/src/lib.rs index 3ed2a8c4..4c831703 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -24,7 +24,7 @@ //! | `alloc` | Enable features that require use of the heap. Currently all RSA signature algorithms require this feature. | //! | `std` | Enable features that require libstd. Implies `alloc`. | //! | `ring` | Enable use of the *ring* crate for cryptography. | -//! | `aws_lc_rs` | Enable use of the aws-lc-rs crate for cryptography. | +//! | `aws-lc-rs` | Enable use of the aws-lc-rs crate for cryptography. Previously this feature was named `aws_lc_rs`. | #![no_std] #![warn(elided_lifetimes_in_paths, unreachable_pub, clippy::use_self)] @@ -51,7 +51,7 @@ extern crate alloc; #[macro_use] mod der; -#[cfg(feature = "aws_lc_rs")] +#[cfg(feature = "aws-lc-rs")] mod aws_lc_rs_algs; mod cert; mod end_entity; @@ -107,7 +107,7 @@ pub mod ring { }; } -#[cfg(feature = "aws_lc_rs")] +#[cfg(feature = "aws-lc-rs")] /// Signature verification algorithm implementations using the aws-lc-rs crypto library. pub mod aws_lc_rs { pub use super::aws_lc_rs_algs::{ @@ -121,7 +121,7 @@ pub mod aws_lc_rs { /// An array of all the verification algorithms exported by this crate. /// -/// This will be empty if the crate is built without the `ring` and `aws_lc_rs` features. +/// This will be empty if the crate is built without the `ring` and `aws-lc-rs` features. pub static ALL_VERIFICATION_ALGS: &[&dyn types::SignatureVerificationAlgorithm] = &[ #[cfg(feature = "ring")] ring::ECDSA_P256_SHA256, @@ -147,35 +147,35 @@ pub static ALL_VERIFICATION_ALGS: &[&dyn types::SignatureVerificationAlgorithm] ring::RSA_PSS_2048_8192_SHA384_LEGACY_KEY, #[cfg(all(feature = "ring", feature = "alloc"))] ring::RSA_PSS_2048_8192_SHA512_LEGACY_KEY, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P256_SHA256, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P256_SHA384, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P384_SHA256, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P384_SHA384, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P521_SHA256, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P521_SHA384, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ECDSA_P521_SHA512, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::ED25519, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PKCS1_2048_8192_SHA256, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PKCS1_2048_8192_SHA384, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PKCS1_2048_8192_SHA512, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PKCS1_3072_8192_SHA384, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PSS_2048_8192_SHA256_LEGACY_KEY, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PSS_2048_8192_SHA384_LEGACY_KEY, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] aws_lc_rs::RSA_PSS_2048_8192_SHA512_LEGACY_KEY, ]; diff --git a/src/verify_cert.rs b/src/verify_cert.rs index 6d3b2a95..cb787feb 100644 --- a/src/verify_cert.rs +++ b/src/verify_cert.rs @@ -695,7 +695,7 @@ pub(crate) enum Role { EndEntity, } -#[cfg(all(test, feature = "alloc", any(feature = "ring", feature = "aws_lc_rs")))] +#[cfg(all(test, feature = "alloc", any(feature = "ring", feature = "aws-lc-rs")))] mod tests { use super::*; use crate::test_utils; diff --git a/tests/better_tls.rs b/tests/better_tls.rs index 6dd4287e..e1cfce65 100644 --- a/tests/better_tls.rs +++ b/tests/better_tls.rs @@ -1,4 +1,4 @@ -#![cfg(any(feature = "ring", feature = "aws_lc_rs"))] +#![cfg(any(feature = "ring", feature = "aws-lc-rs"))] use core::time::Duration; use std::collections::HashMap; @@ -16,7 +16,7 @@ use webpki::{anchor_from_trusted_cert, KeyUsage}; static ALGS: &[&dyn SignatureVerificationAlgorithm] = &[ #[cfg(feature = "ring")] webpki::ring::ECDSA_P256_SHA256, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] webpki::aws_lc_rs::ECDSA_P256_SHA256, ]; diff --git a/tests/client_auth.rs b/tests/client_auth.rs index a92c7776..37ef8d6f 100644 --- a/tests/client_auth.rs +++ b/tests/client_auth.rs @@ -12,7 +12,7 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![cfg(all(feature = "alloc", any(feature = "ring", feature = "aws_lc_rs")))] +#![cfg(all(feature = "alloc", any(feature = "ring", feature = "aws-lc-rs")))] use core::time::Duration; use pki_types::{CertificateDer, UnixTime}; diff --git a/tests/client_auth_revocation.rs b/tests/client_auth_revocation.rs index a5ab7db8..016b5e2e 100644 --- a/tests/client_auth_revocation.rs +++ b/tests/client_auth_revocation.rs @@ -12,7 +12,7 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![cfg(any(feature = "ring", feature = "aws_lc_rs"))] +#![cfg(any(feature = "ring", feature = "aws-lc-rs"))] use core::time::Duration; @@ -25,7 +25,7 @@ use webpki::{ static ALGS: &[&dyn SignatureVerificationAlgorithm] = &[ #[cfg(feature = "ring")] webpki::ring::ECDSA_P256_SHA256, - #[cfg(feature = "aws_lc_rs")] + #[cfg(feature = "aws-lc-rs")] webpki::aws_lc_rs::ECDSA_P256_SHA256, ]; diff --git a/tests/custom_ekus.rs b/tests/custom_ekus.rs index 9d4465ca..fb6f5bb1 100644 --- a/tests/custom_ekus.rs +++ b/tests/custom_ekus.rs @@ -1,4 +1,4 @@ -#![cfg(all(feature = "alloc", any(feature = "ring", feature = "aws_lc_rs")))] +#![cfg(all(feature = "alloc", any(feature = "ring", feature = "aws-lc-rs")))] use core::time::Duration; diff --git a/tests/generate.py b/tests/generate.py index 954b8281..4b016068 100755 --- a/tests/generate.py +++ b/tests/generate.py @@ -561,9 +561,9 @@ def signatures(force: bool) -> None: } feature_gates = { - "ECDSA_P521_SHA256": 'all(not(feature = "ring"), feature = "aws_lc_rs")', - "ECDSA_P521_SHA384": 'all(not(feature = "ring"), feature = "aws_lc_rs")', - "ECDSA_P521_SHA512": 'all(not(feature = "ring"), feature = "aws_lc_rs")', + "ECDSA_P521_SHA256": 'all(not(feature = "ring"), feature = "aws-lc-rs")', + "ECDSA_P521_SHA384": 'all(not(feature = "ring"), feature = "aws-lc-rs")', + "ECDSA_P521_SHA512": 'all(not(feature = "ring"), feature = "aws-lc-rs")', } rsa_types: list[str] = [ diff --git a/tests/integration.rs b/tests/integration.rs index 759051f4..ee1a32da 100644 --- a/tests/integration.rs +++ b/tests/integration.rs @@ -12,7 +12,7 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![cfg(any(feature = "ring", feature = "aws_lc_rs"))] +#![cfg(any(feature = "ring", feature = "aws-lc-rs"))] use core::time::Duration; diff --git a/tests/signatures.rs b/tests/signatures.rs index 93558f8d..51261dca 100644 --- a/tests/signatures.rs +++ b/tests/signatures.rs @@ -12,7 +12,7 @@ // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![cfg(any(feature = "ring", feature = "aws_lc_rs"))] +#![cfg(any(feature = "ring", feature = "aws-lc-rs"))] use pki_types::{CertificateDer, SignatureVerificationAlgorithm}; #[cfg(feature = "ring")] @@ -26,7 +26,7 @@ use webpki::ring::{ RSA_PSS_2048_8192_SHA384_LEGACY_KEY, RSA_PSS_2048_8192_SHA512_LEGACY_KEY, }; -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] use webpki::aws_lc_rs::{ ECDSA_P256_SHA256, ECDSA_P256_SHA384, ECDSA_P384_SHA256, ECDSA_P384_SHA384, ECDSA_P521_SHA256, ECDSA_P521_SHA384, ECDSA_P521_SHA512, ED25519, RSA_PKCS1_2048_8192_SHA256, @@ -112,11 +112,11 @@ fn ed25519_key_and_ed25519_detects_bad_signature_rpk() { fn ed25519_key_rejected_by_other_algorithms() { let ee = include_bytes!("signatures/ed25519.ee.der"); for algorithm in &[ - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA256, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA384, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA512, ECDSA_P256_SHA256, ECDSA_P256_SHA384, @@ -244,11 +244,11 @@ fn ecdsa_p256_key_and_ecdsa_p256_sha256_detects_bad_signature_rpk() { fn ecdsa_p256_key_rejected_by_other_algorithms() { let ee = include_bytes!("signatures/ecdsa_p256.ee.der"); for algorithm in &[ - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA256, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA384, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA512, ECDSA_P384_SHA256, ECDSA_P384_SHA384, @@ -375,11 +375,11 @@ fn ecdsa_p384_key_and_ecdsa_p384_sha256_detects_bad_signature_rpk() { fn ecdsa_p384_key_rejected_by_other_algorithms() { let ee = include_bytes!("signatures/ecdsa_p384.ee.der"); for algorithm in &[ - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA256, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA384, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA512, ECDSA_P256_SHA256, ECDSA_P256_SHA384, @@ -400,7 +400,7 @@ fn ecdsa_p384_key_rejected_by_other_algorithms() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha512_good_signature() { let ee = include_bytes!("signatures/ecdsa_p521.ee.der"); let message = include_bytes!("signatures/message.bin"); @@ -410,7 +410,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha512_good_signature() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha512_good_signature_rpk() { let rpk = include_bytes!("signatures/ecdsa_p521.spki.der"); let message = include_bytes!("signatures/message.bin"); @@ -423,7 +423,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha512_good_signature_rpk() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha512_detects_bad_signature() { let ee = include_bytes!("signatures/ecdsa_p521.ee.der"); let message = include_bytes!("signatures/message.bin"); @@ -437,7 +437,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha512_detects_bad_signature() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha512_detects_bad_signature_rpk() { let rpk = include_bytes!("signatures/ecdsa_p521.spki.der"); let message = include_bytes!("signatures/message.bin"); @@ -451,7 +451,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha512_detects_bad_signature_rpk() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha256_good_signature() { let ee = include_bytes!("signatures/ecdsa_p521.ee.der"); let message = include_bytes!("signatures/message.bin"); @@ -461,7 +461,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha256_good_signature() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha256_good_signature_rpk() { let rpk = include_bytes!("signatures/ecdsa_p521.spki.der"); let message = include_bytes!("signatures/message.bin"); @@ -474,7 +474,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha256_good_signature_rpk() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature() { let ee = include_bytes!("signatures/ecdsa_p521.ee.der"); let message = include_bytes!("signatures/message.bin"); @@ -488,7 +488,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature_rpk() { let rpk = include_bytes!("signatures/ecdsa_p521.spki.der"); let message = include_bytes!("signatures/message.bin"); @@ -502,7 +502,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha256_detects_bad_signature_rpk() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature() { let ee = include_bytes!("signatures/ecdsa_p521.ee.der"); let message = include_bytes!("signatures/message.bin"); @@ -512,7 +512,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature_rpk() { let rpk = include_bytes!("signatures/ecdsa_p521.spki.der"); let message = include_bytes!("signatures/message.bin"); @@ -525,7 +525,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha384_good_signature_rpk() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha384_detects_bad_signature() { let ee = include_bytes!("signatures/ecdsa_p521.ee.der"); let message = include_bytes!("signatures/message.bin"); @@ -539,7 +539,7 @@ fn ecdsa_p521_key_and_ecdsa_p521_sha384_detects_bad_signature() { } #[test] -#[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] +#[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] fn ecdsa_p521_key_and_ecdsa_p521_sha384_detects_bad_signature_rpk() { let rpk = include_bytes!("signatures/ecdsa_p521.spki.der"); let message = include_bytes!("signatures/message.bin"); @@ -906,11 +906,11 @@ fn rsa_2048_key_and_rsa_pss_2048_8192_sha512_legacy_key_detects_bad_signature_rp fn rsa_2048_key_rejected_by_other_algorithms() { let ee = include_bytes!("signatures/rsa_2048.ee.der"); for algorithm in &[ - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA256, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA384, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA512, ECDSA_P256_SHA256, ECDSA_P256_SHA384, @@ -1310,11 +1310,11 @@ fn rsa_3072_key_and_rsa_pkcs1_3072_8192_sha384_detects_bad_signature_rpk() { fn rsa_3072_key_rejected_by_other_algorithms() { let ee = include_bytes!("signatures/rsa_3072.ee.der"); for algorithm in &[ - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA256, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA384, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA512, ECDSA_P256_SHA256, ECDSA_P256_SHA384, @@ -1714,11 +1714,11 @@ fn rsa_4096_key_and_rsa_pkcs1_3072_8192_sha384_detects_bad_signature_rpk() { fn rsa_4096_key_rejected_by_other_algorithms() { let ee = include_bytes!("signatures/rsa_4096.ee.der"); for algorithm in &[ - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA256, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA384, - #[cfg(all(not(feature = "ring"), feature = "aws_lc_rs"))] + #[cfg(all(not(feature = "ring"), feature = "aws-lc-rs"))] ECDSA_P521_SHA512, ECDSA_P256_SHA256, ECDSA_P256_SHA384, diff --git a/tests/tls_server_certs.rs b/tests/tls_server_certs.rs index 7ab25d68..fc3c6cdb 100644 --- a/tests/tls_server_certs.rs +++ b/tests/tls_server_certs.rs @@ -11,7 +11,7 @@ // WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN // ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF // OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -#![cfg(all(feature = "alloc", any(feature = "ring", feature = "aws_lc_rs")))] +#![cfg(all(feature = "alloc", any(feature = "ring", feature = "aws-lc-rs")))] use core::time::Duration;