No more KMAC. Add examples.

CMS-KYBER-2024.asn

@@ -11,33 +11,51 @@ IMPORTS
     FROM KEMAlgorithmInformation-2023  -- [RFC 9629]
        { iso(1) identified-organization(3) dod(6) internet(1)
          security(5) mechanisms(5) pkix(7) id-mod(0)
-         id-mod-kemAlgorithmInformation-2023(109) };
+         id-mod-kemAlgorithmInformation-2023(109) }
+
+  kda-hkdf-with-sha256
+    FROM HKDF-OID-2019  -- [RFC 8619]
+       { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
+         pkcs-9(9) smime(16) modules(0) id-mod-hkdf-oid-2019(68) }
+
+  kwa-aes128-wrap, kwa-aes256-wrap
+    FROM CMSAesRsaesOaep-2009
+       { iso(1) member-body(2) us(840) rsadsi(113549)
+       pkcs(1) pkcs-9(9) smime(16) modules(0)
+       id-mod-cms-aes-02(38) };
+
+-- ML-KEM Algorithm
 
 kema-ml-kem-512 KEM-ALGORITHM ::= {
-   IDENTIFIER id-ML-KEM-512
+   IDENTIFIER id-alg-ml-kem-512
    PARAMS ARE absent
    PUBLIC-KEYS { pk-ml-kem-512 }
    UKM ARE optional
-   SMIME-CAPS { IDENTIFIED BY id-ML-KEM-512 } }
+   SMIME-CAPS { IDENTIFIED BY id-alg-ml-kem-512 } }
 
 kema-ml-kem-768 KEM-ALGORITHM ::= {
-   IDENTIFIER id-ML-KEM-768
+   IDENTIFIER id-alg-ml-kem-768
    PARAMS ARE absent
    PUBLIC-KEYS { pk-ml-kem-768 }
    UKM ARE optional
-   SMIME-CAPS { IDENTIFIED BY id-ML-KEM-768 } }
+   SMIME-CAPS { IDENTIFIED BY id-alg-ml-kem-768 } }
 
 kema-ml-kem-1024 KEM-ALGORITHM ::= {
-   IDENTIFIER id-ML-KEM-1024
+   IDENTIFIER id-alg-ml-kem-1024
    PARAMS ARE absent
    PUBLIC-KEYS { pk-ml-kem-1024 }
    UKM ARE optional
-   SMIME-CAPS { IDENTIFIED BY id-ML-KEM-1024 } }
+   SMIME-CAPS { IDENTIFIED BY id-alg-ml-kem-1024 } }
+
+-- Updates for the SMIME-CAPS Set from RFC 5911
 
-SMimeCaps SMIME-CAPS ::=
+SMimeCapsSet SMIME-CAPS ::=
    { kema-ml-kem-512.&smimeCaps |
      kema-ml-kem-768.&smimeCaps |
-     kema-ml-kem-1024.&smimeCaps,
+     kema-ml-kem-1024.&smimeCaps |
+     kda-hkdf-with-sha256.&smimeCaps |
+     kwa-aes128-wrap.&smimeCaps |
+     kwa-aes256-wrap.&smimeCaps,
      ... }
 
 END