Bug 1803213 - Update pkcs11-bindings to 0.1.4. r=jschanck,supply-chain-reviewers

Differential Revision: https://phabricator.services.mozilla.com/D163374

Cargo.lock

@@ -4093,9 +4093,9 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "pkcs11-bindings"
-version = "0.1.1"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "780bf71a814823f87d50b5bfbfd4ba5f2af46819a01f0ac31238f650693eb592"
+checksum = "c20556de5b64f5d7213b8ea103b92261cac789b59978652d9cd831ba9f477c53"
 dependencies = [
  "bindgen",
 ]

supply-chain/audits.toml

@@ -946,6 +946,11 @@ who = "John M. Schanck <jmschanck@gmail.com>"
 criteria = "safe-to-deploy"
 version = "0.1.1"
 
+[[audits.pkcs11-bindings]]
+who = "Mike Hommey <mh+mozilla@glandium.org>"
+criteria = "safe-to-deploy"
+delta = "0.1.1 -> 0.1.4"
+
 [[audits.plane-split]]
 who = "Nicolas Silva <nical@fastmail.com>"
 criteria = "safe-to-deploy"

supply-chain/config.toml

@@ -335,10 +335,6 @@ criteria = "safe-to-deploy"
 version = "0.2.0"
 criteria = "safe-to-deploy"
 
-[[exemptions.codespan-reporting]]
-version = "0.11.1"
-criteria = "safe-to-deploy"
-
 [[exemptions.cookie]]
 version = "0.16.0"
 criteria = "safe-to-run"

supply-chain/imports.lock

@@ -50,6 +50,12 @@ criteria = "safe-to-deploy"
 version = "1.0.0"
 notes = "I am the author of this crate."
 
+[[audits.bytecodealliance.audits.codespan-reporting]]
+who = "Jamey Sharp <jsharp@fastly.com>"
+criteria = "safe-to-deploy"
+version = "0.11.1"
+notes = "This library uses `forbid(unsafe_code)` and has no filesystem or network I/O."
+
 [[audits.bytecodealliance.audits.crypto-common]]
 who = "Benjamin Bouvier <public@benj.me>"
 criteria = "safe-to-deploy"

third_party/rust/pkcs11-bindings/.cargo-checksum.json

@@ -1 +1 @@
-{"files":{"Cargo.toml":"3aa6a273775dc5e2045cab20190559e416371dbfe9fa89f50c2c44beb1c97d24","LICENSE":"c0813b208cee13e9e06931186dc83b9577dbaa02e6a9dfee170c4873f11878d9","build.rs":"803e766f05b2558a36873af2950e768f81f2aa954ce40d96ba7d83ac7c6dd953","pkcs11.h":"fb113f0bc62e0d0894dd1c499b10659e6c47a8ec00d467a186770e07f9c9e293","pkcs11f.h":"11ee1d5026b1590a6c4a12be1023a2aec9ee185ba31bfb470084e4b6254779ee","pkcs11t.h":"2a152db4d461e9a315428a3d037ff1ae896baa04af9d9409d696b3cbd4478c6c","src/lib.rs":"25f2ffe3aba98817b109b1bbfeccbde7a632aab353a032c6ccf7ea248b09af76","wrapper.h":"1b86ee3838c94bc5a5c9513ef6961f9b6b3a5f6dde7c6fbfdc0cf58cb0fbd318"},"package":"780bf71a814823f87d50b5bfbfd4ba5f2af46819a01f0ac31238f650693eb592"}
+{"files":{"Cargo.toml":"e841b757d7ed7c1017f578c349c25bd40ab41129e250e139fd28ba96f5eb0dd2","LICENSE":"c0813b208cee13e9e06931186dc83b9577dbaa02e6a9dfee170c4873f11878d9","build.rs":"b723afcfb415cf4f3a3b5f192052b25e9b405a51d3a5ae992d330907b9d29b0f","pkcs11.h":"fb113f0bc62e0d0894dd1c499b10659e6c47a8ec00d467a186770e07f9c9e293","pkcs11f.h":"11ee1d5026b1590a6c4a12be1023a2aec9ee185ba31bfb470084e4b6254779ee","pkcs11t.h":"2a152db4d461e9a315428a3d037ff1ae896baa04af9d9409d696b3cbd4478c6c","src/lib.rs":"0e59f13fef319963c999d79d1c1d5aa717a072b58004eee97461d6d845334aed","wrapper.h":"1b86ee3838c94bc5a5c9513ef6961f9b6b3a5f6dde7c6fbfdc0cf58cb0fbd318"},"package":"c20556de5b64f5d7213b8ea103b92261cac789b59978652d9cd831ba9f477c53"}

third_party/rust/pkcs11-bindings/Cargo.toml

@@ -12,7 +12,7 @@
 [package]
 edition = "2018"
 name = "pkcs11-bindings"
-version = "0.1.1"
+version = "0.1.4"
 authors = [
     "Dana Keeler <dkeeler@mozilla.com>",
     "John Schanck <jschanck@mozilla.com>",
@@ -21,9 +21,8 @@ build = "build.rs"
 description = "Rust bindings for the PKCS#11 specification"
 license = "MIT"
 repository = "https://github.com/mozilla/pkcs11-bindings"
-resolver = "1"
 
 [build-dependencies.bindgen]
-version = "0.59"
+version = ">= 0.59.2"
 features = ["runtime"]
 default-features = false

third_party/rust/pkcs11-bindings/build.rs

@@ -12,10 +12,6 @@ use std::path::PathBuf;
 struct PKCS11TypesParseCallbacks;
 
 impl ParseCallbacks for PKCS11TypesParseCallbacks {
-    fn will_parse_macro(&self, _name: &str) -> MacroParsingBehavior {
-        MacroParsingBehavior::Default
-    }
-
     fn int_macro(&self, name: &str, _value: i64) -> Option<IntKind> {
         if name == "CK_TRUE" || name == "CK_FALSE" {
             Some(IntKind::U8)
@@ -23,46 +19,6 @@ impl ParseCallbacks for PKCS11TypesParseCallbacks {
             Some(IntKind::ULong)
         }
     }
-
-    fn str_macro(&self, _name: &str, _value: &[u8]) {}
-
-    fn func_macro(&self, _name: &str, _value: &[&[u8]]) {}
-
-    fn enum_variant_behavior(
-        &self,
-        _enum_name: Option<&str>,
-        _original_variant_name: &str,
-        _variant_value: EnumVariantValue,
-    ) -> Option<EnumVariantCustomBehavior> {
-        None
-    }
-
-    fn enum_variant_name(
-        &self,
-        _enum_name: Option<&str>,
-        _original_variant_name: &str,
-        _variant_value: EnumVariantValue,
-    ) -> Option<String> {
-        None
-    }
-
-    fn item_name(&self, _original_item_name: &str) -> Option<String> {
-        None
-    }
-
-    fn include_file(&self, _filename: &str) {}
-
-    fn blocklisted_type_implements_trait(
-        &self,
-        _name: &str,
-        _derive_trait: DeriveTrait,
-    ) -> Option<ImplementsTrait> {
-        None
-    }
-
-    fn add_derives(&self, _name: &str) -> Vec<String> {
-        Vec::new()
-    }
 }
 
 fn main() {
@@ -78,8 +34,11 @@ fn main() {
         .allowlist_var("CK_TRUE")
         .allowlist_var("CK_FALSE")
         .allowlist_var("CK_UNAVAILABLE_INFORMATION")
+        .allowlist_var("CK_EFFECTIVELY_INFINITE")
+        .allowlist_var("CK_INVALID_HANDLE")
         .allowlist_var("CKA_.*")
         .allowlist_var("CKC_.*")
+        .allowlist_var("CKD_.*")
         .allowlist_var("CKF_.*")
         .allowlist_var("CKK_.*")
         .allowlist_var("CKM_.*")

third_party/rust/pkcs11-bindings/src/lib.rs

@@ -2,6 +2,7 @@
 
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
+#![allow(overflowing_literals)]
 include!(concat!(env!("OUT_DIR"), "/bindings.rs"));
 
 /// Constants from NSS [pkcs11n.h](https://hg.mozilla.org/projects/nss/file/tip/lib/util/pkcs11n.h)