chore(deps): bump hybrid-array from 0.2.0-rc.9 to 0.2.0-rc.10 (#1525)

* chore(deps): bump hybrid-array from 0.2.0-rc.9 to 0.2.0-rc.10 Bumps [hybrid-array](https://github.com/RustCrypto/hybrid-array) from 0.2.0-rc.9 to 0.2.0-rc.10. - [Changelog](https://github.com/RustCrypto/hybrid-array/blob/master/CHANGELOG.md) - [Commits](RustCrypto/hybrid-array@v0.2.0-rc.9...v0.2.0-rc.10) --- updated-dependencies: - dependency-name: hybrid-array dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> * pkcs12,pkcs5,sec1,spki,x509-cert,x509-ocsp: bump msrv to 1.81 * cms: bump MSRV to 1.81 * cmpv2,gss-api: bump MSRV to 1.81 * crmf: bump MSRV to 1.81 * pkcs1,pkcs8,x509-tsp: bump MSRV to 1.81 * x509-cert(clippy): fixup warnings `duplicated attribute` and `bound is defined in more than one place` warning were displayed * der(clippy): uint <-> int conversion safety * tls_codec_derive(clippy): fixup warning --------- Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Arthur Gautier <[email protected]>
RustCrypto · Sep 24, 2024 · d801da6 · d801da6
1 parent af100a0
commit d801da6
Show file tree

Hide file tree

Showing 33 changed files with 56 additions and 52 deletions.
diff --git a/.github/workflows/cmpv2.yml b/.github/workflows/cmpv2.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/cms.yml b/.github/workflows/cms.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -57,7 +57,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/crmf.yml b/.github/workflows/crmf.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/gss-api.yml b/.github/workflows/gss-api.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pkcs1.yml b/.github/workflows/pkcs1.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pkcs12.yml b/.github/workflows/pkcs12.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -53,7 +53,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pkcs5.yml b/.github/workflows/pkcs5.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/pkcs8.yml b/.github/workflows/pkcs8.yml
@@ -28,7 +28,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -55,7 +55,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/sec1.yml b/.github/workflows/sec1.yml
@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/spki.yml b/.github/workflows/spki.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -52,7 +52,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.72.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/workspace.yml b/.github/workflows/workspace.yml
@@ -21,7 +21,7 @@ jobs:
       - uses: actions/checkout@v4
       - uses: dtolnay/rust-toolchain@master
         with:
-          toolchain: 1.75.0
+          toolchain: 1.81.0
           components: clippy
       - run: cargo clippy --all --all-features --tests
 

diff --git a/.github/workflows/x509-cert.yml b/.github/workflows/x509-cert.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -53,7 +53,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/x509-ocsp.yml b/.github/workflows/x509-ocsp.yml
@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -51,7 +51,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/.github/workflows/x509-tsp.yml b/.github/workflows/x509-tsp.yml
@@ -29,7 +29,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
         target:
           - thumbv7em-none-eabi
@@ -54,7 +54,7 @@ jobs:
     strategy:
       matrix:
         rust:
-          - 1.75.0 # MSRV
+          - 1.81.0 # MSRV
           - stable
     steps:
       - uses: actions/checkout@v4

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/cmpv2/Cargo.toml b/cmpv2/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std"]
 keywords = ["crypto"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 crmf = "=0.3.0-pre"

diff --git a/cms/Cargo.toml b/cms/Cargo.toml
@@ -12,7 +12,7 @@ categories = ["cryptography", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "pkcs7", "signing"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["alloc", "derive", "oid", "pem"] }

diff --git a/crmf/Cargo.toml b/crmf/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std"]
 keywords = ["crypto"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 cms = "=0.3.0-pre"

diff --git a/der/src/asn1/integer/int.rs b/der/src/asn1/integer/int.rs
@@ -30,6 +30,8 @@ macro_rules! impl_encoding_traits {
 
                     let bytes = reader.read_into(&mut buf[..max_length])?;
 
+                    // We actually want the conversion to overflow here
+                    #[allow(clippy::cast_possible_wrap)]
                     let result = if is_highest_bit_set(bytes) {
                         <$uint>::from_be_bytes(decode_to_array(bytes)?) as $int
                     } else {
@@ -48,6 +50,8 @@ macro_rules! impl_encoding_traits {
             impl EncodeValue for $int {
                 fn value_len(&self) -> Result<Length> {
                     if *self < 0 {
+                        // We actually want the conversion to overflow here
+                        #[allow(clippy::cast_sign_loss)]
                         negative_encoded_len(&(*self as $uint).to_be_bytes())
                     } else {
                         uint::encoded_len(&self.to_be_bytes())
@@ -56,6 +60,8 @@ macro_rules! impl_encoding_traits {
 
                 fn encode_value(&self, writer: &mut impl Writer) -> Result<()> {
                     if *self < 0 {
+                        // We actually want the conversion to overflow here
+                        #[allow(clippy::cast_sign_loss)]
                         encode_bytes(writer, &(*self as $uint).to_be_bytes())
                     } else {
                         uint::encode_bytes(writer, &self.to_be_bytes())

diff --git a/gss-api/Cargo.toml b/gss-api/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "authentication", "encoding", "no-std", "parser-im
 keywords = ["crypto", "gssapi", "kerberos", "krb5"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["oid", "alloc"] }

diff --git a/pkcs1/Cargo.toml b/pkcs1/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std", "parser-i
 keywords = ["crypto", "key", "pem", "pkcs", "rsa"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["oid"] }

diff --git a/pkcs12/Cargo.toml b/pkcs12/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "encoding", "no-std", "parser-implementations"]
 keywords = ["crypto", "key", "pkcs", "private"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["alloc", "derive", "oid", "pem"] }

diff --git a/pkcs5/Cargo.toml b/pkcs5/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std"]
 keywords = ["crypto", "key", "pkcs", "password"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["oid"] }

diff --git a/pkcs8/Cargo.toml b/pkcs8/Cargo.toml
@@ -14,7 +14,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std", "parser-i
 keywords = ["crypto", "key", "pkcs", "private"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["oid"] }

diff --git a/sec1/Cargo.toml b/sec1/Cargo.toml
@@ -14,12 +14,12 @@ categories = ["cryptography", "data-structures", "encoding", "no-std", "parser-i
 keywords = ["crypto", "key", "elliptic-curve", "secg"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.81"
 
 [dependencies]
 base16ct = { version = "0.2", optional = true, default-features = false }
 der = { version = "0.8.0-rc.0", optional = true, features = ["oid"] }
-hybrid-array = { version = "0.2.0-rc.9", optional = true, default-features = false }
+hybrid-array = { version = "0.2.0-rc.10", optional = true, default-features = false }
 pkcs8 = { version = "0.11.0-rc.1", optional = true, default-features = false }
 serdect = { version = "0.3.0-rc.0", optional = true, default-features = false, features = ["alloc"] }
 subtle = { version = "2", optional = true, default-features = false }

diff --git a/spki/Cargo.toml b/spki/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std"]
 keywords = ["crypto", "x509"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.72"
+rust-version = "1.81"
 
 [dependencies]
 der = { version = "0.8.0-rc.0", features = ["oid"] }

diff --git a/tls_codec/derive/tests/decode_bytes.rs b/tls_codec/derive/tests/decode_bytes.rs
@@ -240,9 +240,9 @@ fn enum_with_custom_serialized_field() {
 
 #[test]
 fn that_skip_attribute_on_struct_works() {
-    fn test<T: DeserializeBytes>(test: T, expected: T)
+    fn test<T>(test: T, expected: T)
     where
-        T: std::fmt::Debug + PartialEq + SerializeBytes + Size,
+        T: DeserializeBytes + std::fmt::Debug + PartialEq + SerializeBytes + Size,
     {
         let serialized = test.tls_serialize().unwrap();
         let (deserialized, rest) = T::tls_deserialize_bytes(&serialized).unwrap();

diff --git a/x509-cert/Cargo.toml b/x509-cert/Cargo.toml
@@ -13,7 +13,7 @@ categories = ["cryptography", "data-structures", "encoding", "no-std"]
 keywords = ["crypto"]
 readme = "README.md"
 edition = "2021"
-rust-version = "1.75"
+rust-version = "1.81"
 
 [dependencies]
 const-oid = { version = "0.10.0-rc.0", features = ["db"] }