From 9c35ffa0190b875eb6735557a535c7d68cd8a651 Mon Sep 17 00:00:00 2001
From: David Runge <dave@sleepmap.de>
Date: Mon, 5 Jun 2023 13:46:03 +0200
Subject: [PATCH] Use common abstraction to get CipherSuite in `sq key
 generate`

Use `sq_cli::key::CipherSuite::as_ciphersuite()` in `sq key` subcommand
to derive a valid `openpgp::cert::CipherSuite` from a variant of
`sq_cli::key::CipherSuite`.
---
 src/commands/key/generate.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/src/commands/key/generate.rs b/src/commands/key/generate.rs
index 902aa657..6384ed69 100644
--- a/src/commands/key/generate.rs
+++ b/src/commands/key/generate.rs
@@ -3,7 +3,6 @@ use chrono::Utc;
 
 use openpgp::armor::Kind;
 use openpgp::armor::Writer;
-use openpgp::cert::prelude::*;
 use openpgp::cert::CertBuilder;
 use openpgp::serialize::Serialize;
 use openpgp::types::KeyFlags;
@@ -40,18 +39,9 @@ pub fn generate(
     );
 
     // Cipher Suite
-    use sq_cli::key::CipherSuite::*;
-    match command.cipher_suite {
-        Rsa3k => {
-            builder = builder.set_cipher_suite(CipherSuite::RSA3k);
-        }
-        Rsa4k => {
-            builder = builder.set_cipher_suite(CipherSuite::RSA4k);
-        }
-        Cv25519 => {
-            builder = builder.set_cipher_suite(CipherSuite::Cv25519);
-        }
-    }
+    builder = builder.set_cipher_suite(
+        command.cipher_suite.as_ciphersuite()
+    );
 
     // Signing Capability
     match (command.can_sign, command.cannot_sign) {