Merge remote-tracking branch 'origin/master' into const-crypto-biguint

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.73.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -35,7 +35,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.73.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4
@@ -65,6 +65,6 @@ jobs:
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: nightly-2023-10-01
-      - run: cargo test --release
+          toolchain: nightly-2024-10-06
+      - run: cargo test --release --features nightly
       - run: cargo build --benches

.github/workflows/workspace.yml

@@ -17,7 +17,7 @@ jobs:
       - uses: RustCrypto/actions/cargo-cache@master
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.79.0
+          toolchain: 1.81.0
           components: clippy
       - run: cargo clippy --all -- -D warnings
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rsa"
-version = "0.10.0-pre.2"
+version = "0.10.0-pre.3"
 authors = ["RustCrypto Developers", "dignifiedquire <[email protected]>"]
 edition = "2021"
 description = "Pure Rust RSA implementation"
@@ -10,17 +10,17 @@ repository = "https://github.com/RustCrypto/RSA"
 keywords = ["rsa", "encryption", "security", "crypto"]
 categories = ["cryptography"]
 readme = "README.md"
-rust-version = "1.73"
+rust-version = "1.81"
 
 [dependencies]
 rand_core = { version = "0.6.4", default-features = false }
 const-oid = { version = "=0.10.0-rc.0", default-features = false }
 subtle = { version = "2.6.1", default-features = false }
 digest = { version = "=0.11.0-pre.9", default-features = false, features = ["alloc", "oid"] }
-pkcs1 = { version = "=0.8.0-rc.0", default-features = false, features = ["alloc", "pkcs8"] }
-pkcs8 = { version = "=0.11.0-rc.0", default-features = false, features = ["alloc"] }
-signature = { version = "=2.3.0-pre.4", default-features = false , features = ["alloc", "digest", "rand_core"] }
-spki = { version = "=0.8.0-rc.0", default-features = false, features = ["alloc"] }
+pkcs1 = { version = "0.8.0-rc.0", default-features = false, features = ["alloc", "pkcs8"] }
+pkcs8 = { version = "0.11.0-rc.0", default-features = false, features = ["alloc"] }
+signature = { version = "=2.3.0-pre.4", default-features = false, features = ["alloc", "digest", "rand_core"] }
+spki = { version = "0.8.0-rc.1", default-features = false, features = ["alloc"] }
 zeroize = { version = "1.5", features = ["alloc"] }
 crypto-bigint = { version = "0.6.0-rc.2", default-features = false, features = ["zeroize", "alloc"] }
 crypto-primes = { version = "0.6.0-pre.0" }
@@ -67,5 +67,8 @@ opt-level = 2
 debug = true
 
 [patch.crates-io]
+pkcs1 = { git = "https://github.com/RustCrypto/formats.git" }
+pkcs8 = { git = "https://github.com/RustCrypto/formats.git" }
+
 # crypto-bigint = { git = "https://github.com/RustCrypto/crypto-bigint", branch = "master" }
 # crypto-bigint = { path = "../rustcrypto/crypto-bigint" }

README.md

@@ -102,7 +102,7 @@ dual licensed as above, without any additional terms or conditions.
 
 [//]: # (badges)
 
-[crate-image]: https://buildstats.info/crate/rsa
+[crate-image]: https://img.shields.io/crates/v/rsa
 [crate-link]: https://crates.io/crates/rsa
 [doc-image]: https://docs.rs/rsa/badge.svg
 [doc-link]: https://docs.rs/rsa

src/encoding.rs

@@ -10,7 +10,8 @@ use crate::{
 use core::convert::{TryFrom, TryInto};
 use crypto_bigint::{BoxedUint, NonZero, Odd};
 use pkcs8::{
-    der::Encode, Document, EncodePrivateKey, EncodePublicKey, ObjectIdentifier, SecretDocument,
+    der::{asn1::OctetStringRef, Encode},
+    Document, EncodePrivateKey, EncodePublicKey, ObjectIdentifier, SecretDocument,
 };
 use zeroize::Zeroizing;
 
@@ -38,10 +39,10 @@ pub(crate) fn verify_algorithm_id(
     Ok(())
 }
 
-impl TryFrom<pkcs8::PrivateKeyInfo<'_>> for RsaPrivateKey {
+impl TryFrom<pkcs8::PrivateKeyInfoRef<'_>> for RsaPrivateKey {
     type Error = pkcs8::Error;
 
-    fn try_from(private_key_info: pkcs8::PrivateKeyInfo<'_>) -> pkcs8::Result<Self> {
+    fn try_from(private_key_info: pkcs8::PrivateKeyInfoRef<'_>) -> pkcs8::Result<Self> {
         verify_algorithm_id(&private_key_info.algorithm)?;
 
         let pkcs1_key = pkcs1::RsaPrivateKey::try_from(private_key_info.private_key)?;
@@ -149,7 +150,11 @@ impl EncodePrivateKey for RsaPrivateKey {
         }
         .to_der()?;
 
-        pkcs8::PrivateKeyInfo::new(pkcs1::ALGORITHM_ID, private_key.as_ref()).try_into()
+        pkcs8::PrivateKeyInfoRef::new(
+            pkcs1::ALGORITHM_ID,
+            OctetStringRef::new(private_key.as_ref())?,
+        )
+        .try_into()
     }
 }
 

src/pkcs1v15/signing_key.rs

@@ -241,13 +241,13 @@ where
         };
 }
 
-impl<D> TryFrom<pkcs8::PrivateKeyInfo<'_>> for SigningKey<D>
+impl<D> TryFrom<pkcs8::PrivateKeyInfoRef<'_>> for SigningKey<D>
 where
     D: Digest + AssociatedOid,
 {
     type Error = pkcs8::Error;
 
-    fn try_from(private_key_info: pkcs8::PrivateKeyInfo<'_>) -> pkcs8::Result<Self> {
+    fn try_from(private_key_info: pkcs8::PrivateKeyInfoRef<'_>) -> pkcs8::Result<Self> {
         private_key_info
             .algorithm
             .assert_algorithm_oid(pkcs1::ALGORITHM_OID)?;

src/pss/blinded_signing_key.rs

@@ -201,13 +201,13 @@ where
     }
 }
 
-impl<D> TryFrom<pkcs8::PrivateKeyInfo<'_>> for BlindedSigningKey<D>
+impl<D> TryFrom<pkcs8::PrivateKeyInfoRef<'_>> for BlindedSigningKey<D>
 where
     D: Digest + AssociatedOid,
 {
     type Error = pkcs8::Error;
 
-    fn try_from(private_key_info: pkcs8::PrivateKeyInfo<'_>) -> pkcs8::Result<Self> {
+    fn try_from(private_key_info: pkcs8::PrivateKeyInfoRef<'_>) -> pkcs8::Result<Self> {
         RsaPrivateKey::try_from(private_key_info).map(Self::new)
     }
 }

src/pss/signing_key.rs

@@ -225,13 +225,13 @@ where
     }
 }
 
-impl<D> TryFrom<pkcs8::PrivateKeyInfo<'_>> for SigningKey<D>
+impl<D> TryFrom<pkcs8::PrivateKeyInfoRef<'_>> for SigningKey<D>
 where
     D: Digest + AssociatedOid,
 {
     type Error = pkcs8::Error;
 
-    fn try_from(private_key_info: pkcs8::PrivateKeyInfo<'_>) -> pkcs8::Result<Self> {
+    fn try_from(private_key_info: pkcs8::PrivateKeyInfoRef<'_>) -> pkcs8::Result<Self> {
         verify_algorithm_id(&private_key_info.algorithm)?;
         RsaPrivateKey::try_from(private_key_info).map(Self::new)
     }

src/pss/verifying_key.rs

@@ -46,6 +46,11 @@ where
             phantom: Default::default(),
         }
     }
+
+    /// Return specified salt length for this key
+    pub fn salt_len(&self) -> usize {
+        self.salt_len
+    }
 }
 
 //