aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2026-10-13 14:26:16 +0200
committerWerner Koch <[email protected]>2026-10-13 14:26:22 +0200
commit59ca3bd3439e7e91996000aafd8418aab8bb89d2 (patch)
tree5ca9fb72e8b2bc9cf52e0ffc7068a77ff4b03d17
parentgpg: Fill the curve field also for the RFC9980 algos. (diff)
downloadgnupg-59ca3bd3439e7e91996000aafd8418aab8bb89d2.tar.gz
gnupg-59ca3bd3439e7e91996000aafd8418aab8bb89d2.zip
Silence the compiler and add OIDs to gpgsm.
* sm/keylist.c (oidtranstbl): Add some algos. * tools/gpgconf.c: Silence compiler warning.
-rw-r--r--sm/keylist.c14
-rw-r--r--tools/gpgconf.c2
2 files changed, 15 insertions, 1 deletions
diff --git a/sm/keylist.c b/sm/keylist.c
index 232dcdc1a..e68bbe056 100644
--- a/sm/keylist.c
+++ b/sm/keylist.c
@@ -91,6 +91,20 @@ static struct
{ "2.16.840.1.101.3.4.3.18", "ml-dsa-65" },
{ "2.16.840.1.101.3.4.3.19", "ml-dsa-87" },
+ { "1.3.6.1.5.5.7.6.55", "ml-kem768-rsa2024-sha3-256" },
+ { "1.3.6.1.5.5.7.6.56", "ml-kem768-rsa3072-sha3-256" },
+ { "1.3.6.1.5.5.7.6.57", "ml-kem768-rsa4096-sha3-256" },
+ { "1.3.6.1.5.5.7.6.58", "ml-kem768-x25519-sha3-256" },
+ { "1.3.6.1.5.5.7.6.59", "ml-kem768-np256-sha3-256" },
+ { "1.3.6.1.5.5.7.6.59", "ml-kem768-np256-sha3-256" },
+ { "1.3.6.1.5.5.7.6.60", "ml-kem768-np384-sha3-256" },
+ { "1.3.6.1.5.5.7.6.61", "ml-kem768-bp256-sha3-256" },
+ { "1.3.6.1.5.5.7.6.62", "ml-kem1024-rsa3072-sha3-256" },
+ { "1.3.6.1.5.5.7.6.63", "ml-kem1024-np384-sha3-256" },
+ { "1.3.6.1.5.5.7.6.64", "ml-kem1024-bp384-sha3-256" },
+ { "1.3.6.1.5.5.7.6.65", "ml-kem1024-x448-sha3-256" },
+ { "1.3.6.1.5.5.7.6.66", "ml-kem1024-np521-sha3-256" },
+
/* Telesec extensions. */
{ "0.2.262.1.10.12.0", "certExtensionLiabilityLimitationExt" },
{ "0.2.262.1.10.12.1", "telesecCertIdExt" },
diff --git a/tools/gpgconf.c b/tools/gpgconf.c
index a485bbc48..2bbb22230 100644
--- a/tools/gpgconf.c
+++ b/tools/gpgconf.c
@@ -295,7 +295,6 @@ list_dirs (estream_t fp, char **names, int show_config_mode)
int idx, j;
char *tmp;
const char *s;
- gpg_error_t err;
if (show_config_mode)
es_fprintf (fp, "#+begin_example\n");
@@ -334,6 +333,7 @@ list_dirs (estream_t fp, char **names, int show_config_mode)
#ifdef HAVE_W32_SYSTEM
if (list[idx].extra && show_config_mode)
{
+ gpg_error_t err;
estream_t tmpfp;
tmpfp = es_fopen (s, "rb");