diff --git a/schema/cryptography-defs.json b/schema/cryptography-defs.json index 628e4e580..90adb52c9 100644 --- a/schema/cryptography-defs.json +++ b/schema/cryptography-defs.json @@ -4290,8 +4290,60 @@ "version": "1.3", "standard": [ { - "name": "RFC8446", - "url": "https://doi.org/10.17487/RFC8446" + "name": "RFC9846", + "url": "https://doi.org/10.17487/RFC9846" + }, + { + "name": "RFC7919", + "url": "https://doi.org/10.17487/RFC7919" + }, + { + "name": "RFC8734", + "url": "https://doi.org/10.17487/RFC8734" + }, + { + "name": "RFC8998", + "url": "https://doi.org/10.17487/RFC8998" + }, + { + "name": "RFC9150", + "url": "https://doi.org/10.17487/RFC9150" + }, + { + "name": "RFC9963", + "url": "https://doi.org/10.17487/RFC9963" + }, + { + "name": "RFC10024", + "url": "https://doi.org/10.17487/RFC10024" + }, + { + "name": "SP800-232", + "url": "https://doi.org/10.6028/NIST.SP.800-232" + }, + { + "name": "draft-ietf-tls-mldsa-06", + "url": "https://datatracker.ietf.org/doc/draft-ietf-tls-mldsa/06/" + }, + { + "name": "draft-ietf-tls-mlkem-10", + "url": "https://datatracker.ietf.org/doc/draft-ietf-tls-mlkem/10/" + }, + { + "name": "draft-preussmattsson-tls-mlkem1024-x448-01", + "url": "https://datatracker.ietf.org/doc/draft-preussmattsson-tls-mlkem1024-x448/01/" + }, + { + "name": "draft-reddy-tls-slhdsa-01", + "url": "https://datatracker.ietf.org/doc/draft-reddy-tls-slhdsa/01/" + }, + { + "name": "draft-rosomakho-tls-ecdhe-mlkem512-00", + "url": "https://datatracker.ietf.org/doc/draft-rosomakho-tls-ecdhe-mlkem512/00/" + }, + { + "name": "draft-yang-tls-hybrid-sm2-mlkem-03", + "url": "https://datatracker.ietf.org/doc/draft-yang-tls-hybrid-sm2-mlkem/03/" } ], "composition": [ @@ -4301,15 +4353,35 @@ "selectedBy": "negotiation", "selectingParty": "server", "algorithmSet": [ - "x25519", - "x448", "ECDHE-secp256r1", "ECDHE-secp384r1", + "ECDHE-secp521r1", + "x25519", + "x448", + "ECDHE-brainpoolP256r1", + "ECDHE-brainpoolP384r1", + "ECDHE-brainpoolP512r1", + "ECDHE-SM2", + "FFDHE-ffdhe2048", + "FFDHE-ffdhe3072", + "FFDHE-ffdhe4096", + "FFDHE-ffdhe6144", + "FFDHE-ffdhe8192", + "ML-KEM-512", + "ML-KEM-768", + "ML-KEM-1024", { - "name": "X25519MLKEM768", + "name": "SecP256r1MLKEM512", "algorithms": [ - "x25519", - "ML-KEM-768" + "ECDHE-secp256r1", + "ML-KEM-512" + ] + }, + { + "name": "MLKEM512X25519", + "algorithms": [ + "ML-KEM-512", + "x25519" ] }, { @@ -4319,12 +4391,33 @@ "ML-KEM-768" ] }, + { + "name": "X25519MLKEM768", + "algorithms": [ + "x25519", + "ML-KEM-768" + ] + }, { "name": "SecP384r1MLKEM1024", "algorithms": [ "ECDHE-secp384r1", "ML-KEM-1024" ] + }, + { + "name": "curveSM2MLKEM768", + "algorithms": [ + "ECDHE-SM2", + "ML-KEM-768" + ] + }, + { + "name": "MLKEM1024X448", + "algorithms": [ + "ML-KEM-1024", + "x448" + ] } ] }, @@ -4336,21 +4429,78 @@ "algorithmSet": [ "ECDSA-secp256r1-SHA-256", "ECDSA-secp384r1-SHA-384", - "RSA-PSS-SHA-256", + "ECDSA-secp521r1-SHA-512", + "RSA-PSS-SHA-256-MGF1-SHA-256-32", + "RSA-PSS-SHA-384-MGF1-SHA-384-48", + "RSA-PSS-SHA-512-MGF1-SHA-512-64", "Ed25519", - "ML-DSA-65" + "Ed448", + "ECDSA-brainpoolP256r1-SHA-256", + "ECDSA-brainpoolP384r1-SHA-384", + "ECDSA-brainpoolP512r1-SHA-512", + "ML-DSA-44", + "ML-DSA-65", + "ML-DSA-87", + "SLH-DSA-SHA2-128s", + "SLH-DSA-SHA2-128f", + "SLH-DSA-SHA2-192s", + "SLH-DSA-SHA2-192f", + "SLH-DSA-SHA2-256s", + "SLH-DSA-SHA2-256f", + "SLH-DSA-SHAKE-128s", + "SLH-DSA-SHAKE-128f", + "SLH-DSA-SHAKE-192s", + "SLH-DSA-SHAKE-192f", + "SLH-DSA-SHAKE-256s", + "SLH-DSA-SHAKE-256f" ] }, { - "role": "cert-chain-signature", - "selection": "any-of", - "selectedBy": "configuration", - "selectingParty": "server", + "role": "signature", + "selection": "one-of", + "selectedBy": "negotiation", + "selectingParty": "client", "algorithmSet": [ "ECDSA-secp256r1-SHA-256", "RSA-PKCS1-1.5-SHA-256", - "RSA-PSS-SHA-256", - "ML-DSA-65" + "ECDSA-secp384r1-SHA-384", + "RSA-PKCS1-1.5-SHA-384", + "ECDSA-secp521r1-SHA-512", + "RSA-PKCS1-1.5-SHA-512", + "RSA-PSS-SHA-256-MGF1-SHA-256-32", + "RSA-PSS-SHA-384-MGF1-SHA-384-48", + "RSA-PSS-SHA-512-MGF1-SHA-512-64", + "Ed25519", + "Ed448", + "ECDSA-brainpoolP256r1-SHA-256", + "ECDSA-brainpoolP384r1-SHA-384", + "ECDSA-brainpoolP512r1-SHA-512", + "ML-DSA-44", + "ML-DSA-65", + "ML-DSA-87", + "SLH-DSA-SHA2-128s", + "SLH-DSA-SHA2-128f", + "SLH-DSA-SHA2-192s", + "SLH-DSA-SHA2-192f", + "SLH-DSA-SHA2-256s", + "SLH-DSA-SHA2-256f", + "SLH-DSA-SHAKE-128s", + "SLH-DSA-SHAKE-128f", + "SLH-DSA-SHAKE-192s", + "SLH-DSA-SHAKE-192f", + "SLH-DSA-SHAKE-256s", + "SLH-DSA-SHAKE-256f" + ] + }, + { + "role": "cert-chain-signature", + "selection": "all-of", + "selectedBy": "protocol-fixed", + "algorithmSet": [ + { + "protocol": "x509", + "version": "3" + } ] }, { @@ -4359,17 +4509,59 @@ "selectedBy": "negotiation", "selectingParty": "server", "algorithmSet": [ + { + "name": "TLS_ASCONAEAD128_ASCONHASH256", + "algorithms": [ + "Ascon-AEAD128", + "HKDF-Ascon-Hash256" + ] + }, + { + "name": "TLS_ASCONAEAD128_SHA256", + "algorithms": [ + "Ascon-AEAD128", + "HKDF-SHA-256" + ] + }, + { + "name": "TLS_AES_128_GCM_ASCONHASH256", + "algorithms": [ + "AES-128-GCM-128-96", + "HKDF-Ascon-Hash256" + ] + }, + { + "name": "TLS_AES_128_CCM_ASCONHASH256", + "algorithms": [ + "AES-128-CCM-128-96", + "HKDF-Ascon-Hash256" + ] + }, + { + "name": "TLS_SM4_GCM_SM3", + "algorithms": [ + "SM4-GCM-128-96", + "HKDF-SM3" + ] + }, + { + "name": "TLS_SM4_CCM_SM3", + "algorithms": [ + "SM4-CCM-128-96", + "HKDF-SM3" + ] + }, { "name": "TLS_AES_128_GCM_SHA256", "algorithms": [ - "AES-128-GCM", + "AES-128-GCM-128-96", "HKDF-SHA-256" ] }, { "name": "TLS_AES_256_GCM_SHA384", "algorithms": [ - "AES-256-GCM", + "AES-256-GCM-128-96", "HKDF-SHA-384" ] }, @@ -4379,6 +4571,34 @@ "ChaCha20-Poly1305", "HKDF-SHA-256" ] + }, + { + "name": "TLS_AES_128_CCM_SHA256", + "algorithms": [ + "AES-128-CCM-128-96", + "HKDF-SHA-256" + ] + }, + { + "name": "TLS_AES_128_CCM_8_SHA256", + "algorithms": [ + "AES-128-CCM-64-96", + "HKDF-SHA-256" + ] + }, + { + "name": "TLS_SHA256_SHA256", + "algorithms": [ + "HMAC-SHA-256-256", + "HKDF-SHA-256" + ] + }, + { + "name": "TLS_SHA384_SHA384", + "algorithms": [ + "HMAC-SHA-384-384", + "HKDF-SHA-384" + ] } ] } @@ -4504,6 +4724,128 @@ ] } ] + }, + { + "family": "x509", + "description": "X.509 public key certificates, as profiled for the Internet PKI. The composition lists the signature algorithms a certificate can carry.", + "standard": [ + { + "name": "RFC5280", + "url": "https://doi.org/10.17487/RFC5280" + } + ], + "version": [ + { + "version": "3", + "standard": [ + { + "name": "RFC5280", + "url": "https://doi.org/10.17487/RFC5280" + }, + { + "name": "RFC3279", + "url": "https://doi.org/10.17487/RFC3279" + }, + { + "name": "RFC4055", + "url": "https://doi.org/10.17487/RFC4055" + }, + { + "name": "RFC5758", + "url": "https://doi.org/10.17487/RFC5758" + }, + { + "name": "RFC8410", + "url": "https://doi.org/10.17487/RFC8410" + }, + { + "name": "RFC8692", + "url": "https://doi.org/10.17487/RFC8692" + }, + { + "name": "RFC9215", + "url": "https://doi.org/10.17487/RFC9215" + }, + { + "name": "RFC9802", + "url": "https://doi.org/10.17487/RFC9802" + }, + { + "name": "RFC9881", + "url": "https://doi.org/10.17487/RFC9881" + }, + { + "name": "RFC9909", + "url": "https://doi.org/10.17487/RFC9909" + } + ], + "composition": [ + { + "role": "signature", + "selection": "one-of", + "selectedBy": "configuration", + "selectingParty": "issuer", + "algorithmSet": [ + "RSA-PKCS1-1.5-MD2", + "RSA-PKCS1-1.5-MD5", + "RSA-PKCS1-1.5-SHA-1", + "DSA-SHA-1", + "ECDSA-SHA-1", + "RSA-PSS", + "RSA-PKCS1-1.5-SHA-224", + "RSA-PKCS1-1.5-SHA-256", + "RSA-PKCS1-1.5-SHA-384", + "RSA-PKCS1-1.5-SHA-512", + "DSA-SHA-224", + "DSA-SHA-256", + "ECDSA-SHA-224", + "ECDSA-SHA-256", + "ECDSA-SHA-384", + "ECDSA-SHA-512", + "Ed25519", + "Ed448", + "RSA-PSS-SHAKE128-SHAKE128-32", + "RSA-PSS-SHAKE256-SHAKE256-64", + "ECDSA-SHAKE128", + "ECDSA-SHAKE256", + "GOSTR3410-2012-256", + "GOSTR3410-2012-512", + "XMSS-SHA2", + "XMSS-SHAKE", + "XMSSMT-SHA2", + "XMSSMT-SHAKE", + "ML-DSA-44", + "ML-DSA-65", + "ML-DSA-87", + "SLH-DSA-SHA2-128s", + "SLH-DSA-SHA2-128f", + "SLH-DSA-SHA2-192s", + "SLH-DSA-SHA2-192f", + "SLH-DSA-SHA2-256s", + "SLH-DSA-SHA2-256f", + "SLH-DSA-SHAKE-128s", + "SLH-DSA-SHAKE-128f", + "SLH-DSA-SHAKE-192s", + "SLH-DSA-SHAKE-192f", + "SLH-DSA-SHAKE-256s", + "SLH-DSA-SHAKE-256f", + "HashSLH-DSA-SHA2-128s-SHA-256", + "HashSLH-DSA-SHA2-128f-SHA-256", + "HashSLH-DSA-SHA2-192s-SHA-512", + "HashSLH-DSA-SHA2-192f-SHA-512", + "HashSLH-DSA-SHA2-256s-SHA-512", + "HashSLH-DSA-SHA2-256f-SHA-512", + "HashSLH-DSA-SHAKE-128s-SHAKE128", + "HashSLH-DSA-SHAKE-128f-SHAKE128", + "HashSLH-DSA-SHAKE-192s-SHAKE256", + "HashSLH-DSA-SHAKE-192f-SHAKE256", + "HashSLH-DSA-SHAKE-256s-SHAKE256", + "HashSLH-DSA-SHAKE-256f-SHAKE256" + ] + } + ] + } + ] } ] } \ No newline at end of file diff --git a/schema/cryptography-defs.schema.json b/schema/cryptography-defs.schema.json index 2203583d2..eb66fa472 100644 --- a/schema/cryptography-defs.schema.json +++ b/schema/cryptography-defs.schema.json @@ -677,7 +677,8 @@ "ssh", "sstp", "tls", - "wpa" + "wpa", + "x509" ], "meta:enum": { "5g-aka": "Authentication and Key Agreement for 5G.", @@ -693,7 +694,8 @@ "ssh": "Secure Shell.", "sstp": "Secure Socket Tunneling Protocol.", "tls": "Transport Layer Security.", - "wpa": "Wi-Fi Protected Access." + "wpa": "Wi-Fi Protected Access.", + "x509": "X.509 public key certificates, as profiled for the Internet PKI. Its composition lists the signature algorithms a certificate can carry; protocols that authenticate with X.509 certificates reference it as a sub-protocol. Certificates themselves are modeled as certificate assets." } }, "standardRefs": { @@ -774,7 +776,8 @@ "server", "initiator", "responder", - "group-creator" + "group-creator", + "issuer" ] }, "algorithmSet": {