Skip to content

feat: support "verify" with FIPS crypto backend #233

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
domodwyer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

feat: support "verify" with FIPS crypto backend #233

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8f355a0
feat: support "verify" with FIPS crypto backend
domodwyer Feb 11, 2026
48c57d1
docs: CI run comments for FIPS crate detection
domodwyer Feb 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions .github/workflows/rust.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,13 +71,25 @@ jobs:
- --all-features
- --features=verify
- --features=verify-aws
- --features=verify-aws-fips
- --features=validate
steps:
- uses: actions/checkout@v4
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
- run: cargo test --locked ${{ matrix.features }}

test_fips:
name: verify-aws-fips dependency on FIPS backend only
needs: check-all-features
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Install stable toolchain
uses: dtolnay/rust-toolchain@stable
- run: "if cargo tree --features=verify-aws-fips -i aws-lc-sys; then false; else [ $? -eq 101 ]; fi"
Comment thread
domodwyer marked this conversation as resolved.
- run: "cargo tree --features=verify-aws-fips -i aws-lc-fips-sys"

Comment on lines +82 to +96
Copy link
Copy Markdown
Author

@domodwyer domodwyer Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I figured it was a good idea to add a CI step to verify the FIPS backend is used when the fips flag is provided.

Specifically:

  • The non-FIPS backend is not used (aws-lc-sys)
  • The FIPS backend is used (aws-lc-fips-sys)

fmt:
name: Rustfmt
runs-on: ubuntu-latest
Expand Down
54 changes: 44 additions & 10 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 3 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,14 @@ rustdoc-args = ["--cfg", "docsrs"]

[features]
default = []
verify-aws = ["aws-lc-rs"]
verify-aws = ["aws-lc-rs/aws-lc-sys"] # Non-FIPS backend
verify-aws-fips = ["aws-lc-rs/fips"] # FIPS crypto backend
Copy link
Copy Markdown
Author

@domodwyer domodwyer Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the new feature flag which switches on the fips feature of the aws-lc-rs crate.

It's either / or for the backends though, and the non-FIPS backend is enabled by default, so I've disabled the default features for aws-lc-rs and let the x509-parser feature flags enable the relevant crypto backend.

verify = ["ring"]
validate = []

[dependencies]
aws-lc-rs = { version = "1.0", optional = true }
asn1-rs = { version = "0.8.0-beta.1", features=["bigint", "datetime"] }
aws-lc-rs = { version = "1.0", optional = true, default-features = false, features = ["alloc"] }
data-encoding = "2.2.1"
lazy_static = "1.4"
nom = "8.0"
Expand Down
21 changes: 18 additions & 3 deletions src/certificate.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,11 @@ use crate::x509::{
X509Name, X509Version,
};

#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
use crate::verify::verify_signature;
use asn1_rs::{
Alias, BerError, BigUint, BitString, DerParser, Error, FromDer, Header, Input,
Expand Down Expand Up @@ -100,8 +104,19 @@ impl<'a> X509Certificate<'a> {
/// It is usually an intermediate authority.
///
/// Not all algorithms are supported, this function is limited to what `ring` supports.
#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "verify", feature = "verify-aws"))))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
#[cfg_attr(
docsrs,
doc(cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
)))
)]
pub fn verify_signature(
&self,
public_key: Option<&SubjectPublicKeyInfo>,
Expand Down
21 changes: 18 additions & 3 deletions src/certification_request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ use crate::x509::{
parse_signature_value, AlgorithmIdentifier, SubjectPublicKeyInfo, X509Name, X509Version,
};

#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
Comment on lines -8 to +12
Copy link
Copy Markdown
Author

@domodwyer domodwyer Feb 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is basically all the source code changes in this PR: adding a new feature flag in the same place as verify-aws.

use crate::verify::verify_signature;
use asn1_rs::{
BitString, DerParser, FromDer, Header, Input, Oid, OptTaggedImplicit, Sequence, Tag, Tagged,
Expand Down Expand Up @@ -83,8 +87,19 @@ impl<'a> X509CertificationRequest<'a> {
///
/// Uses the public key contained in the CSR, which must be the one of the entity
/// requesting the certification for this verification to succeed.
#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "verify", feature = "verify-aws"))))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
#[cfg_attr(
docsrs,
doc(cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
)))
)]
pub fn verify_signature(&self) -> Result<(), X509Error> {
let spki = &self.certification_request_info.subject_pki;
verify_signature(
Expand Down
19 changes: 15 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,10 @@
//! to `X509Certificate`.
//!
//! ```rust
//! # #[cfg(any(feature = "verify", feature = "verify-aws"))]
//! # #[cfg(any(feature = "verify", feature = "verify-aws", feature = "verify-aws-fips"))]
//! # use x509_parser::certificate::X509Certificate;
//! /// Cryptographic signature verification: returns true if certificate was signed by issuer
//! #[cfg(any(feature = "verify", feature = "verify-aws"))]
//! #[cfg(any(feature = "verify", feature = "verify-aws", feature = "verify-aws-fips"))]
//! pub fn check_signature(cert: &X509Certificate<'_>, issuer: &X509Certificate<'_>) -> bool {
//! let issuer_public_key = issuer.public_key();
//! cert
Expand Down Expand Up @@ -157,8 +157,19 @@ pub mod time;
#[cfg(feature = "validate")]
#[cfg_attr(docsrs, doc(cfg(feature = "validate")))]
pub mod validate;
#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "verify", feature = "verify-aws"))))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
#[cfg_attr(
docsrs,
doc(cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
)))
)]
pub mod verify;
pub mod visitor;
pub mod x509;
Expand Down
27 changes: 23 additions & 4 deletions src/revocation_list.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,17 @@ use crate::x509::{
format_serial, parse_serial, AlgorithmIdentifier, ReasonCode, X509Name, X509Version,
};

#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
use crate::verify::verify_signature;
#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
use crate::x509::SubjectPublicKeyInfo;
use asn1_rs::num_bigint::BigUint;
use asn1_rs::{BitString, DerParser, FromDer, Header, Input, Sequence, Tag, Tagged};
Expand Down Expand Up @@ -137,8 +145,19 @@ impl<'a> CertificateRevocationList<'a> {
/// `public_key` is the public key of the **signer**.
///
/// Not all algorithms are supported, this function is limited to what `ring` supports.
#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg_attr(docsrs, doc(cfg(any(feature = "verify", feature = "verify-aws"))))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
#[cfg_attr(
docsrs,
doc(cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
)))
)]
pub fn verify_signature(&self, public_key: &SubjectPublicKeyInfo) -> Result<(), X509Error> {
verify_signature(
public_key,
Expand Down
7 changes: 5 additions & 2 deletions src/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,12 @@ use oid_registry::{
// Since the `signature` object is similar in ring and in aws-lc-rs, we just use simple logic
// to determine which one to use.
// If both verify and verify-aws features are enabled, aws will be used.
#[cfg(feature = "verify-aws")]
#[cfg(any(feature = "verify-aws", feature = "verify-aws-fips"))]
use aws_lc_rs::signature;
#[cfg(all(feature = "verify", not(feature = "verify-aws")))]
#[cfg(all(
feature = "verify",
not(any(feature = "verify-aws", feature = "verify-aws-fips"))
))]
use ring::signature;

/// Verify the cryptographic signature of the raw data (can be a certificate, a CRL or a CSR).
Expand Down
6 changes: 5 additions & 1 deletion tests/readcrl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
use x509_parser::prelude::*;

#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
#[test]
fn read_crl_verify() {
const CA_DATA: &[u8] = include_bytes!("../assets/ca_minimalcrl.der");
Expand Down
6 changes: 5 additions & 1 deletion tests/readcsr.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,11 @@ fn read_csr_with_challenge_password() {
assert!(found_san);
}

#[cfg(any(feature = "verify", feature = "verify-aws"))]
#[cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]
#[test]
fn read_csr_verify() {
let pem = pem::parse_x509_pem(CSR_DATA).unwrap().1;
Expand Down
6 changes: 5 additions & 1 deletion tests/verify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
#![cfg(any(feature = "verify", feature = "verify-aws"))]
#![cfg(any(
feature = "verify",
feature = "verify-aws",
feature = "verify-aws-fips"
))]

use x509_parser::parse_x509_certificate;

Expand Down
Loading