diff --git a/boring/src/x509/tests/trusted_first.rs b/boring/src/x509/tests/trusted_first.rs index 9f49ffe3c..187a49b0b 100644 --- a/boring/src/x509/tests/trusted_first.rs +++ b/boring/src/x509/tests/trusted_first.rs @@ -2,7 +2,7 @@ use crate::stack::Stack; use crate::x509::store::X509StoreBuilder; -use crate::x509::verify::{X509Flags, X509VerifyParamRef}; +use crate::x509::verify::{X509VerifyFlags, X509VerifyParamRef}; use crate::x509::{X509Ref, X509StoreContext, X509VerifyError, X509VerifyResult, X509}; #[test] @@ -43,7 +43,7 @@ fn test_verify_cert() { &leaf, &[&root1, &root2], &[&intermediate, &root1_cross], - |param| param.set_flags(X509Flags::TRUSTED_FIRST), + |param| param.set_flags(X509VerifyFlags::TRUSTED_FIRST), ) ); @@ -53,14 +53,14 @@ fn test_verify_cert() { &leaf, &[&root1, &root2], &[&intermediate, &root1_cross], - |param| param.clear_flags(X509Flags::TRUSTED_FIRST), + |param| param.clear_flags(X509VerifyFlags::TRUSTED_FIRST), ) ); assert_eq!( Ok(()), verify(&leaf, &[&root1], &[&intermediate, &root1_cross], |param| { - param.clear_flags(X509Flags::TRUSTED_FIRST) + param.clear_flags(X509VerifyFlags::TRUSTED_FIRST) }) ); } diff --git a/boring/src/x509/verify.rs b/boring/src/x509/verify.rs index d89c67c83..249563380 100644 --- a/boring/src/x509/verify.rs +++ b/boring/src/x509/verify.rs @@ -20,20 +20,14 @@ bitflags! { const NEVER_CHECK_SUBJECT = ffi::X509_CHECK_FLAG_NEVER_CHECK_SUBJECT as _; #[cfg(feature = "underscore-wildcards")] const UNDERSCORE_WILDCARDS = ffi::X509_CHECK_FLAG_UNDERSCORE_WILDCARDS as _; - - #[deprecated(since = "0.10.6", note = "renamed to NO_WILDCARDS")] - const FLAG_NO_WILDCARDS = ffi::X509_CHECK_FLAG_NO_WILDCARDS as _; } } -#[doc(hidden)] -#[deprecated(note = "X509Flags renamed to X509VerifyFlags")] -pub use X509VerifyFlags as X509Flags; - bitflags! { /// Flags used to check an `X509` certificate. #[derive(Debug, PartialEq, Eq, Clone, Copy, PartialOrd, Ord, Hash)] #[repr(transparent)] + #[doc(alias = "X509Flags")] pub struct X509VerifyFlags: c_ulong { const CB_ISSUER_CHECK = ffi::X509_V_FLAG_CB_ISSUER_CHECK as _; const USE_CHECK_TIME = ffi::X509_V_FLAG_USE_CHECK_TIME as _;