Merge pull request #427 from ionut-arm/picky-bump-v7

Bump picky- crates
parallaxsecond · Sep 18, 2023 · 285d5bc · 285d5bc
2 parents 5fbdcaf + 8c8b220
commit 285d5bc
Show file tree

Hide file tree

Showing 11 changed files with 805 additions and 11 deletions.
diff --git a/.clippy.toml b/.clippy.toml
@@ -0,0 +1 @@
+msrv = "1.60.0"
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Build the container
         run: docker build -t ubuntucontainer tss-esapi/tests/ --file tss-esapi/tests/Dockerfile-ubuntu
       - name: Run the container
-        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.57.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
+        run: docker run -v $(pwd):/tmp/rust-tss-esapi -w /tmp/rust-tss-esapi/tss-esapi --env RUST_TOOLCHAIN_VERSION=1.60.0 ubuntucontainer /tmp/rust-tss-esapi/tss-esapi/tests/all-ubuntu.sh
   # All in one job as I think it is a big overhead to build and run the Docker
   # container?
   tests-ubuntu:

diff --git a/tss-esapi-sys/build.rs b/tss-esapi-sys/build.rs
@@ -57,7 +57,6 @@ fn main() {
     }
 }
 
-#[allow(clippy::uninlined_format_args)]
 #[cfg(feature = "generate-bindings")]
 pub fn generate_from_system(esapi_out: PathBuf) {
     pkg_config::Config::new()

diff --git a/tss-esapi/Cargo.toml b/tss-esapi/Cargo.toml
@@ -24,8 +24,8 @@ regex = "1.3.9"
 zeroize = { version = "1.1.0", features = ["zeroize_derive"] }
 tss-esapi-sys = { path = "../tss-esapi-sys", version = "0.4.0" }
 oid = "0.2.1"
-picky-asn1 = "0.3.0"
-picky-asn1-x509 = "0.6.1"
+picky-asn1 = "0.5.0"
+picky-asn1-x509 = "0.7.1"
 
 [dev-dependencies]
 env_logger = "0.9.0"

diff --git a/tss-esapi/src/tcti_ldr.rs b/tss-esapi/src/tcti_ldr.rs
@@ -166,7 +166,6 @@ impl TctiNameConf {
     }
 }
 
-#[allow(clippy::uninlined_format_args)]
 impl TryFrom<TctiNameConf> for CString {
     type Error = Error;