From: Pauli <ppzgs1@gmail.com>
Date: Fri, 21 Feb 2025 01:21:26 +0000 (+1100)
Subject: fips: update FIPS self test defines
X-Git-Tag: openssl-3.5.0-alpha1~107
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92a54f4d59ea81768af7dde9e9d9deb5ce0d6131;p=thirdparty%2Fopenssl.git

fips: update FIPS self test defines

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26859)
---

diff --git a/include/openssl/self_test.h b/include/openssl/self_test.h
index 0f4c0f7d8d8..cfa954ec9b8 100644
--- a/include/openssl/self_test.h
+++ b/include/openssl/self_test.h
@@ -53,7 +53,7 @@ extern "C" {
 # define OSSL_SELF_TEST_DESC_PCT_DSA        "DSA"
 # define OSSL_SELF_TEST_DESC_PCT_ML_DSA     "ML-DSA"
 # define OSSL_SELF_TEST_DESC_PCT_ML_KEM     "ML-KEM"
-# define OSSL_SELF_TEST_DESC_PCT_SLH_DSA    "SLH_DSA"
+# define OSSL_SELF_TEST_DESC_PCT_SLH_DSA    "SLH-DSA"
 # define OSSL_SELF_TEST_DESC_CIPHER_AES_GCM "AES_GCM"
 # define OSSL_SELF_TEST_DESC_CIPHER_AES_ECB "AES_ECB_Decrypt"
 # define OSSL_SELF_TEST_DESC_CIPHER_TDES    "TDES"
@@ -67,8 +67,8 @@ extern "C" {
 # define OSSL_SELF_TEST_DESC_SIGN_ECDSA     "ECDSA"
 # define OSSL_SELF_TEST_DESC_SIGN_EDDSA     "EDDSA"
 # define OSSL_SELF_TEST_DESC_SIGN_ML_DSA    "ML-DSA"
+# define OSSL_SELF_TEST_DESC_SIGN_SLH_DSA   "SLH-DSA"
 # define OSSL_SELF_TEST_DESC_KEM            "KEM"
-# define OSSL_SELF_TEST_DESC_SIGN_SLH_DSA   "SLH_DSA"
 # define OSSL_SELF_TEST_DESC_DRBG_CTR       "CTR"
 # define OSSL_SELF_TEST_DESC_DRBG_HASH      "HASH"
 # define OSSL_SELF_TEST_DESC_DRBG_HMAC      "HMAC"
@@ -88,11 +88,10 @@ extern "C" {
 # define OSSL_SELF_TEST_DESC_RNG            "RNG"
 # define OSSL_SELF_TEST_DESC_KEYGEN_ML_DSA  "ML-DSA"
 # define OSSL_SELF_TEST_DESC_KEYGEN_ML_KEM  "ML-KEM"
+# define OSSL_SELF_TEST_DESC_KEYGEN_SLH_DSA "SLH-DSA"
 # define OSSL_SELF_TEST_DESC_ENCAP_KEM      "KEM_Encap"
 # define OSSL_SELF_TEST_DESC_DECAP_KEM      "KEM_Decap"
 # define OSSL_SELF_TEST_DESC_DECAP_KEM_FAIL "KEM_Decap_Reject"
-# define OSSL_SELF_TEST_DESC_KEYGEN_KEM     "KEM_Keygen"
-# define OSSL_SELF_TEST_DESC_KEYGEN_SLH_DSA "SLH_DSA"
 
 void OSSL_SELF_TEST_set_callback(OSSL_LIB_CTX *libctx, OSSL_CALLBACK *cb,
                                  void *cbarg);