algorithms: rename GNUTLS_{PK,SIGN}_ML_DSA_* to GNUTLS_*_MLDSA*

To be consistent with ML-KEM algorithms, omit underscores in ML-DSA
gnutls_pk_algorithm_t and gnutls_sign_algorithm_t enum definitions,
while keeping hyphens in the human readable names.

Signed-off-by: Daiki Ueno <ueno@gnu.org>

diff --git a/NEWS b/NEWS
index 86cc5b5cd5d296276353ef9c6b953bbbae152c46..54c0026b7ec7ba2d0e93ed245c10840a36009831 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -21,12 +21,12 @@ See the end for copying conditions.
    draft-kwiatkowski-tls-ecdhe-mlkem-03.
 
 ** API and ABI modifications:
-GNUTLS_PK_ML_DSA_44: New enum member of gnutls_pk_algorithm_t
-GNUTLS_PK_ML_DSA_65: New enum member of gnutls_pk_algorithm_t
-GNUTLS_PK_ML_DSA_87: New enum member of gnutls_pk_algorithm_t
-GNUTLS_SIGN_ML_DSA_44: New enum member of gnutls_sign_algorithm_t
-GNUTLS_SIGN_ML_DSA_65: New enum member of gnutls_sign_algorithm_t
-GNUTLS_SIGN_ML_DSA_87: New enum member of gnutls_sign_algorithm_t
+GNUTLS_PK_MLDSA44: New enum member of gnutls_pk_algorithm_t
+GNUTLS_PK_MLDSA65: New enum member of gnutls_pk_algorithm_t
+GNUTLS_PK_MLDSA87: New enum member of gnutls_pk_algorithm_t
+GNUTLS_SIGN_MLDSA44: New enum member of gnutls_sign_algorithm_t
+GNUTLS_SIGN_MLDSA65: New enum member of gnutls_sign_algorithm_t
+GNUTLS_SIGN_MLDSA87: New enum member of gnutls_sign_algorithm_t
 
 * Version 3.8.8 (released 2024-11-05)
 

diff --git a/lib/algorithms.h b/lib/algorithms.h
index 5b0db514b8b5d4e4666fc1f8778baf3edae8e377..cad4da36c9574ff4a8dba79b45150caba84325d8 100644 (file)
--- a/lib/algorithms.h
+++ b/lib/algorithms.h
@@ -56,17 +56,17 @@
        (((x) == GNUTLS_PK_MLKEM768) || ((x) == GNUTLS_PK_MLKEM1024) || \
         ((x) == GNUTLS_PK_EXP_KYBER768))
 
-#define IS_ML_DSA(x)                                                     \
-       (((x) == GNUTLS_PK_ML_DSA_44) || ((x) == GNUTLS_PK_ML_DSA_65) || \
-        ((x) == GNUTLS_PK_ML_DSA_87))
+#define IS_ML_DSA(x)                                                 \
+       (((x) == GNUTLS_PK_MLDSA44) || ((x) == GNUTLS_PK_MLDSA65) || \
+        ((x) == GNUTLS_PK_MLDSA87))
 
-#define ML_DSA_44_PUBKEY_SIZE 1312
-#define ML_DSA_65_PUBKEY_SIZE 1952
-#define ML_DSA_87_PUBKEY_SIZE 2592
+#define MLDSA44_PUBKEY_SIZE 1312
+#define MLDSA65_PUBKEY_SIZE 1952
+#define MLDSA87_PUBKEY_SIZE 2592
 
-#define ML_DSA_44_PRIVKEY_SIZE 2560
-#define ML_DSA_65_PRIVKEY_SIZE 4032
-#define ML_DSA_87_PRIVKEY_SIZE 4896
+#define MLDSA44_PRIVKEY_SIZE 2560
+#define MLDSA65_PRIVKEY_SIZE 4032
+#define MLDSA87_PRIVKEY_SIZE 4896
 
 #define IS_GROUP_HYBRID(group) ((group)->ids[0] != GNUTLS_GROUP_INVALID)
 

diff --git a/lib/algorithms/publickey.c b/lib/algorithms/publickey.c
index 6b2325f159990eddada859442ff35f1e0672f3dd..5f10ea920dbfe1238ffbc295ec8811ccf41f8d00 100644 (file)
--- a/lib/algorithms/publickey.c
+++ b/lib/algorithms/publickey.c
@@ -219,18 +219,18 @@ static const gnutls_pk_entry pk_algorithms[] = {
          .curve = GNUTLS_ECC_CURVE_INVALID },
 #endif
        { .name = "ML-DSA-44",
-         .oid = ML_DSA_44_OID,
-         .id = GNUTLS_PK_ML_DSA_44,
+         .oid = MLDSA44_OID,
+         .id = GNUTLS_PK_MLDSA44,
          .curve = GNUTLS_ECC_CURVE_INVALID,
          .no_prehashed = 1 },
        { .name = "ML-DSA-65",
-         .oid = ML_DSA_65_OID,
-         .id = GNUTLS_PK_ML_DSA_65,
+         .oid = MLDSA65_OID,
+         .id = GNUTLS_PK_MLDSA65,
          .curve = GNUTLS_ECC_CURVE_INVALID,
          .no_prehashed = 1 },
        { .name = "ML-DSA-87",
-         .oid = ML_DSA_87_OID,
-         .id = GNUTLS_PK_ML_DSA_87,
+         .oid = MLDSA87_OID,
+         .id = GNUTLS_PK_MLDSA87,
          .curve = GNUTLS_ECC_CURVE_INVALID,
          .no_prehashed = 1 },
        { .name = "UNKNOWN",

diff --git a/lib/algorithms/secparams.c b/lib/algorithms/secparams.c
index 313530df337b11d4b4ccbdeb1e5d3eb9d2443a98..57068d6487efedab0e753820817339819c1c611b 100644 (file)
--- a/lib/algorithms/secparams.c
+++ b/lib/algorithms/secparams.c
@@ -65,9 +65,9 @@ static const gnutls_sec_params_entry sec_params[] = {
        { "High", GNUTLS_SEC_PARAM_HIGH, 128, 3072, 3072, 256, 256, 0 },
 #endif
        { "Ultra", GNUTLS_SEC_PARAM_ULTRA, 192, 8192, 8192, 384, 384,
-         ML_DSA_65_PUBKEY_SIZE },
+         MLDSA65_PUBKEY_SIZE },
        { "Future", GNUTLS_SEC_PARAM_FUTURE, 256, 15360, 15360, 512, 512,
-         ML_DSA_87_PUBKEY_SIZE },
+         MLDSA87_PUBKEY_SIZE },
        { NULL, 0, 0, 0, 0, 0, 0, 0 }
 };
 

diff --git a/lib/algorithms/sign.c b/lib/algorithms/sign.c
index 0688f3f83b70953cc0f8fda2e5369db0a61693e7..050842bb6fca7fadde4afffe4f072214e2c92f75 100644 (file)
--- a/lib/algorithms/sign.c
+++ b/lib/algorithms/sign.c
@@ -403,21 +403,21 @@ static SYSTEM_CONFIG_OR_CONST gnutls_sign_entry_st sign_algorithms[] = {
          .hash = GNUTLS_DIG_SHA512,
          .aid = TLS_SIGN_AID_UNKNOWN },
        { .name = "ML-DSA-44",
-         .oid = ML_DSA_44_OID,
-         .id = GNUTLS_SIGN_ML_DSA_44,
-         .pk = GNUTLS_PK_ML_DSA_44,
+         .oid = MLDSA44_OID,
+         .id = GNUTLS_SIGN_MLDSA44,
+         .pk = GNUTLS_PK_MLDSA44,
          .hash = GNUTLS_DIG_SHAKE_256,
          .aid = TLS_SIGN_AID_UNKNOWN },
        { .name = "ML-DSA-65",
-         .oid = ML_DSA_65_OID,
-         .id = GNUTLS_SIGN_ML_DSA_65,
-         .pk = GNUTLS_PK_ML_DSA_65,
+         .oid = MLDSA65_OID,
+         .id = GNUTLS_SIGN_MLDSA65,
+         .pk = GNUTLS_PK_MLDSA65,
          .hash = GNUTLS_DIG_SHAKE_256,
          .aid = TLS_SIGN_AID_UNKNOWN },
        { .name = "ML-DSA-87",
-         .oid = ML_DSA_87_OID,
-         .id = GNUTLS_SIGN_ML_DSA_87,
-         .pk = GNUTLS_PK_ML_DSA_87,
+         .oid = MLDSA87_OID,
+         .id = GNUTLS_SIGN_MLDSA87,
+         .pk = GNUTLS_PK_MLDSA87,
          .hash = GNUTLS_DIG_SHAKE_256,
          .aid = TLS_SIGN_AID_UNKNOWN },
        { .name = 0,

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index b23f55db19c2937af1f067f24d54928338ff69ed..964366ded2d8aeeb01451070029120b219b0e1f7 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -893,9 +893,9 @@ typedef enum gnutls_certificate_print_formats {
  * @GNUTLS_PK_EDDSA_ED448: Edwards curve Digital signature algorithm. Used with SHAKE256 on signatures.
  * @GNUTLS_PK_MLKEM768: ML-KEM-768 key encapsulation algorithm as per FIPS 203.
  * @GNUTLS_PK_MLKEM1024: ML-KEM-1024 key encapsulation algorithm as per FIPS 203.
- * @GNUTLS_PK_ML_DSA_44: ML-DSA-44 digital signature algorithm as per FIPS 204.
- * @GNUTLS_PK_ML_DSA_65: ML-DSA-65 digital signature algorithm as per FIPS 204.
- * @GNUTLS_PK_ML_DSA_87: ML-DSA-87 digital signature algorithm as per FIPS 204.
+ * @GNUTLS_PK_MLDSA44: ML-DSA-44 digital signature algorithm as per FIPS 204.
+ * @GNUTLS_PK_MLDSA65: ML-DSA-65 digital signature algorithm as per FIPS 204.
+ * @GNUTLS_PK_MLDSA87: ML-DSA-87 digital signature algorithm as per FIPS 204.
  *
  * Enumeration of different public-key algorithms.
  */
@@ -915,9 +915,9 @@ typedef enum {
        GNUTLS_PK_EDDSA_ED448 = 12,
        GNUTLS_PK_RSA_OAEP = 13,
        GNUTLS_PK_MLKEM768 = 14,
-       GNUTLS_PK_ML_DSA_44 = 15,
-       GNUTLS_PK_ML_DSA_65 = 16,
-       GNUTLS_PK_ML_DSA_87 = 17,
+       GNUTLS_PK_MLDSA44 = 15,
+       GNUTLS_PK_MLDSA65 = 16,
+       GNUTLS_PK_MLDSA87 = 17,
        GNUTLS_PK_MLKEM1024 = 18,
        GNUTLS_PK_MAX = GNUTLS_PK_MLKEM1024,
 
@@ -987,9 +987,9 @@ const char *gnutls_pk_algorithm_get_name(gnutls_pk_algorithm_t algorithm);
  * @GNUTLS_SIGN_GOST_256: Digital signature algorithm GOST R 34.10-2012 with GOST R 34.11-2012 256 bit
  * @GNUTLS_SIGN_GOST_512: Digital signature algorithm GOST R 34.10-2012 with GOST R 34.11-2012 512 bit
  * @GNUTLS_SIGN_EDDSA_ED448: Digital signature algorithm EdDSA with Ed448 curve.
- * @GNUTLS_SIGN_ML_DSA_44: Digital signature algorithm ML-DSA-44.
- * @GNUTLS_SIGN_ML_DSA_65: Digital signature algorithm ML-DSA-65.
- * @GNUTLS_SIGN_ML_DSA_87: Digital signature algorithm ML-DSA-87.
+ * @GNUTLS_SIGN_MLDSA44: Digital signature algorithm ML-DSA-44.
+ * @GNUTLS_SIGN_MLDSA65: Digital signature algorithm ML-DSA-65.
+ * @GNUTLS_SIGN_MLDSA87: Digital signature algorithm ML-DSA-87.
  *
  * Enumeration of different digital signature algorithms.
  */
@@ -1048,10 +1048,10 @@ typedef enum {
        GNUTLS_SIGN_GOST_512 = 45,
        GNUTLS_SIGN_EDDSA_ED448 = 46,
 
-       GNUTLS_SIGN_ML_DSA_44 = 47,
-       GNUTLS_SIGN_ML_DSA_65 = 48,
-       GNUTLS_SIGN_ML_DSA_87 = 49,
-       GNUTLS_SIGN_MAX = GNUTLS_SIGN_ML_DSA_87
+       GNUTLS_SIGN_MLDSA44 = 47,
+       GNUTLS_SIGN_MLDSA65 = 48,
+       GNUTLS_SIGN_MLDSA87 = 49,
+       GNUTLS_SIGN_MAX = GNUTLS_SIGN_MLDSA87
 } gnutls_sign_algorithm_t;
 
 /**

diff --git a/lib/nettle/pk.c b/lib/nettle/pk.c
index 271d02161fc8a443db91efe3093fb7d5e7b119f0..ea7fb9a4c7f11c654f2276d99e68a477c3d57aec 100644 (file)
--- a/lib/nettle/pk.c
+++ b/lib/nettle/pk.c
@@ -701,11 +701,11 @@ static const char *pk_to_liboqs_algo(gnutls_pk_algorithm_t algo)
                return OQS_KEM_alg_kyber_768;
        case GNUTLS_PK_MLKEM1024:
                return OQS_KEM_alg_ml_kem_1024;
-       case GNUTLS_PK_ML_DSA_44:
+       case GNUTLS_PK_MLDSA44:
                return OQS_SIG_alg_ml_dsa_44;
-       case GNUTLS_PK_ML_DSA_65:
+       case GNUTLS_PK_MLDSA65:
                return OQS_SIG_alg_ml_dsa_65;
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA87:
                return OQS_SIG_alg_ml_dsa_87;
        default:
                gnutls_assert();
@@ -1860,9 +1860,9 @@ static int _wrap_nettle_pk_sign(gnutls_pk_algorithm_t algo,
                break;
        }
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87: {
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87: {
                OQS_SIG *sig;
                OQS_STATUS rc;
                size_t size;
@@ -2279,9 +2279,9 @@ static int _wrap_nettle_pk_verify(gnutls_pk_algorithm_t algo,
                break;
        }
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87: {
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87: {
                OQS_SIG *sig;
                OQS_STATUS rc;
 
@@ -2498,9 +2498,9 @@ static int _wrap_nettle_pk_exists(gnutls_pk_algorithm_t pk)
                return algo_name != NULL &&
                       GNUTLS_OQS_FUNC(OQS_KEM_alg_is_enabled)(algo_name);
        }
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87: {
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87: {
                const char *algo_name;
 
                if (_gnutls_liboqs_ensure() < 0)
@@ -2722,9 +2722,9 @@ static int wrap_nettle_pk_generate_params(gnutls_pk_algorithm_t algo,
        case GNUTLS_PK_GOST_12_512:
 #endif
        case GNUTLS_PK_MLKEM768:
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                break;
        default:
                gnutls_assert();
@@ -3108,9 +3108,9 @@ static int pct_test(gnutls_pk_algorithm_t algo,
        case GNUTLS_PK_GOST_01:
        case GNUTLS_PK_GOST_12_256:
        case GNUTLS_PK_GOST_12_512:
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                ret = _gnutls_pk_sign(algo, &sig, &ddata, params, &spki);
                if (ret < 0) {
                        ret = gnutls_assert_val(GNUTLS_E_PK_GENERATION_ERROR);
@@ -3975,9 +3975,9 @@ wrap_nettle_pk_generate_keys(gnutls_pk_algorithm_t algo,
                ret = 0;
                break;
        }
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                if (params->pkflags & GNUTLS_PK_FLAG_PROVABLE)
                        return gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
 
@@ -4306,9 +4306,9 @@ static int wrap_nettle_pk_verify_priv_params(gnutls_pk_algorithm_t algo,
                ret = 0;
                break;
        }
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87: {
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87: {
                const char *algo_name;
 
                if (_gnutls_liboqs_ensure() < 0)

diff --git a/lib/privkey.c b/lib/privkey.c
index a2975d3aeaaae690468f341f7f89438a3e6e108f..84e984f6b9459fc7fbe1d46639ed0da0b81a0d43 100644 (file)
--- a/lib/privkey.c
+++ b/lib/privkey.c
@@ -243,9 +243,9 @@ static int privkey_to_pubkey(gnutls_pk_algorithm_t pk,
        case GNUTLS_PK_EDDSA_ED448:
        case GNUTLS_PK_ECDH_X25519:
        case GNUTLS_PK_ECDH_X448:
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                ret = _gnutls_set_datum(&pub->raw_pub, priv->raw_pub.data,
                                        priv->raw_pub.size);
                if (ret < 0)

diff --git a/lib/pubkey.c b/lib/pubkey.c
index 0a1bc1076983e8bab146a7c6f9da34dcad083ee9..05383ccb2e2a80fb2b139523d889b88e86bccc65 100644 (file)
--- a/lib/pubkey.c
+++ b/lib/pubkey.c
@@ -67,12 +67,12 @@ unsigned pubkey_to_bits(const gnutls_pk_params_st *params)
        case GNUTLS_PK_GOST_12_256:
        case GNUTLS_PK_GOST_12_512:
                return gnutls_ecc_curve_get_size(params->curve) * 8;
-       case GNUTLS_PK_ML_DSA_44:
-               return ML_DSA_44_PUBKEY_SIZE;
-       case GNUTLS_PK_ML_DSA_65:
-               return ML_DSA_65_PUBKEY_SIZE;
-       case GNUTLS_PK_ML_DSA_87:
-               return ML_DSA_87_PUBKEY_SIZE;
+       case GNUTLS_PK_MLDSA44:
+               return MLDSA44_PUBKEY_SIZE;
+       case GNUTLS_PK_MLDSA65:
+               return MLDSA65_PUBKEY_SIZE;
+       case GNUTLS_PK_MLDSA87:
+               return MLDSA87_PUBKEY_SIZE;
        default:
                return 0;
        }
@@ -357,9 +357,9 @@ int gnutls_pubkey_get_preferred_hash_algorithm(gnutls_pubkey_t key,
                                pubkey_to_bits(&key->params));
                ret = 0;
                break;
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                if (hash)
                        *hash = GNUTLS_DIG_SHAKE_256;
                ret = 0;
@@ -2662,9 +2662,9 @@ int pubkey_verify_data(const gnutls_sign_entry_st *se, const mac_entry_st *me,
 
        case GNUTLS_PK_EDDSA_ED25519:
        case GNUTLS_PK_EDDSA_ED448:
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                if (_gnutls_pk_verify(se->pk, data, signature, params,
                                      sign_params) != 0) {
                        gnutls_assert();

diff --git a/lib/x509/common.h b/lib/x509/common.h
index 31d6d24e519ff1a3b42a266d4bca95adfdb81763..f039af15b580db9899cc2299988381058826c300 100644 (file)
--- a/lib/x509/common.h
+++ b/lib/x509/common.h
@@ -117,9 +117,9 @@
 #define GOST28147_89_CPC_OID "1.2.643.2.2.31.3"
 #define GOST28147_89_CPD_OID "1.2.643.2.2.31.4"
 
-#define ML_DSA_44_OID "2.16.840.1.101.3.4.3.17"
-#define ML_DSA_65_OID "2.16.840.1.101.3.4.3.18"
-#define ML_DSA_87_OID "2.16.840.1.101.3.4.3.19"
+#define MLDSA44_OID "2.16.840.1.101.3.4.3.17"
+#define MLDSA65_OID "2.16.840.1.101.3.4.3.18"
+#define MLDSA87_OID "2.16.840.1.101.3.4.3.19"
 
 #define ASN1_NULL "\x05\x00"
 #define ASN1_NULL_SIZE 2

diff --git a/lib/x509/key_decode.c b/lib/x509/key_decode.c
index b25ad471230dcfe566f626529cad879ebe153eb8..137a66917336813dcf0647f1cf38a0f1d8cf91d4 100644 (file)
--- a/lib/x509/key_decode.c
+++ b/lib/x509/key_decode.c
@@ -736,9 +736,9 @@ int _gnutls_x509_read_pubkey(gnutls_pk_algorithm_t algo, uint8_t *der,
                }
                break;
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                ret = _gnutls_set_datum(&params->raw_pub, der, dersize);
                break;
 #endif
@@ -840,9 +840,9 @@ int _gnutls_x509_check_pubkey_params(gnutls_pk_params_st *params)
        case GNUTLS_PK_GOST_12_256:
        case GNUTLS_PK_GOST_12_512:
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
 #endif
                return 0;
        default:

diff --git a/lib/x509/key_encode.c b/lib/x509/key_encode.c
index 7af80def41a359375585191b355418b18371cd95..de0ec5e7412c27e12d7ddf1a714706ee586aa258 100644 (file)
--- a/lib/x509/key_encode.c
+++ b/lib/x509/key_encode.c
@@ -300,9 +300,9 @@ int _gnutls_x509_write_pubkey_params(const gnutls_pk_params_st *params,
        case GNUTLS_PK_EDDSA_ED448:
        case GNUTLS_PK_ECDH_X25519:
        case GNUTLS_PK_ECDH_X448:
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                der->data = NULL;
                der->size = 0;
 
@@ -338,9 +338,9 @@ int _gnutls_x509_write_pubkey(const gnutls_pk_params_st *params,
        case GNUTLS_PK_GOST_12_256:
        case GNUTLS_PK_GOST_12_512:
                return _gnutls_x509_write_gost_pubkey(params, der);
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                return _gnutls_x509_write_ml_dsa_pubkey(params, der);
        default:
                return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
@@ -1270,9 +1270,9 @@ int _gnutls_asn1_encode_privkey(asn1_node *c2, gnutls_pk_params_st *params)
        case GNUTLS_PK_DH:
                /* DH keys are only exportable in PKCS#8 format */
                return GNUTLS_E_INVALID_REQUEST;
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                return _gnutls_asn1_encode_ml_dsa(c2, params);
        default:
                return GNUTLS_E_UNIMPLEMENTED_FEATURE;

diff --git a/lib/x509/mpi.c b/lib/x509/mpi.c
index 7d180a9588754e6ac7767feeb3f54cf24bf7319a..28e98a14e267c0afe678af9231bdae8a0117c478 100644 (file)
--- a/lib/x509/mpi.c
+++ b/lib/x509/mpi.c
@@ -134,9 +134,9 @@ int _gnutls_get_asn_mpis(asn1_node asn, const char *root,
            pk_algorithm != GNUTLS_PK_ECDH_X25519 &&
            pk_algorithm != GNUTLS_PK_EDDSA_ED448 &&
            pk_algorithm != GNUTLS_PK_ECDH_X448 &&
-           pk_algorithm != GNUTLS_PK_ML_DSA_44 &&
-           pk_algorithm != GNUTLS_PK_ML_DSA_65 &&
-           pk_algorithm != GNUTLS_PK_ML_DSA_87) {
+           pk_algorithm != GNUTLS_PK_MLDSA44 &&
+           pk_algorithm != GNUTLS_PK_MLDSA65 &&
+           pk_algorithm != GNUTLS_PK_MLDSA87) {
                /* RSA, EdDSA and ML-DSA algorithms do not use parameters */
                result = _gnutls_x509_read_value(asn, name, &tmp);
                if (pk_algorithm == GNUTLS_PK_RSA_PSS &&

diff --git a/lib/x509/privkey.c b/lib/x509/privkey.c
index 6feca0478db0f725dcc3fd4d9e14e5bb40f2b926..7eddfb79310e13d5e565869fbf4f6b6243cbb2ed 100644 (file)
--- a/lib/x509/privkey.c
+++ b/lib/x509/privkey.c
@@ -360,17 +360,17 @@ static int decode_ml_dsa_key(asn1_node *pkey_asn, const gnutls_datum_t *raw_key,
        pkey->params.algo = gnutls_oid_to_pk(oid);
 
        switch (pkey->params.algo) {
-       case GNUTLS_PK_ML_DSA_44:
-               raw_priv_size = ML_DSA_44_PRIVKEY_SIZE;
-               raw_pub_size = ML_DSA_44_PUBKEY_SIZE;
+       case GNUTLS_PK_MLDSA44:
+               raw_priv_size = MLDSA44_PRIVKEY_SIZE;
+               raw_pub_size = MLDSA44_PUBKEY_SIZE;
                break;
-       case GNUTLS_PK_ML_DSA_65:
-               raw_priv_size = ML_DSA_65_PRIVKEY_SIZE;
-               raw_pub_size = ML_DSA_65_PUBKEY_SIZE;
+       case GNUTLS_PK_MLDSA65:
+               raw_priv_size = MLDSA65_PRIVKEY_SIZE;
+               raw_pub_size = MLDSA65_PUBKEY_SIZE;
                break;
-       case GNUTLS_PK_ML_DSA_87:
-               raw_priv_size = ML_DSA_87_PRIVKEY_SIZE;
-               raw_pub_size = ML_DSA_87_PUBKEY_SIZE;
+       case GNUTLS_PK_MLDSA87:
+               raw_priv_size = MLDSA87_PRIVKEY_SIZE;
+               raw_pub_size = MLDSA87_PUBKEY_SIZE;
                break;
        default:
                return gnutls_assert_val(
@@ -643,7 +643,7 @@ int gnutls_x509_privkey_import(gnutls_x509_privkey_t key,
                                                &_data);
                                        if (result >= 0) {
                                                key->params.algo =
-                                                       GNUTLS_PK_ML_DSA_44;
+                                                       GNUTLS_PK_MLDSA44;
                                        }
 #endif
                                }
@@ -1648,9 +1648,9 @@ static const char *set_msg(gnutls_x509_privkey_t key)
        case GNUTLS_PK_EC:
                return PEM_KEY_ECC;
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                return PEM_KEY_ML_DSA;
 #endif
        default:

diff --git a/lib/x509/privkey_pkcs8.c b/lib/x509/privkey_pkcs8.c
index 6eb75d444c5fea31feadde6eadd5af7c280bc556..41b99861808ba8aa76d9b3c9260d0eb989b5bfbc 100644 (file)
--- a/lib/x509/privkey_pkcs8.c
+++ b/lib/x509/privkey_pkcs8.c
@@ -83,9 +83,9 @@ inline static int _encode_privkey(gnutls_x509_privkey_t pkey,
                        gnutls_assert();
                return ret;
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                ret = _gnutls_x509_encode_string(
                        ASN1_ETYPE_OCTET_STRING, pkey->params.raw_priv.data,
                        pkey->params.raw_priv.size + pkey->params.raw_pub.size,
@@ -1478,11 +1478,11 @@ struct pq_key_length_st {
 };
 
 static const struct pq_key_length_st pq_key_lengths[] = {
-       { GNUTLS_PK_ML_DSA_44, OQS_SIG_ml_dsa_44_length_secret_key,
+       { GNUTLS_PK_MLDSA44, OQS_SIG_ml_dsa_44_length_secret_key,
          OQS_SIG_ml_dsa_44_length_public_key },
-       { GNUTLS_PK_ML_DSA_65, OQS_SIG_ml_dsa_65_length_secret_key,
+       { GNUTLS_PK_MLDSA65, OQS_SIG_ml_dsa_65_length_secret_key,
          OQS_SIG_ml_dsa_65_length_public_key },
-       { GNUTLS_PK_ML_DSA_87, OQS_SIG_ml_dsa_87_length_secret_key,
+       { GNUTLS_PK_MLDSA87, OQS_SIG_ml_dsa_87_length_secret_key,
          OQS_SIG_ml_dsa_87_length_public_key },
 
        { GNUTLS_PK_UNKNOWN, 0, 0 }
@@ -1639,9 +1639,9 @@ static int decode_private_key_info(const gnutls_datum_t *der,
                                                pkey->params.algo);
                break;
 #ifdef HAVE_LIBOQS
-       case GNUTLS_PK_ML_DSA_44:
-       case GNUTLS_PK_ML_DSA_65:
-       case GNUTLS_PK_ML_DSA_87:
+       case GNUTLS_PK_MLDSA44:
+       case GNUTLS_PK_MLDSA65:
+       case GNUTLS_PK_MLDSA87:
                result = _decode_pkcs8_pqc_alg_key(pkcs8_asn, pkey, oid);
                break;
 #endif

diff --git a/src/certtool-common.c b/src/certtool-common.c
index efeb92b65c35bd671d589d16e4e41233c3e5fe40..d9cbf4bbde3b2f381ff57477585d6641377e4f3d 100644 (file)
--- a/src/certtool-common.c
+++ b/src/certtool-common.c
@@ -1664,11 +1664,11 @@ gnutls_pk_algorithm_t figure_key_type(const char *key_type)
        else if (strcasecmp(key_type, "gost12-512") == 0)
                return GNUTLS_PK_GOST_12_512;
        else if (strcasecmp(key_type, "mldsa44") == 0)
-               return GNUTLS_PK_ML_DSA_44;
+               return GNUTLS_PK_MLDSA44;
        else if (strcasecmp(key_type, "mldsa65") == 0)
-               return GNUTLS_PK_ML_DSA_65;
+               return GNUTLS_PK_MLDSA65;
        else if (strcasecmp(key_type, "mldsa87") == 0)
-               return GNUTLS_PK_ML_DSA_87;
+               return GNUTLS_PK_MLDSA87;
        else {
                fprintf(stderr, "unknown key type: %s\n", key_type);
                return GNUTLS_PK_UNKNOWN;

diff --git a/src/certtool-common.h b/src/certtool-common.h
index 334079ac2970c785f041565d6bb9d74c67083739..cd4151f8ff5413fc94cb983ecf031988de65bd17 100644 (file)
--- a/src/certtool-common.h
+++ b/src/certtool-common.h
@@ -101,9 +101,8 @@ static inline void switch_to_pkcs8_when_needed(common_info_st *cinfo,
            key_type == GNUTLS_PK_ECDH_X448 || key_type == GNUTLS_PK_GOST_01 ||
            key_type == GNUTLS_PK_GOST_12_256 ||
            key_type == GNUTLS_PK_GOST_12_512 ||
-           key_type == GNUTLS_PK_ML_DSA_44 ||
-           key_type == GNUTLS_PK_ML_DSA_65 ||
-           key_type == GNUTLS_PK_ML_DSA_87) {
+           key_type == GNUTLS_PK_MLDSA44 || key_type == GNUTLS_PK_MLDSA65 ||
+           key_type == GNUTLS_PK_MLDSA87) {
                if (cinfo->verbose)
                        fprintf(stderr,
                                "Assuming --pkcs8 is given; %s private keys can only be exported in PKCS#8 format\n",