Merge pull request #3014 from dcooper16/rfc8998

Add support for RFC 8998 and draft-yang-tls-hybrid-sm2-mlkem

Author: drwetter

etc/cipher-mapping.txt

@@ -139,6 +139,8 @@
       0x13,0x01 - TLS_AES_128_GCM_SHA256         TLS_AES_128_GCM_SHA256                             TLSv1.3    Kx=any         Au=any     Enc=AESGCM(128)                Mac=AEAD               
       0x13,0x04 - TLS_AES_128_CCM_SHA256         TLS_AES_128_CCM_SHA256                             TLSv1.3    Kx=any         Au=any     Enc=AESCCM(128)                Mac=AEAD               
       0x13,0x05 - TLS_AES_128_CCM_8_SHA256       TLS_AES_128_CCM_8_SHA256                           TLSv1.3    Kx=any         Au=any     Enc=AESCCM8(128)               Mac=AEAD               
+      0x00,0xC6 - TLS_SM4_GCM_SM3                TLS_SM4_GCM_SM3                                    TLSv1.3    Kx=any         Au=any     Enc=SM4GCM(128)                Mac=AEAD               
+      0x00,0xC7 - TLS_SM4_CCM_SM3                TLS_SM4_CCM_SM3                                    TLSv1.3    Kx=any         Au=any     Enc=SM4CCM(128)                Mac=AEAD               
       0xC0,0x2F - ECDHE-RSA-AES128-GCM-SHA256    TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256              TLSv1.2    Kx=ECDH        Au=RSA     Enc=AESGCM(128)                Mac=AEAD               
       0xC0,0x2B - ECDHE-ECDSA-AES128-GCM-SHA256  TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256            TLSv1.2    Kx=ECDH        Au=ECDSA   Enc=AESGCM(128)                Mac=AEAD               
       0xC0,0x27 - ECDHE-RSA-AES128-SHA256        TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256              TLSv1.2    Kx=ECDH        Au=RSA     Enc=AES(128)                   Mac=SHA256             

etc/curves-mapping.txt

@@ -51,4 +51,5 @@
       0x11,0xeb -   SecP256r1MLKEM768  SecP256r1MLKEM768
       0x11,0xec -   X25519MLKEM768  X25519MLKEM768
       0x11,0xed -   SecP384r1MLKEM1024  SecP384r1MLKEM1024
+      0x11,0xee -   curveSM2MLKEM768  curveSM2MLKEM768
       0x63,0x99 -   X25519Kyber768Draft00  X25519Kyber768Draft00

etc/curves.txt

@@ -31,4 +31,5 @@
 30, curve448,
 31, brainpoolP256r1tls13,
 32, brainpoolP384r1tls13,
-33, brainpoolP512r1tls13
+33, brainpoolP512r1tls13,
+41, curveSM2