fixup! use CryptokiConfigDirect if configured

Author: Bravo555

crates/core/tedge/src/cli/certificate/create_key.rs

@@ -33,12 +33,7 @@ impl Command for CreateKeyCmd {
         "Generate a keypair.".into()
     }
 
-    async fn execute(&self, config: TEdgeConfig) -> Result<(), MaybeFancy<anyhow::Error>> {
-        // let socket_path = &config.device.cryptoki.socket_path;
-        // let pkcs11client = tedge_p11_server::client::TedgeP11Client::with_ready_check(
-        //     socket_path.as_std_path().into(),
-        // );
-
+    async fn execute(&self, _config: TEdgeConfig) -> Result<(), MaybeFancy<anyhow::Error>> {
         let key = match self.r#type {
             KeyType::Rsa => KeyTypeParams::Rsa { bits: self.bits },
             KeyType::Ec => KeyTypeParams::Ec { curve: self.curve },
@@ -51,10 +46,8 @@ impl Command for CreateKeyCmd {
 
         // generate a keypair
         // should probably verify the keys before using them
-        let pubkey_pem = {
-            let cryptoki = tedge_p11_server::tedge_p11_service(self.cryptoki_config.clone())?;
-            cryptoki.create_key(None, params)?
-        };
+        let cryptoki = tedge_p11_server::tedge_p11_service(self.cryptoki_config.clone())?;
+        let pubkey_pem = cryptoki.create_key(None, params)?;
 
         eprintln!("New keypair was successfully created.");
 
@@ -71,9 +64,8 @@ impl Command for CreateKeyCmd {
             }
         };
 
-        let cryptoki_config = config.device.cryptoki_config(None).unwrap().unwrap();
         let key = super::create_csr::Key::Cryptoki {
-            config: cryptoki_config,
+            config: self.cryptoki_config.clone(),
             privkey_label: Some(self.label.clone()),
             pubkey_pem: Some(pubkey_pem.clone()),
             sigalg: Some(sigalg),

crates/extensions/tedge-p11-server/src/signer.rs

@@ -14,7 +14,7 @@ use crate::pkcs11::CryptokiConfigDirect;
 use crate::pkcs11::Pkcs11Signer;
 use crate::pkcs11::SigScheme;
 
-pub trait TedgeP11Service {
+pub trait TedgeP11Service: Send + Sync {
     fn signer(&self, uri: Option<&str>) -> anyhow::Result<Arc<dyn TedgeP11Signer>>;
     fn create_key(&self, uri: Option<&str>, params: CreateKeyParams) -> anyhow::Result<String>;
 }