diff options
| author | Werner Koch <[email protected]> | 2024-08-27 08:42:53 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2024-08-27 08:44:17 +0000 |
| commit | 8896bbd0f99c09f34ff44c62a48bdf5023da8a98 (patch) | |
| tree | 312a4926773bb1a72dddce9bd51e2b6f18da12c9 /common | |
| parent | gpg: New option --proc-all-sigs (diff) | |
| download | gnupg-8896bbd0f99c09f34ff44c62a48bdf5023da8a98.tar.gz gnupg-8896bbd0f99c09f34ff44c62a48bdf5023da8a98.zip | |
gpg: Switch Kyber to the final algo id and add it to the menu.
* common/openpgpdefs.h (pubkey_algo_t): Switch algo id for Kyber to 8.
* g10/keygen.c (do_generate_keypair): Remove the experimental algo
note ...
(write_keybinding): and the experimental notation data.
(ask_algo): Add a mode 16 for a Kyber subkey.
(generate_subkeypair): Set parameters for mode 16.
--
GnuPG-bug-id: 6815
Diffstat (limited to 'common')
| -rw-r--r-- | common/openpgpdefs.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/openpgpdefs.h b/common/openpgpdefs.h index f05f83014..b3e4fbd5e 100644 --- a/common/openpgpdefs.h +++ b/common/openpgpdefs.h @@ -165,7 +165,7 @@ typedef enum PUBKEY_ALGO_RSA = 1, PUBKEY_ALGO_RSA_E = 2, /* RSA encrypt only (legacy). */ PUBKEY_ALGO_RSA_S = 3, /* RSA sign only (legacy). */ - /*PUBKEY_ALGO_KYBER = 8, Kyber (FIPS-203 final) */ + PUBKEY_ALGO_KYBER = 8, /* Kyber (FIPS-203 final) */ PUBKEY_ALGO_ELGAMAL_E = 16, /* Elgamal encrypt only. */ PUBKEY_ALGO_DSA = 17, PUBKEY_ALGO_ECDH = 18, /* RFC-6637 */ @@ -173,7 +173,7 @@ typedef enum PUBKEY_ALGO_ELGAMAL = 20, /* Elgamal encrypt+sign (legacy). */ /* 21 reserved by OpenPGP. */ PUBKEY_ALGO_EDDSA = 22, /* EdDSA. */ - PUBKEY_ALGO_KYBER = 29, /* Kyber */ + /* 29 (was fips203.ipd.2023-08-24 in 1.5.0) */ PUBKEY_ALGO_DIL3_25519 = 35, /* Dilithium3 + Ed25519 (aka ML-DSA-65) */ PUBKEY_ALGO_DIL5_448 = 36, /* Dilithium5 + Ed448 (aka ML-DSA-87) */ PUBKEY_ALGO_SPHINX_SHA2 = 41, /* SPHINX+-simple-SHA2 (aka SLH-DSA-SHA2) */ |