Merge branch '14-tls-pqc-named-curves'

Closes: #14

Author: c0r0n3r

cryptodatahub/common/algorithm.py

@@ -66,9 +66,7 @@ def get_gradeable_name(cls):
         return 'key exchange'
 
 
-class NamedGroupType(enum.IntEnum):
-    ELLIPTIC_CURVE = 1
-    DH_PARAM = 2
+NamedGroupType = enum.Enum('NamedGroupType', 'ELLIPTIC_CURVE FINITE_FIELD HYBRID_PQS')
 
 
 @attr.s(frozen=True)

cryptodatahub/common/grade.py

@@ -32,22 +32,22 @@ def __lt__(self, other):
 
 class Grade(enum.Enum):
     SECURE = GradeTypeParams(
-        name="secure",
+        name='secure',
         long_name=None,
         numeric=0,
     )
     DEPRECATED = GradeTypeParams(
-        name="deprecated",
+        name='deprecated',
         long_name=None,
         numeric=-1,
     )
     WEAK = GradeTypeParams(
-        name="weak",
+        name='weak',
         long_name=None,
         numeric=-2,
     )
     INSECURE = GradeTypeParams(
-        name="insecure",
+        name='insecure',
         long_name=None,
         numeric=-3,
     )

cryptodatahub/common/key-exchange.json

@@ -125,11 +125,11 @@
         ],
         "forward_secret": false
     },
-    "SNTRUP_X25519": {
-        "name": "SNTRUP X25519",
-        "long_name": "Streamlined NTRU Prime coupled with X25519",
+    "HYBRID_PQS": {
+        "name": "hybrid post-quantum safe",
+        "long_name": null,
         "vulnerabilities": null,
-        "forward_secret": false
+        "forward_secret": true
     },
     "SRP": {
         "name": "SRP",

cryptodatahub/common/named-group.json

@@ -749,23 +749,23 @@
         "oid": null,
         "vulnerabilities": [],
         "size": 2048,
-        "group_type": "DH_PARAM"
+        "group_type": "FINITE_FIELD"
     },
     "FFDHE3072": {
         "name": "ffdhe3072",
         "long_name": null,
         "oid": null,
         "vulnerabilities": [],
         "size": 3072,
-        "group_type": "DH_PARAM"
+        "group_type": "FINITE_FIELD"
     },
     "FFDHE4096": {
         "name": "ffdhe4096",
         "long_name": null,
         "oid": null,
         "vulnerabilities": [],
         "size": 4096,
-        "group_type": "DH_PARAM"
+        "group_type": "FINITE_FIELD"
     },
     "FFDHE6144": {
         "name": "ffdhe6144",
@@ -779,7 +779,7 @@
             }
         ],
         "size": 6144,
-        "group_type": "DH_PARAM"
+        "group_type": "FINITE_FIELD"
     },
     "FFDHE8192": {
         "name": "ffdhe8192",
@@ -793,7 +793,7 @@
             }
         ],
         "size": 8192,
-        "group_type": "DH_PARAM"
+        "group_type": "FINITE_FIELD"
     },
     "M383": {
         "name": "M383",
@@ -810,5 +810,21 @@
         "vulnerabilities": [],
         "size": 511,
         "group_type": "ELLIPTIC_CURVE"
+    },
+    "X25519_KYBER_512_DRAFT00": {
+        "name": "X25519Kyber512Draft00",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": [],
+        "size": 512,
+        "group_type": "HYBRID_PQS"
+    },
+    "X25519_KYBER_768_DRAFT00": {
+        "name": "X25519Kyber768Draft00",
+        "long_name": null,
+        "oid": null,
+        "vulnerabilities": [],
+        "size": 768,
+        "group_type": "HYBRID_PQS"
     }
 }

cryptodatahub/ssh/kex-algorithm.json

@@ -386,14 +386,14 @@
     },
     "SNTRUP4591761X25519_SHA512_TINYSSH_ORG": {
         "code": "[email protected]",
-        "kex": "SNTRUP_X25519",
+        "kex": "HYBRID_PQS",
         "key_parameter": "CURVE25519",
         "exchange_hash": "SHA2_512",
         "key_size": 10000
     },
     "SNTRUP761X25519_SHA512_OPENSSH_COM": {
         "code": "[email protected]",
-        "kex": "SNTRUP_X25519",
+        "kex": "HYBRID_PQS",
         "key_parameter": "CURVE25519",
         "exchange_hash": "SHA2_512",
         "key_size": 9264

cryptodatahub/tls/named-curve.json

@@ -223,5 +223,15 @@
         "_code_in_hex": "0xff02",
         "code": 65282,
         "named_group": null
+    },
+    "X25519_KYBER_512_DRAFT00": {
+        "_code_in_hex": "0xfe30",
+        "code": 65072,
+        "named_group": "X25519_KYBER_512_DRAFT00"
+    },
+    "X25519_KYBER_768_DRAFT00": {
+        "_code_in_hex": "0x6399",
+        "code": 25497,
+        "named_group": "X25519_KYBER_768_DRAFT00"
     }
 }