Merge remote-tracking branch 'rustcrypto/master' into cms/pwri-builder

RustCrypto · Oct 16, 2024 · e374257 · e374257
2 parents 48e0a4e + 8a854c7
commit e374257
Show file tree

Hide file tree

Showing 9 changed files with 21 additions and 22 deletions.
diff --git a/.github/workflows/pem-rfc7468.yml b/.github/workflows/pem-rfc7468.yml
@@ -24,7 +24,7 @@ jobs:
  strategy:
  matrix:
  rust:
- - 1.65.0 # MSRV
+ - 1.81.0 # MSRV
  - stable
  target:
  - thumbv7em-none-eabi
@@ -41,14 +41,14 @@ jobs:
  minimal-versions:
  uses: RustCrypto/actions/.github/workflows/minimal-versions.yml@master
  with:
-  working-directory: ${{ github.workflow }}
+ working-directory: ${{ github.workflow }}
 
  test:
  runs-on: ubuntu-latest
  strategy:
  matrix:
  rust:
- - 1.65.0 # MSRV
+ - 1.81.0 # MSRV
  - stable
  steps:
  - uses: actions/checkout@v4

diff --git a/.github/workflows/security-audit.yml b/.github/workflows/security-audit.yml
@@ -21,10 +21,11 @@ jobs:
  - uses: dtolnay/rust-toolchain@master
  with:
  toolchain: stable
- - uses: actions/cache@v4
- with:
- path: ~/.cargo/bin
- key: ${{ runner.os }}-cargo-audit-v0.20
+ # TODO(tarcieri): investigate why cached binaries aren't working
+ #- uses: actions/cache@v4
+ # with:
+ # path: ~/.cargo/bin
+ # key: ${{ runner.os }}-cargo-audit-v0.20
  - uses: rustsec/audit-check@v2
  with:
  token: ${{ secrets.GITHUB_TOKEN }}

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cms/src/builder.rs b/cms/src/builder.rs
@@ -438,7 +438,7 @@ impl<'s> SignedDataBuilder<'s> {
  S: Keypair + DynSignatureAlgorithmIdentifier,
  S: AsyncSigner<Signature>,
  S::VerifyingKey: EncodePublicKey,
- Signature: SignatureBitStringEncoding + 'static,
+ Signature: SignatureBitStringEncoding,
  {
  let signer_info = signer_info_builder
  .build_async::<S, Signature>(signer)
@@ -461,7 +461,7 @@ impl<'s> SignedDataBuilder<'s> {
  S: Keypair + DynSignatureAlgorithmIdentifier,
  S: AsyncRandomizedSigner<Signature>,
  S::VerifyingKey: EncodePublicKey,
- Signature: SignatureBitStringEncoding + 'static,
+ Signature: SignatureBitStringEncoding,
  {
  let signer_info = signer_info_builder
  .build_with_rng_async::<S, Signature>(signer, rng)

diff --git a/pem-rfc7468/Cargo.toml b/pem-rfc7468/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pem-rfc7468"
-version = "1.0.0-rc.1"
+version = "1.0.0-rc.2"
 description = """
 PEM Encoding (RFC 7468) for PKIX, PKCS, and CMS Structures, implementing a
 strict subset of the original Privacy-Enhanced Mail encoding intended
@@ -16,7 +16,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std", "parser-i
 keywords = ["crypto", "key", "pem", "pkcs", "rsa"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.60"
+rust-version = "1.81"
 
 [dependencies]
 base64ct = { version = "1.4" }

diff --git a/pem-rfc7468/README.md b/pem-rfc7468/README.md
@@ -58,7 +58,7 @@ to practically extract RSA private keys from SGX enclaves.
 
 ## Minimum Supported Rust Version
 
-This crate requires **Rust 1.60** at a minimum.
+This crate requires **Rust 1.81** at a minimum.
 
 We may change the MSRV in the future, but it will be accompanied by a minor
 version bump.
@@ -87,7 +87,7 @@ dual licensed as above, without any additional terms or conditions.
 [build-image]: https://github.com/RustCrypto/formats/actions/workflows/pem-rfc7468.yml/badge.svg
 [build-link]: https://github.com/RustCrypto/formats/actions/workflows/pem-rfc7468.yml
 [license-image]: https://img.shields.io/badge/license-Apache2.0/MIT-blue.svg
-[rustc-image]: https://img.shields.io/badge/rustc-1.60+-blue.svg
+[rustc-image]: https://img.shields.io/badge/rustc-1.81+-blue.svg
 [chat-image]: https://img.shields.io/badge/zulip-join_chat-blue.svg
 [chat-link]: https://rustcrypto.zulipchat.com/#narrow/stream/300570-formats
 

diff --git a/pem-rfc7468/src/error.rs b/pem-rfc7468/src/error.rs
@@ -70,8 +70,7 @@ impl fmt::Display for Error {
  }
 }
 
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}
+impl core::error::Error for Error {}
 
 impl From<base64ct::Error> for Error {
  fn from(err: base64ct::Error) -> Error {

diff --git a/sec1/Cargo.toml b/sec1/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "sec1"
-version = "0.8.0-rc.2"
+version = "0.8.0-rc.3"
 description = """
 Pure Rust implementation of SEC1: Elliptic Curve Cryptography encoding formats
 including ASN.1 DER-serialized private keys as well as the

diff --git a/sec1/src/error.rs b/sec1/src/error.rs
@@ -36,6 +36,8 @@ pub enum Error {
  Version,
 }
 
+impl core::error::Error for Error {}
+
 impl fmt::Display for Error {
  fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
  match self {
@@ -77,6 +79,3 @@ impl From<pkcs8::spki::Error> for Error {
  Error::Pkcs8(pkcs8::Error::PublicKey(err))
  }
 }
-
-#[cfg(feature = "std")]
-impl std::error::Error for Error {}