Skip to content

Bump rsa to v0.10.0 release #2520

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

Merged
tarcieri merged 1 commit into from
Nov 9, 2026
Merged

Bump rsa to v0.10.0 release #2520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 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.

4 changes: 2 additions & 2 deletions cms/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cbc = { version = "0.2", optional = true }
cipher = { version = "0.5", features = ["alloc", "block-padding", "rand_core"], optional = true }
digest = { version = "0.11", optional = true }
elliptic-curve = { version = "0.14.1", optional = true }
rsa = { version = "0.10.0-rc.20", optional = true }
rsa = { version = "0.10", optional = true, features = ["pkcs1v15"] }
sha1 = { version = "0.11", optional = true }
sha2 = { version = "0.11", optional = true }
sha3 = { version = "0.11", optional = true }
Expand All @@ -43,7 +43,7 @@ pem-rfc7468 = "1"
pkcs5 = "0.8"
pbkdf2 = "0.13.0-rc.9"
rand = "0.10"
rsa = "0.10.0-rc.20"
rsa = "0.10"
ecdsa = { version = "0.17", features = ["digest", "pem"] }
p256 = "0.14"
tokio = { version = "1.45.1", features = ["macros", "rt"] }
Expand Down
2 changes: 1 addition & 1 deletion cms/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,7 @@ pub enum RecipientInfoType {
#[derive(Clone, Debug, Eq, PartialEq)]
pub enum KeyEncryptionInfo {
/// Encrypt key with RSA
Rsa(rsa::RsaPublicKey),
Rsa(rsa::PublicKey),
// to be extended here with other asymmetric encryption algorithms
}

Expand Down
22 changes: 10 additions & 12 deletions cms/tests/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,7 @@ use pem_rfc7468::LineEnding;
use pkcs5::pbes2::Pbkdf2Params;
use rsa::pkcs1::DecodeRsaPrivateKey;
use rsa::rand_core::CryptoRng;
use rsa::{Pkcs1v15Encrypt, RsaPrivateKey, RsaPublicKey};
use rsa::{pkcs1v15, pss};
use rsa::{Pkcs1v15Encrypt, pkcs1v15, pss};
use sha2::Sha256;
use signature::Verifier;
use spki::AlgorithmIdentifierOwned;
Expand All @@ -47,12 +46,12 @@ const RSA_2048_PRIV_DER_EXAMPLE: &[u8] = include_bytes!("examples/rsa2048-priv.d
const PKCS8_PRIVATE_KEY_DER: &[u8] = include_bytes!("examples/p256-priv.der");

fn rsa_pss_signer() -> pss::SigningKey<Sha256> {
let private_key = rsa::RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
let private_key = rsa::PrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
pss::SigningKey::<Sha256>::new(private_key)
}

fn rsa_pkcs1v15_signer() -> pkcs1v15::SigningKey<Sha256> {
let private_key = rsa::RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
let private_key = rsa::PrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
pkcs1v15::SigningKey::<Sha256>::new(private_key)
}

Expand Down Expand Up @@ -185,8 +184,8 @@ fn test_build_enveloped_data() {
let mut rng = rand::rng();
let bits = 2048;
let recipient_private_key =
RsaPrivateKey::new(&mut rng, bits).expect("failed to generate a key");
let recipient_public_key = RsaPublicKey::from(&recipient_private_key);
rsa::PrivateKey::new(&mut rng, bits).expect("failed to generate a key");
let recipient_public_key = rsa::PublicKey::from(&recipient_private_key);

let recipient_info_builder = KeyTransRecipientInfoBuilder::new(
recipient_identifier,
Expand Down Expand Up @@ -278,9 +277,8 @@ fn test_build_pkcs7_scep_pkcsreq() {

// Create recipient info
let recipient_identifier = recipient_identifier(42);
let recipient_private_key =
rsa::RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
let recipient_public_key = RsaPublicKey::from(&recipient_private_key);
let recipient_private_key = rsa::PrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
let recipient_public_key = rsa::PublicKey::from(&recipient_private_key);

//----------------------------------------------------------------------------------------------
// Create enveloped data
Expand Down Expand Up @@ -329,7 +327,7 @@ fn test_build_pkcs7_scep_pkcsreq() {
// Create a signer info. Multiple signers are possible, but not used here.
let signer = {
let sender_rsa_key_pem = include_str!("examples/sceptest_key.pem");
let sender_rsa_key = RsaPrivateKey::from_pkcs8_pem(sender_rsa_key_pem).unwrap();
let sender_rsa_key = rsa::PrivateKey::from_pkcs8_pem(sender_rsa_key_pem).unwrap();
pkcs1v15::SigningKey::<Sha256>::new(sender_rsa_key)
};
let digest_algorithm = AlgorithmIdentifierOwned {
Expand Down Expand Up @@ -426,8 +424,8 @@ fn test_build_pkcs7_scep_pkcsreq() {
let signed_attributes_der = signer_info.signed_attrs.clone().unwrap().to_der().unwrap();
let verifier = {
let verifier_rsa_key_pem = include_str!("examples/sceptest_key.pem");
let verifier_rsa_key = RsaPrivateKey::from_pkcs8_pem(verifier_rsa_key_pem).unwrap();
pkcs1v15::VerifyingKey::<Sha256>::new(RsaPublicKey::from(verifier_rsa_key))
let verifier_rsa_key = rsa::PrivateKey::from_pkcs8_pem(verifier_rsa_key_pem).unwrap();
pkcs1v15::VerifyingKey::<Sha256>::new(rsa::PublicKey::from(verifier_rsa_key))
};
assert!(
verifier
Expand Down
2 changes: 1 addition & 1 deletion x509-cert/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ tls_codec = { version = "0.4", default-features = false, features = ["derive"],
[dev-dependencies]
hex-literal = "1"
rand = "0.10"
rsa = "0.10.0-rc.20"
rsa = { version = "0.10", features = ["pkcs1v15"] }
ecdsa = { version = "0.17", features = ["digest", "pem"] }
p256 = "0.14"
rstest = "0.26"
Expand Down
2 changes: 1 addition & 1 deletion x509-cert/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ pub type Result<T> = core::result::Result<T, Error>;
/// # use std::time::Duration;
/// # use der::referenced::RefToOwned;
/// # fn rsa_signer() -> SigningKey<Sha256> {
/// # let private_key = rsa::RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
/// # let private_key = rsa::PrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER).unwrap();
/// # let signing_key = SigningKey::<Sha256>::new(private_key);
/// # signing_key
/// # }
Expand Down
4 changes: 2 additions & 2 deletions x509-cert/tests/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -246,12 +246,12 @@ fn pss_certificate() {
const RSA_2048_PRIV_DER_EXAMPLE: &[u8] = include_bytes!("examples/rsa2048-priv.der");

fn rsa_signer() -> SigningKey<Sha256> {
let private_key = rsa::RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
let private_key = rsa::PrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
SigningKey::<Sha256>::new(private_key)
}

fn rsa_pss_signer() -> rsa::pss::SigningKey<Sha256> {
let private_key = rsa::RsaPrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
let private_key = rsa::PrivateKey::from_pkcs1_der(RSA_2048_PRIV_DER_EXAMPLE).unwrap();
rsa::pss::SigningKey::<Sha256>::new(private_key)
}

Expand Down
2 changes: 1 addition & 1 deletion x509-ocsp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ signature = { version = "3", optional = true, default-features = false, features
[dev-dependencies]
hex-literal = "1"
rand = "0.10"
rsa = { version = "0.10.0-rc.20", default-features = false, features = ["encoding"] }
rsa = { version = "0.10", default-features = false, features = ["encoding", "pkcs1v15"] }
sha1 = { version = "0.11", default-features = false, features = ["oid"] }
sha2 = { version = "0.11", default-features = false, features = ["oid"] }

Expand Down
2 changes: 1 addition & 1 deletion x509-ocsp/src/builder/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ use x509_cert::{
/// # use rsa::{pkcs1v15::SigningKey, pkcs8::DecodePrivateKey};
/// # use sha2::Sha256;
/// # fn rsa_signer() -> SigningKey<Sha256> {
/// # let private_key = rsa::RsaPrivateKey::from_pkcs8_der(KEY_DER).unwrap();
/// # let private_key = rsa::PrivateKey::from_pkcs8_der(KEY_DER).unwrap();
/// # let signing_key = SigningKey::<Sha256>::new(private_key);
/// # signing_key
/// # }
Expand Down
2 changes: 1 addition & 1 deletion x509-ocsp/src/builder/response.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ use x509_cert::{
/// # use rsa::{pkcs1v15::SigningKey, pkcs8::DecodePrivateKey};
/// # use sha2::Sha256;
/// # fn rsa_signer() -> SigningKey<Sha256> {
/// # let private_key = rsa::RsaPrivateKey::from_pkcs8_der(CA_KEY_DER).unwrap();
/// # let private_key = rsa::PrivateKey::from_pkcs8_der(CA_KEY_DER).unwrap();
/// # let signing_key = SigningKey::<Sha256>::new(private_key);
/// # signing_key
/// # }
Expand Down
14 changes: 7 additions & 7 deletions x509-ocsp/tests/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
use const_oid::AssociatedOid;
use der::{DateTime, Decode, Encode};
use hex_literal::hex;
use rsa::{RsaPrivateKey, pkcs1v15::SigningKey, pkcs8::DecodePrivateKey};
use rsa::{pkcs1v15::SigningKey, pkcs8::DecodePrivateKey};
use sha1::Sha1;
use sha2::{Sha224, Sha256, Sha384, Sha512};
use std::sync::LazyLock;
Expand All @@ -19,8 +19,8 @@ static ISSUER: LazyLock<Certificate> = LazyLock::new(|| {
Certificate::from_der(&std::fs::read("tests/examples/rsa-2048-sha256-ca.der").unwrap()).unwrap()
});

static ISSUER_KEY: LazyLock<RsaPrivateKey> = LazyLock::new(|| {
RsaPrivateKey::from_pkcs8_der(
static ISSUER_KEY: LazyLock<rsa::PrivateKey> = LazyLock::new(|| {
rsa::PrivateKey::from_pkcs8_der(
&std::fs::read("tests/examples/rsa-2048-sha256-ca-key.der").unwrap(),
)
.unwrap()
Expand All @@ -31,8 +31,8 @@ static CERT: LazyLock<Certificate> = LazyLock::new(|| {
.unwrap()
});

static CERT_KEY: LazyLock<RsaPrivateKey> = LazyLock::new(|| {
RsaPrivateKey::from_pkcs8_der(
static CERT_KEY: LazyLock<rsa::PrivateKey> = LazyLock::new(|| {
rsa::PrivateKey::from_pkcs8_der(
&std::fs::read("tests/examples/rsa-2048-sha256-crt-key.der").unwrap(),
)
.unwrap()
Expand All @@ -43,8 +43,8 @@ static OCSP: LazyLock<Certificate> = LazyLock::new(|| {
.unwrap()
});

static OCSP_KEY: LazyLock<RsaPrivateKey> = LazyLock::new(|| {
RsaPrivateKey::from_pkcs8_der(
static OCSP_KEY: LazyLock<rsa::PrivateKey> = LazyLock::new(|| {
rsa::PrivateKey::from_pkcs8_der(
&std::fs::read("tests/examples/rsa-2048-sha256-ocsp-crt-key.der").unwrap(),
)
.unwrap()
Expand Down
Loading