Merged PR 14866524: Update service indicator for PQC algorithms

## Description:

Update FIPS 140 approved services indicator for the next round of certifications

## Admin Checklist:
- [ ] You have updated documentation in symcrypt.h to reflect any changes in behavior
- [ ] You have updated CHANGELOG.md to reflect any changes in behavior
- [ ] You have updated symcryptunittest to exercise any new functionality
- [ ] If you have introduced any symbols in symcrypt.h you have updated production and test dynamic export symbols (exports.ver / exports.def / symcrypt.src) and tested the updated dynamic modules with symcryptunittest
- [ ] If you have introduced functionality that varies based on CPU features, you have manually tested with and without relevant features
- [ ] If you have made significant changes to a particular algorithm, you have checked that performance numbers reported by symcryptunittest are in line with expectations
- [ ] If you have added new algorithms/modes, you have updated the status indicator text for the associated modules if necessary

Author: ccalik

inc/symcrypt_internal.h

@@ -3485,6 +3485,7 @@ typedef enum _SYMCRYPT_SI_TYPE {
     SYMCRYPT_SI_TYPE_DRBG               = 0x05,
     SYMCRYPT_SI_TYPE_ASYM_ALG           = 0x06,
     SYMCRYPT_SI_TYPE_KAS                = 0x07,
+    SYMCRYPT_SI_TYPE_KEM                = 0x08,
 
     // Other types where elements are a bitmask
     SYMCRYPT_SI_TYPE_ECURVE             = 0x40,
@@ -3494,6 +3495,7 @@ typedef enum _SYMCRYPT_SI_TYPE {
     // Non-bitmask types
     SYMCRYPT_SI_TYPE_INTRANGE           = 0x80,
     SYMCRYPT_SI_TYPE_INTPAIR            = 0x81,
+    SYMCRYPT_SI_TYPE_SIZERANGE          = 0x82,
 
     SYMCRYPT_SI_TYPE_MAX                = 0xFF
 } SYMCRYPT_SI_TYPE;
@@ -3508,11 +3510,12 @@ typedef enum _SYMCRYPT_SI_TYPE {
 
 #define SYMCRYPT_SI_INTRANGE(Low, High)     (((UINT64)SYMCRYPT_SI_TYPE_INTRANGE << 56) | SYMCRYPT_SI_INTPACK(High, Low))
 #define SYMCRYPT_SI_INTPAIR(X, Y)           (((UINT64)SYMCRYPT_SI_TYPE_INTPAIR << 56) | SYMCRYPT_SI_INTPACK(Y, X))
+#define SYMCRYPT_SI_SIZERANGE(Low, High)    (((UINT64)SYMCRYPT_SI_TYPE_SIZERANGE << 56) | SYMCRYPT_SI_INTPACK(High, Low))
 
 #define SYMCRYPT_SI_CHECK_INT(L)            C_ASSERT(L <= SYMCRYPT_SI_INTMASK)
 
-#define SYMCRYPT_SI_KEYBITS(L)              SYMCRYPT_SI_INTRANGE(L, L)
-#define SYMCRYPT_SI_MODULUS(L)              SYMCRYPT_SI_INTRANGE(L, L)
+#define SYMCRYPT_SI_KEYBITS(L)              SYMCRYPT_SI_SIZERANGE(L, L)
+#define SYMCRYPT_SI_MODULUS(L)              SYMCRYPT_SI_SIZERANGE(L, L)
 #define SYMCRYPT_SI_DSAPARAMS(N, L)         SYMCRYPT_SI_INTPAIR(N, L)
 
 
@@ -3528,6 +3531,8 @@ typedef enum _SYMCRYPT_SI_TYPE {
 #define SYMCRYPT_SI_SVC_SECRET_AGREEMENT                0x00000800
 #define SYMCRYPT_SI_SVC_SIGNATURE_GENERATION            0x00001000
 #define SYMCRYPT_SI_SVC_SIGNATURE_VERIFICATION          0x00002000
+#define SYMCRYPT_SI_SVC_KEY_ENCAPSULATION               0x00004000
+#define SYMCRYPT_SI_SVC_KEY_DECAPSULATION               0x00008000
 
 // Ciphers
 #define SYMCRYPT_SI_AES_CBC                 SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_CIPHER, 0)
@@ -3633,11 +3638,27 @@ typedef enum _SYMCRYPT_SI_TYPE {
 #define SYMCRYPT_SI_KAS_FFC_SSC             SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 21)
 
 // PQ Algorithms
-#define SYMCRYPT_SI_MLKEM                   SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 22)
-#define SYMCRYPT_SI_MLDSA                   SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 23)
-#define SYMCRYPT_SI_XMSS                    SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 24)
-#define SYMCRYPT_SI_XMSS_MT                 SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 25)
-#define SYMCRYPT_SI_LMS                     SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 26)
+
+// Asym Alg IDs for PQC algorithms in range 22-26 are replaced with more granular
+// algorithms as below.
+// Keeping this range reserved until there's a need to use it in the future.
+
+#define SYMCRYPT_SI_MLDSA_KEYGEN            SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 27)
+#define SYMCRYPT_SI_MLDSA_SIGGEN            SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 28)
+#define SYMCRYPT_SI_MLDSA_SIGVER            SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 29)
+#define SYMCRYPT_SI_LMS_KEYGEN              SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 30)
+#define SYMCRYPT_SI_LMS_SIGGEN              SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 31)
+#define SYMCRYPT_SI_LMS_SIGVER              SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 32)
+#define SYMCRYPT_SI_XMSS_KEYGEN             SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 33)
+#define SYMCRYPT_SI_XMSS_SIGGEN             SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 34)
+#define SYMCRYPT_SI_XMSS_SIGVER             SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 35)
+#define SYMCRYPT_SI_XMSS_MT_KEYGEN          SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 36)
+#define SYMCRYPT_SI_XMSS_MT_SIGGEN          SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 37)
+#define SYMCRYPT_SI_XMSS_MT_SIGVER          SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_ASYM_ALG, 38)
+
+#define SYMCRYPT_SI_MLKEM_KEYGEN            SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_KEM, 0)
+#define SYMCRYPT_SI_MLKEM_ENCAPS            SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_KEM, 1)
+#define SYMCRYPT_SI_MLKEM_DECAPS            SYMCRYPT_SI_CREATE_ID(SYMCRYPT_SI_TYPE_KEM, 2)
 
 
 // Elliptic Curves
@@ -3718,6 +3739,8 @@ SymCryptDeprecatedServiceIndicator(
 //      SYMCRYPT_SI_KAS_ECC_SSC         SYMCRYPT_SI_ECURVE_XXX                  SYMCRYPT_SI_SCHEME_XXX
 //      SYMCRYPT_SI_KAS_FFC             SYMCRYPT_SI_SPG_XXX                     Hash Alg Id
 //      SYMCRYPT_SI_KAS_FFC_SSC         SYMCRYPT_SI_SPG_XXX                     SYMCRYPT_SI_SCHEME_XXX
+//      SYMCRYPT_SI_LMS_SIGVER          SYMCRYPT_LMS_XXX                        -
+//      SYMCRYPT_SI_XMSS_SIGVER         SYMCRYPT_XMSS_XXX                       -
 //
 //
 // Return value: