From 459f437c19a6de5b7a205a488ba8a3c0ef8ae919 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 25 Aug 2025 16:33:54 +0200
Subject: gpg: Allow to select the Kyber variant with --edit-key,addkey.

* g10/keygen.c (generate_subkeypair): Ask for Kyber variant.
--

GnuPG-bug-id: 7792
---
 g10/keygen.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/g10/keygen.c b/g10/keygen.c
index e02b2f9e3..189127d28 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -6962,8 +6962,16 @@ generate_subkeypair (ctrl_t ctrl, kbnode_t keyblock, const char *algostr,
         }
       else if (algo == PUBKEY_ALGO_KYBER)
         {
-          nbits = 768;
-          curve = "brainpoolP256r1";
+          const char *kyberalgostr;
+
+          kyberalgostr = ask_kyber_variant ();
+          if (!kyberalgostr)  /* Should not happen.  */
+            kyberalgostr = PQC_STD_KEY_PARAM_SUB;
+
+          nbits = strstr (kyberalgostr, "768_")? 768 : 1024;
+          curve = strchr (kyberalgostr, '_');
+          log_assert (curve && curve[1]);
+          curve++;
         }
       else
         nbits = ask_keysize (algo, 0);
-- 
cgit v1.2.3