working ecdsa keys

Signed-off-by: Marcel Guzik <marcel.guzik@cumulocity.com>

Author: Bravo555

Cargo.lock

@@ -17,6 +17,7 @@ anyhow = { workspace = true }
 asn1-rs = { workspace = true }
 base64 = { workspace = true }
 camino = { workspace = true }
+elliptic-curve = "0.13.8"
 pem.workspace = true
 rcgen = { workspace = true }
 reqwest = { workspace = true, optional = true, features = [

crates/common/certificate/Cargo.toml

@@ -209,13 +209,14 @@ impl KeyKind {
         cryptoki_config: CryptokiConfig,
         private_key_label: String,
         public_key_pem: String,
+        sigalg: SigAlg,
     ) -> Result<Self, CertificateError> {
         let public_key = pem::parse(public_key_pem).unwrap();
         let public_key_raw = public_key.into_contents();
         trace!("pubkey raw: {public_key_raw:x?}");
 
         // TODO: implement other algs
-        let algorithm = &rcgen::PKCS_RSA_SHA256;
+        let algorithm = sigalg.into();
 
         // construct a URI that uses private key we just created to sign
         let mut cryptoki_config = cryptoki_config;
@@ -225,7 +226,7 @@ impl KeyKind {
         };
         let private_key_uri = match uri {
             Some(uri) if uri.contains("object=") => {
-                let mut uri: String = uri
+                let uri: String = uri
                     .strip_prefix("pkcs11:")
                     .unwrap_or("")
                     .split(';')
@@ -248,6 +249,23 @@ impl KeyKind {
     }
 }
 
+#[derive(Debug, Clone, Copy, PartialEq, Eq)]
+pub enum SigAlg {
+    PkcsRsaSha256,
+    PkcsEcdsaP256Sha256,
+    PkcsEcdsaP384Sha384,
+}
+
+impl From<SigAlg> for &'static rcgen::SignatureAlgorithm {
+    fn from(value: SigAlg) -> Self {
+        match value {
+            SigAlg::PkcsRsaSha256 => &rcgen::PKCS_RSA_SHA256,
+            SigAlg::PkcsEcdsaP256Sha256 => &rcgen::PKCS_ECDSA_P256_SHA256,
+            SigAlg::PkcsEcdsaP384Sha384 => &rcgen::PKCS_ECDSA_P384_SHA384,
+        }
+    }
+}
+
 /// A key pair using a remote private key.
 ///
 /// To generate a CSR we need:

crates/common/certificate/src/lib.rs

@@ -25,12 +25,15 @@ certificate = { workspace = true }
 clap = { workspace = true }
 clap_complete = { version = "4.5.42", features = ["unstable-dynamic"] }
 doku = { workspace = true }
+elliptic-curve = { version = "0.13.8", features = ["arithmetic", "sec1", "std"] }
 flate2 = { workspace = true }
 humantime = { workspace = true }
 hyper = { workspace = true, default-features = false }
 mime_guess = { workspace = true }
 mqtt_channel = { workspace = true }
 nix = { workspace = true }
+p256 = "0.13.2"
+p384 = "0.13.1"
 pad = { workspace = true }
 pem.workspace = true
 rasn = { workspace = true }

crates/core/tedge/Cargo.toml

@@ -220,6 +220,7 @@ impl BuildCommand for TEdgeCertCli {
                         config,
                         privkey_label: None,
                         pubkey_pem: None,
+                        sigalg: None,
                     })
                     .unwrap_or(Key::Local(
                         config.device_key_path(cloud.as_ref())?.to_owned(),
@@ -356,6 +357,7 @@ impl BuildCommand for TEdgeCertCli {
                         config,
                         privkey_label: None,
                         pubkey_pem: None,
+                        sigalg: None,
                     })
                     .unwrap_or(Key::Local(
                         config
@@ -448,6 +450,7 @@ impl BuildCommand for TEdgeCertCli {
                             config,
                             privkey_label: None,
                             pubkey_pem: None,
+                            sigalg: None,
                         })
                         .unwrap_or(Key::Local(
                             config.device_key_path(cloud.as_ref())?.to_owned(),

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

@@ -44,6 +44,8 @@ pub enum Key {
         // TODO: move it where it makes sense
         privkey_label: Option<String>,
         pubkey_pem: Option<String>,
+        // TODO: hack to pass sigalg
+        sigalg: Option<certificate::SigAlg>,
     },
 }
 
@@ -76,6 +78,7 @@ impl CreateCsrCmd {
                 config,
                 privkey_label,
                 pubkey_pem,
+                sigalg,
             } => {
                 let current_cert = self.current_cert.clone();
                 match current_cert {
@@ -86,6 +89,7 @@ impl CreateCsrCmd {
                         config.clone(),
                         privkey_label.clone().unwrap(),
                         pubkey_pem.as_ref().unwrap().clone(),
+                        sigalg.expect("sigalg should be set when generating a new key"),
                     )?,
                 }
             }