HQC code point update (open-quantum-safe#306)

* HQC code point updates * adding liboqs 0.9.0 generator YAML * remove Win 2019 from CI Signed-off-by: Felipe Ventura <[email protected]>
EntrustCorporation · Mar 13, 2024 · 7aaa695 · 7aaa695
1 parent 1a9f157
commit 7aaa695
Show file tree

Hide file tree

Showing 7 changed files with 1,295 additions and 26 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -301,12 +301,12 @@ workflows:
       - macOS:
           name: macOS-shared
           CMAKE_ARGS: -DBUILD_SHARED_LIBS=ON -DOQS_DIST_BUILD=OFF -DOQS_ENABLE_KEM_CLASSIC_MCELIECE=OFF
-          OPENSSL_PREINSTALL: openssl@3.1
+          OPENSSL_PREINSTALL: openssl@3
       - macOS:
           name: macOS-static
           OQS_PROVIDER_BUILD_STATIC: true
           CMAKE_ARGS: -DOQS_DIST_BUILD=OFF -DOQS_ENABLE_KEM_CLASSIC_MCELIECE=OFF
-          OPENSSL_PREINSTALL: openssl@3.1
+          OPENSSL_PREINSTALL: openssl@3
   on-main-branch:
     when:
       or:

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -204,7 +204,7 @@ jobs:
     strategy:
       matrix:
         os:
-          - windows-2019
+#          - windows-2019
           - windows-2022
         platform:
           - arch: win64

diff --git a/ALGORITHMS.md b/ALGORITHMS.md
@@ -46,14 +46,14 @@ As standardization for these algorithms within TLS is not done, all TLS code poi
 | x448_bikel3 | 0x2FAF | Yes | OQS_CODEPOINT_X448_BIKEL3 |
 | bikel5 | 0x0243 | Yes | OQS_CODEPOINT_BIKEL5 |
 | p521_bikel5 | 0x2F43 | Yes | OQS_CODEPOINT_P521_BIKEL5 |
-| hqc128 | 0x022C | Yes | OQS_CODEPOINT_HQC128 |
-| p256_hqc128 | 0x2F2C | Yes | OQS_CODEPOINT_P256_HQC128 |
-| x25519_hqc128 | 0x2FAC | Yes | OQS_CODEPOINT_X25519_HQC128 |
-| hqc192 | 0x022D | Yes | OQS_CODEPOINT_HQC192 |
-| p384_hqc192 | 0x2F2D | Yes | OQS_CODEPOINT_P384_HQC192 |
-| x448_hqc192 | 0x2FAD | Yes | OQS_CODEPOINT_X448_HQC192 |
-| hqc256 | 0x022E | Yes | OQS_CODEPOINT_HQC256 |
-| p521_hqc256 | 0x2F2E | Yes | OQS_CODEPOINT_P521_HQC256 |
+| hqc128 | 0x0244 | Yes | OQS_CODEPOINT_HQC128 |
+| p256_hqc128 | 0x2F44 | Yes | OQS_CODEPOINT_P256_HQC128 |
+| x25519_hqc128 | 0x2FB0 | Yes | OQS_CODEPOINT_X25519_HQC128 |
+| hqc192 | 0x0245 | Yes | OQS_CODEPOINT_HQC192 |
+| p384_hqc192 | 0x2F45 | Yes | OQS_CODEPOINT_P384_HQC192 |
+| x448_hqc192 | 0x2FB1 | Yes | OQS_CODEPOINT_X448_HQC192 |
+| hqc256 | 0x0246 | Yes | OQS_CODEPOINT_HQC256 |
+| p521_hqc256 | 0x2F46 | Yes | OQS_CODEPOINT_P521_HQC256 |
 | dilithium2 | 0xfea0 |Yes| OQS_CODEPOINT_DILITHIUM2
 | p256_dilithium2 | 0xfea1 |Yes| OQS_CODEPOINT_P256_DILITHIUM2
 | rsa3072_dilithium2 | 0xfea2 |Yes| OQS_CODEPOINT_RSA3072_DILITHIUM2

diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml
@@ -1,5 +1,5 @@
 # This is the master document for ID interoperability for KEM IDs, p-hybrid KEM IDs, SIG (O)IDs
-# Next free plain KEM ID: 0x0244, p-hybrid: 0x2F44, X-hybrid: 0x2FB0
+# Next free plain KEM ID: 0x0247, p-hybrid: 0x2F47, X-hybrid: 0x2FB2
 kems:
   -
     family: 'FrodoKEM'
@@ -297,29 +297,62 @@ kems:
   -
     family: 'HQC'
     name_group: 'hqc128'
-    nid: '0x022C'
-    nid_hybrid: '0x2F2C'
+    nid: '0x0244'
+    nid_hybrid: '0x2F44'
     oqs_alg: 'OQS_KEM_alg_hqc_128'
     extra_nids:
       current:
         - hybrid_group: "x25519"
+          nid: '0x2FB0'
+      old:
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          nid: '0x022C'
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          hybrid_group: secp256_r1
+          nid: '0x2F2C'
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          hybrid_group: x25519
           nid: '0x2FAC'
   -
     family: 'HQC'
     name_group: 'hqc192'
-    nid: '0x022D'
-    nid_hybrid: '0x2F2D'
+    nid: '0x0245'
+    nid_hybrid: '0x2F45'
     oqs_alg: 'OQS_KEM_alg_hqc_192'
     extra_nids:
       current:
         - hybrid_group: "x448"
+          nid: '0x2FB1'
+      old:
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          nid: '0x022D'
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          hybrid_group: secp384_r1
+          nid: '0x2F2D'
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          hybrid_group: x448
           nid: '0x2FAD'
   -
     family: 'HQC'
     name_group: 'hqc256'
-    nid: '0x022E'
-    nid_hybrid: '0x2F2E'
+    nid: '0x0246'
+    nid_hybrid: '0x2F46'
     oqs_alg: 'OQS_KEM_alg_hqc_256'
+    extra_nids:
+      old:
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          nid: '0x022E'
+        - implementation_version: NIST Round 3 submission
+          nist-round: 3
+          hybrid_group: secp521_r1
+          nid: '0x2F2E'
 
 kem_nid_end: '0x0250'
 kem_nid_hybrid_end: '0x2FFF'