From 3679fc3eb25da5a3576af59398de509966a09b77 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Tue, 16 Jul 2024 09:49:39 +0200 Subject: [PATCH] Isolate ring_like imports --- src/lib.rs | 9 +++++---- src/types.rs | 5 +++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index cdf91c8..d5fcb35 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -3,15 +3,16 @@ #![warn(unreachable_pub)] #![warn(missing_docs)] -#[cfg(feature = "aws-lc-rs")] -pub(crate) use aws_lc_rs as ring_like; -#[cfg(all(feature = "ring", not(feature = "aws-lc-rs")))] -pub(crate) use ring as ring_like; use std::fmt; use std::future::Future; use std::pin::Pin; use std::sync::Arc; +#[cfg(feature = "aws-lc-rs")] +pub(crate) use aws_lc_rs as ring_like; +#[cfg(all(feature = "ring", not(feature = "aws-lc-rs")))] +pub(crate) use ring as ring_like; + use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD}; use http_body_util::{BodyExt, Full}; use hyper::body::{Bytes, Incoming}; diff --git a/src/types.rs b/src/types.rs index 3e276aa..db64988 100644 --- a/src/types.rs +++ b/src/types.rs @@ -2,12 +2,13 @@ use std::fmt; #[cfg(feature = "aws-lc-rs")] pub(crate) use aws_lc_rs as ring_like; +#[cfg(all(feature = "ring", not(feature = "aws-lc-rs")))] +pub(crate) use ring as ring_like; + use base64::prelude::{Engine, BASE64_URL_SAFE_NO_PAD}; use http_body_util::BodyExt; use hyper::body::Incoming; use hyper::Response; -#[cfg(all(feature = "ring", not(feature = "aws-lc-rs")))] -pub(crate) use ring as ring_like; use ring_like::digest::{digest, Digest, SHA256}; use ring_like::signature::{EcdsaKeyPair, KeyPair}; use rustls_pki_types::CertificateDer;