rust/rustls
rust
/
rustls
mirror of https://github.com/ctz/rustls
1
0
Fork 0
Code Issues Releases Wiki Activity

crypto: gate ticketer module on std for aws-lc-rs 

Fixes a missing import error when building without std and with
aws_lc_rs:
```
$ cargo check -p rustls --no-default-features --features aws_lc_rs
   Compiling rustls v0.23.0 (/home/daniel/Code/Rust/rustls/rustls)
error[E0432]: unresolved import `ticketer`
   --> rustls/src/crypto/aws_lc_rs/mod.rs:228:9
    |
228 | pub use ticketer::Ticketer;
    |         ^^^^^^^^ use of undeclared crate or module `ticketer`
```

Adding a `std` gate on `TICKETER_AEAD` was also required to fix unused
warnings for builds w/o `std` using either ring or aws_lc_rs:

```
$ cargo check -p rustls --no-default-features --features aws_lc_rs
   Compiling rustls v0.23.0 (/home/daniel/Code/Rust/rustls/rustls)
warning: static `TICKETER_AEAD` is never used
   --> rustls/src/crypto/aws_lc_rs/mod.rs:249:19
    |
249 | pub(super) static TICKETER_AEAD: &ring_like::aead::Algorithm = &ring_like::aead::AES_256_GCM;
    |                   ^^^^^^^^^^^^^
    |
    = note: `#[warn(dead_code)]` on by default
```
This commit is contained in:
Daniel McCarney 2024-02-29 13:47:29 -05:00
parent 408a42ae0e
commit 03f52c1efc
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rustls/src/crypto/aws_lc_rs/mod.rs
View File

@ -27,6 +27,7 @@ pub(crate) mod hash;
pub(crate) mod kx;
#[path = "../ring/quic.rs"]
pub(crate) mod quic;
#[cfg(feature = "std")]
#[path = "../ring/ticketer.rs"]
pub(crate) mod ticketer;
#[cfg(feature = "tls12")]
@ -224,6 +225,7 @@ pub mod kx_group {
}
pub use kx::ALL_KX_GROUPS;
#[cfg(feature = "std")]
pub use ticketer::Ticketer;
use super::SupportedKxGroup;
@ -244,6 +246,7 @@ mod ring_shim {
}
/// AEAD algorithm that is used by `mod ticketer`.
#[cfg(feature = "std")]
pub(super) static TICKETER_AEAD: &ring_like::aead::Algorithm = &ring_like::aead::AES_256_GCM;
/// Are we in FIPS mode?

1
rustls/src/crypto/ring/mod.rs
View File

@ -193,6 +193,7 @@ mod ring_shim {
}
/// AEAD algorithm that is used by `mod ticketer`.
#[cfg(feature = "std")]
pub(super) static TICKETER_AEAD: &ring_like::aead::Algorithm = &ring_like::aead::CHACHA20_POLY1305;
pub(super) fn fips() -> bool {