build(rust): Bump cryptoki to 0.12.0

Updates the cryptoki crate to version 0.12.0 and cryptoki-sys to 0.5.0.
Removes local patches that are now upstreamed and updates the library
initialization code to match the new API.

Signed-off-by: Willy Zhang <[email protected]>

Author: Willy Zhang

MODULE.bazel

@@ -145,26 +145,19 @@ crate.annotation(
 )
 crate.annotation(
     crate = "cryptoki",
-    patch_args = ["-p2"],
-    patches = [
-        "@lowrisc_opentitan//third_party/rust/patches:cryptoki-vendor-defined-mechanism-type.patch",
-        "@lowrisc_opentitan//third_party/rust/patches:cryptoki-profile.patch",
-    ],
     repositories = ["crate_index"],
 )
 crate.annotation(
     additive_build_file_content = """
         filegroup(
-            name = "binding_srcs",
-            srcs = [
-                "src/lib.rs",
-                "src/bindings/x86_64-unknown-linux-gnu.rs",
-            ],
+            name = "cryptoki-sys-binding-srcs",
+            srcs = glob(["src/bindings/*.rs"]),
+            visibility = ["//visibility:public"],
         )
     """,
     crate = "cryptoki-sys",
     extra_aliased_targets = {
-        "cryptoki-sys-binding-srcs": "binding_srcs",
+        "cryptoki-sys-binding-srcs": "cryptoki-sys-binding-srcs",
     },
     repositories = ["crate_index"],
 )

MODULE.bazel.lock

@@ -124,7 +124,8 @@ def get_names(self):
                             raise Exception(
                                 'Expected objects to all be of uniform type',
                                 name, tp, m.group(2))
-                        names.append(name)
+                        if name not in names:
+                            names.append(name)
         return (names, tp)
 
     @staticmethod

sw/host/hsmtool/scripts/pkcs11_consts.py

@@ -4,6 +4,7 @@
 
 use anyhow::{Context, Result};
 use cryptoki::context::CInitializeArgs;
+use cryptoki::context::CInitializeFlags;
 use cryptoki::context::Pkcs11;
 use cryptoki::session::Session;
 use cryptoki::session::UserType;
@@ -53,7 +54,7 @@ pub struct Module {
 impl Module {
     pub fn initialize(module: &str) -> Result<Self> {
         let pkcs11 = Pkcs11::new(module)?;
-        pkcs11.initialize(CInitializeArgs::OsThreads)?;
+        pkcs11.initialize(CInitializeArgs::new(CInitializeFlags::OS_LOCKING_OK))?;
         Ok(Module {
             pkcs11,
             session: None,
@@ -99,7 +100,7 @@ impl Module {
         let slot = self.get_token(token)?;
         let session = self.pkcs11.open_rw_session(slot)?;
         if let Some(user) = user {
-            let pin = pin.map(|x| AuthPin::new(x.to_owned()));
+            let pin = pin.map(|x| AuthPin::new(x.to_owned().into()));
             session
                 .login(user, pin.as_ref())
                 .context("Failed HSM Login")?;