SerialNumber {
/// of output from the CSPRNG. This currently defaults to a 17-bytes long serial number.
///
/// [ballot 164]: https://cabforum.org/2016/03/31/ballot-164/
- pub fn generate(rng: &mut R) -> Self {
+ pub fn generate(rng: &mut R) -> Self {
Self::generate_with_prefix(&[], 17, rng)
.expect("a random of 17 is acceptable, and rng may not fail")
}
@@ -91,7 +94,7 @@ impl SerialNumber {
/// equal or below 19 (to account for leading sign disambiguation, and the maximum length of 20).
///
/// [ballot 164]: https://cabforum.org/2016/03/31/ballot-164/
- pub fn generate_with_prefix(
+ pub fn generate_with_prefix(
prefix: &[u8],
rand_len: usize,
rng: &mut R,
diff --git a/x509-cert/tests/builder.rs b/x509-cert/tests/builder.rs
index 15b33ab55..c88ca91f6 100644
--- a/x509-cert/tests/builder.rs
+++ b/x509-cert/tests/builder.rs
@@ -5,8 +5,7 @@ use der::{
asn1::{Ia5String, PrintableString},
pem::LineEnding,
};
-use p256::{NistP256, ecdsa::DerSignature, pkcs8::DecodePrivateKey};
-use rand::rngs::OsRng;
+use p256::{NistP256, ecdsa::DerSignature, elliptic_curve::Generate, pkcs8::DecodePrivateKey};
use rsa::pkcs1::DecodeRsaPrivateKey;
use rsa::pkcs1v15::SigningKey;
use sha2::Sha256;
@@ -314,9 +313,10 @@ fn dynamic_signer() {
let subject = Name::from_str("CN=Test").expect("parse common name");
let csr_builder = RequestBuilder::new(subject).expect("construct builder");
+ let mut rng = rand::rng();
let csr = if true {
- let req_signer = p256::ecdsa::SigningKey::try_from_rng(&mut OsRng).unwrap();
+ let req_signer = p256::ecdsa::SigningKey::generate_from_rng(&mut rng);
csr_builder
.build::<_, p256::ecdsa::DerSignature>(&req_signer)
.expect("Sign request")
diff --git a/x509-cert/tests/builder_crl.rs b/x509-cert/tests/builder_crl.rs
index 2a8f81726..41f8ecd41 100644
--- a/x509-cert/tests/builder_crl.rs
+++ b/x509-cert/tests/builder_crl.rs
@@ -17,7 +17,7 @@ use x509_cert::{
certificate::Rfc5280,
crl::RevokedCert,
ext::{
- AsExtension,
+ ToExtension,
pkix::{CrlNumber, CrlReason, name::GeneralName},
},
name::Name,
diff --git a/x509-ocsp/Cargo.toml b/x509-ocsp/Cargo.toml
index 0c9e20dd0..1d4bf8eab 100644
--- a/x509-ocsp/Cargo.toml
+++ b/x509-ocsp/Cargo.toml
@@ -19,18 +19,18 @@ rust-version = "1.85"
const-oid = { version = "0.10", default-features = false, features = ["db"] }
der = { version = "0.8.0-rc.10", features = ["alloc", "derive", "oid"] }
spki = { version = "0.8.0-rc.4", features = ["alloc"] }
-x509-cert = { version = "0.3.0-rc.0", default-features = false }
+x509-cert = { version = "0.3.0-rc.3", default-features = false }
# Optional
digest = { version = "0.11.0-rc.4", optional = true, default-features = false, features = ["oid"] }
-rand_core = { version = "0.10.0-rc-2", optional = true, default-features = false }
+rand_core = { version = "0.10.0-rc-3", optional = true, default-features = false }
signature = { version = "3.0.0-rc.5", optional = true, default-features = false, features = ["digest", "rand_core"] }
[dev-dependencies]
hex-literal = "1"
lazy_static = "1.5.0"
-rand = "0.10.0-rc.1"
-rsa = { version = "0.10.0-rc.10", default-features = false, features = ["encoding", "sha2"] }
+rand = "0.10.0-rc.6"
+rsa = { version = "0.10.0-rc.11", default-features = false, features = ["encoding", "sha2"] }
sha1 = { version = "0.11.0-rc.3", default-features = false, features = ["oid"] }
sha2 = { version = "0.11.0-rc.3", default-features = false, features = ["oid"] }
diff --git a/x509-ocsp/src/basic.rs b/x509-ocsp/src/basic.rs
index e4dfb72b2..3c3cf2d43 100644
--- a/x509-ocsp/src/basic.rs
+++ b/x509-ocsp/src/basic.rs
@@ -130,7 +130,7 @@ mod builder {
use const_oid::AssociatedOid;
use digest::Digest;
use x509_cert::{
- Certificate, crl::CertificateList, ext::AsExtension, name::Name,
+ Certificate, crl::CertificateList, ext::ToExtension, name::Name,
serial_number::SerialNumber,
};
@@ -171,7 +171,7 @@ mod builder {
/// extension encoding fails.
///
/// [RFC 6960 Section 4.4]: https://datatracker.ietf.org/doc/html/rfc6960#section-4.4
- pub fn with_extension(mut self, ext: E) -> Result {
+ pub fn with_extension(mut self, ext: E) -> Result {
let ext = ext.to_extension(&Name::default(), &[])?;
match self.single_extensions {
Some(ref mut exts) => exts.push(ext),
diff --git a/x509-ocsp/src/builder/request.rs b/x509-ocsp/src/builder/request.rs
index 1b9bc54f7..0a0d72073 100644
--- a/x509-ocsp/src/builder/request.rs
+++ b/x509-ocsp/src/builder/request.rs
@@ -3,13 +3,13 @@
use crate::{OcspRequest, Request, Signature, TbsRequest, Version, builder::Error};
use alloc::vec::Vec;
use der::Encode;
-use rand_core::CryptoRng;
+use rand_core::{CryptoRng, RngCore};
use signature::{RandomizedSigner, Signer};
use spki::{DynSignatureAlgorithmIdentifier, SignatureBitStringEncoding};
use x509_cert::{
Certificate,
certificate::Rfc5280,
- ext::{AsExtension, pkix::name::GeneralName},
+ ext::{ToExtension, pkix::name::GeneralName},
name::Name,
};
@@ -45,7 +45,7 @@ use x509_cert::{
/// .with_request(Request::from_issuer::(&issuer, SerialNumber::from(2usize)).unwrap())
/// .with_request(Request::from_issuer::(&issuer, SerialNumber::from(3usize)).unwrap())
/// .with_request(Request::from_issuer::(&issuer, SerialNumber::from(4usize)).unwrap())
-/// .with_extension(Nonce::generate(&mut rng, 32).unwrap())
+/// .with_extension(&Nonce::generate(&mut rng, 32).unwrap())
/// .unwrap()
/// .build();
///
@@ -53,7 +53,7 @@ use x509_cert::{
/// let signer_cert_chain = vec![cert.clone()];
/// let req = OcspRequestBuilder::default()
/// .with_request(Request::from_cert::(&issuer, &cert).unwrap())
-/// .with_extension(Nonce::generate(&mut rng, 32).unwrap())
+/// .with_extension(&Nonce::generate(&mut rng, 32).unwrap())
/// .unwrap()
/// .sign(&mut signer, Some(signer_cert_chain))
/// .unwrap();
@@ -96,7 +96,7 @@ impl OcspRequestBuilder {
/// extension encoding fails.
///
/// [RFC 6960 Section 4.4]: https://datatracker.ietf.org/doc/html/rfc6960#section-4.4
- pub fn with_extension(mut self, ext: E) -> Result {
+ pub fn with_extension(mut self, ext: E) -> Result {
let ext = ext.to_extension(&Name::default(), &[])?;
match self.tbs.request_extensions {
Some(ref mut exts) => exts.push(ext),
@@ -148,7 +148,7 @@ impl OcspRequestBuilder {
where
S: RandomizedSigner + DynSignatureAlgorithmIdentifier,
Sig: SignatureBitStringEncoding,
- R: CryptoRng + ?Sized,
+ R: CryptoRng + RngCore + ?Sized,
{
let signature_algorithm = signer.signature_algorithm_identifier()?;
let signature = signer
diff --git a/x509-ocsp/src/builder/response.rs b/x509-ocsp/src/builder/response.rs
index 06061ac74..776ac3305 100644
--- a/x509-ocsp/src/builder/response.rs
+++ b/x509-ocsp/src/builder/response.rs
@@ -6,12 +6,12 @@ use crate::{
};
use alloc::vec::Vec;
use der::Encode;
-use rand_core::CryptoRng;
+use rand_core::{CryptoRng, RngCore};
use signature::{RandomizedSigner, Signer};
use spki::{DynSignatureAlgorithmIdentifier, SignatureBitStringEncoding};
use x509_cert::{
Certificate,
- ext::{AsExtension, Extensions},
+ ext::{Extensions, ToExtension},
name::Name,
};
@@ -53,7 +53,7 @@ use x509_cert::{
/// );
///
/// if let Some(nonce) = req.nonce() {
-/// builder = builder.with_extension(nonce).unwrap();
+/// builder = builder.with_extension(&nonce).unwrap();
/// }
///
/// #[cfg(feature = "std")]
@@ -101,7 +101,7 @@ impl OcspResponseBuilder {
/// extension encoding fails.
///
/// [RFC 6960 Section 4.4]: https://datatracker.ietf.org/doc/html/rfc6960#section-4.4
- pub fn with_extension(mut self, ext: E) -> Result {
+ pub fn with_extension(mut self, ext: E) -> Result {
let ext = ext.to_extension(&Name::default(), &[])?;
match self.response_extensions {
Some(ref mut exts) => exts.push(ext),
@@ -168,7 +168,7 @@ impl OcspResponseBuilder {
where
S: RandomizedSigner + DynSignatureAlgorithmIdentifier,
Sig: SignatureBitStringEncoding,
- R: CryptoRng + ?Sized,
+ R: CryptoRng + RngCore + ?Sized,
{
let tbs_response_data = self.into_response_data(produced_at);
let signature_algorithm = signer.signature_algorithm_identifier()?;
diff --git a/x509-ocsp/src/ext.rs b/x509-ocsp/src/ext.rs
index 457a8f4a5..601784e8c 100644
--- a/x509-ocsp/src/ext.rs
+++ b/x509-ocsp/src/ext.rs
@@ -21,7 +21,7 @@ use x509_cert::{
};
#[cfg(feature = "rand")]
-use rand_core::CryptoRng;
+use rand_core::{CryptoRng, RngCore};
// x509-cert's is not exported
macro_rules! impl_extension {
@@ -64,7 +64,7 @@ impl Nonce {
#[cfg(feature = "rand")]
pub fn generate(rng: &mut R, length: usize) -> Result
where
- R: CryptoRng + ?Sized,
+ R: CryptoRng + RngCore + ?Sized,
{
let mut bytes = alloc::vec![0; length];
rng.fill_bytes(&mut bytes);
diff --git a/x509-ocsp/src/request.rs b/x509-ocsp/src/request.rs
index 53b67f432..f6a3f71f3 100644
--- a/x509-ocsp/src/request.rs
+++ b/x509-ocsp/src/request.rs
@@ -127,7 +127,7 @@ mod builder {
use crate::{CertId, Request, builder::Error};
use const_oid::AssociatedOid;
use digest::Digest;
- use x509_cert::{Certificate, ext::AsExtension, name::Name, serial_number::SerialNumber};
+ use x509_cert::{Certificate, ext::ToExtension, name::Name, serial_number::SerialNumber};
impl Request {
/// Returns a new `Request` with the specified `CertID`
@@ -172,7 +172,7 @@ mod builder {
/// extension encoding fails.
///
/// [RFC 6960 Section 4.4]: https://datatracker.ietf.org/doc/html/rfc6960#section-4.4
- pub fn with_extension(mut self, ext: E) -> Result {
+ pub fn with_extension(mut self, ext: E) -> Result {
let ext = ext.to_extension(&Name::default(), &[])?;
match self.single_request_extensions {
Some(ref mut exts) => exts.push(ext),
diff --git a/x509-ocsp/tests/builder.rs b/x509-ocsp/tests/builder.rs
index fe85c6090..6c91b94a5 100644
--- a/x509-ocsp/tests/builder.rs
+++ b/x509-ocsp/tests/builder.rs
@@ -126,12 +126,12 @@ fn encode_ocsp_req_multiple_extensions() {
.with_request(
Request::from_issuer::(&ISSUER, SerialNumber::from(0x10001usize))
.unwrap()
- .with_extension(single_ext1)
+ .with_extension(&single_ext1)
.unwrap(),
)
- .with_extension(ext1)
+ .with_extension(&ext1)
.unwrap()
- .with_extension(ext2)
+ .with_extension(&ext2)
.unwrap()
.build();
assert_eq!(&req.to_der().unwrap(), &req_der);
@@ -296,12 +296,12 @@ fn encode_ocsp_resp_multiple_extensions() {
.with_next_update(OcspGeneralizedTime::from(
DateTime::new(2020, 1, 1, 0, 0, 0).unwrap(),
))
- .with_extension(single_ext1)
+ .with_extension(&single_ext1)
.unwrap()
- .with_extension(single_ext2)
+ .with_extension(&single_ext2)
.unwrap(),
)
- .with_extension(ext1)
+ .with_extension(&ext1)
.unwrap()
.sign(
&mut signer,
diff --git a/x509-tsp/Cargo.toml b/x509-tsp/Cargo.toml
index cf655c54d..f9fcd28e8 100644
--- a/x509-tsp/Cargo.toml
+++ b/x509-tsp/Cargo.toml
@@ -16,9 +16,9 @@ rust-version = "1.85"
[dependencies]
der = { version = "0.8.0-rc.10", features = ["alloc", "derive", "oid", "pem"] }
-cms = { version = "=0.3.0-pre.0" }
+cms = { version = "=0.3.0-pre.1" }
cmpv2 = { version = "=0.3.0-pre.0", features = ["alloc"] }
-x509-cert = { version = "0.3.0-rc.0", default-features = false }
+x509-cert = { version = "0.3.0-rc.3", default-features = false }
[dev-dependencies]
hex-literal = "1"