switched to free OIDs, temporarely enabled only one CROSS variant

Signed-off-by: rtjk <47841774+rtjk@users.noreply.github.com>
open-quantum-safe · Aug 19, 2024 · c8f447f · c8f447f
1 parent c032f53
commit c8f447f
Show file tree

Hide file tree

Showing 14 changed files with 97 additions and 1,100 deletions.
diff --git a/ALGORITHMS.md b/ALGORITHMS.md
@@ -126,23 +126,23 @@ As standardization for these algorithms within TLS is not done, all TLS code poi
 | mayo5 | 0xfef1 |Yes| OQS_CODEPOINT_MAYO5
 | p521_mayo5 | 0xfef5 |Yes| OQS_CODEPOINT_P521_MAYO5
 | CROSSrsdp128balanced | 0xfef6 |Yes| OQS_CODEPOINT_CROSSRSDP128BALANCED
-| CROSSrsdp128fast | 0xfef7 |Yes| OQS_CODEPOINT_CROSSRSDP128FAST
-| CROSSrsdp128small | 0xfef8 |Yes| OQS_CODEPOINT_CROSSRSDP128SMALL
-| CROSSrsdp192balanced | 0xfef9 |Yes| OQS_CODEPOINT_CROSSRSDP192BALANCED
-| CROSSrsdp192fast | 0xfefa |Yes| OQS_CODEPOINT_CROSSRSDP192FAST
-| CROSSrsdp192small | 0xfefb |Yes| OQS_CODEPOINT_CROSSRSDP192SMALL
-| CROSSrsdp256balanced | 0xfefc |Yes| OQS_CODEPOINT_CROSSRSDP256BALANCED
-| CROSSrsdp256fast | 0xfefd |Yes| OQS_CODEPOINT_CROSSRSDP256FAST
-| CROSSrsdp256small | 0xfefe |Yes| OQS_CODEPOINT_CROSSRSDP256SMALL
-| CROSSrsdpg128balanced | 0xfeff |Yes| OQS_CODEPOINT_CROSSRSDPG128BALANCED
-| CROSSrsdpg128fast | 0xff00 |Yes| OQS_CODEPOINT_CROSSRSDPG128FAST
-| CROSSrsdpg128small | 0xff01 |Yes| OQS_CODEPOINT_CROSSRSDPG128SMALL
-| CROSSrsdpg192balanced | 0xff02 |Yes| OQS_CODEPOINT_CROSSRSDPG192BALANCED
-| CROSSrsdpg192fast | 0xff03 |Yes| OQS_CODEPOINT_CROSSRSDPG192FAST
-| CROSSrsdpg192small | 0xff04 |Yes| OQS_CODEPOINT_CROSSRSDPG192SMALL
-| CROSSrsdpg256balanced | 0xff05 |Yes| OQS_CODEPOINT_CROSSRSDPG256BALANCED
-| CROSSrsdpg256fast | 0xff06 |Yes| OQS_CODEPOINT_CROSSRSDPG256FAST
-| CROSSrsdpg256small | 0xff07 |Yes| OQS_CODEPOINT_CROSSRSDPG256SMALL
+| CROSSrsdp128fast | 0xfef7 |No| OQS_CODEPOINT_CROSSRSDP128FAST
+| CROSSrsdp128small | 0xfef8 |No| OQS_CODEPOINT_CROSSRSDP128SMALL
+| CROSSrsdp192balanced | 0xfef9 |No| OQS_CODEPOINT_CROSSRSDP192BALANCED
+| CROSSrsdp192fast | 0xfefa |No| OQS_CODEPOINT_CROSSRSDP192FAST
+| CROSSrsdp192small | 0xfefb |No| OQS_CODEPOINT_CROSSRSDP192SMALL
+| CROSSrsdp256balanced | 0xfefc |No| OQS_CODEPOINT_CROSSRSDP256BALANCED
+| CROSSrsdp256fast | 0xfefd |No| OQS_CODEPOINT_CROSSRSDP256FAST
+| CROSSrsdp256small | 0xfefe |No| OQS_CODEPOINT_CROSSRSDP256SMALL
+| CROSSrsdpg128balanced | 0xfeff |No| OQS_CODEPOINT_CROSSRSDPG128BALANCED
+| CROSSrsdpg128fast | 0xff00 |No| OQS_CODEPOINT_CROSSRSDPG128FAST
+| CROSSrsdpg128small | 0xff01 |No| OQS_CODEPOINT_CROSSRSDPG128SMALL
+| CROSSrsdpg192balanced | 0xff02 |No| OQS_CODEPOINT_CROSSRSDPG192BALANCED
+| CROSSrsdpg192fast | 0xff03 |No| OQS_CODEPOINT_CROSSRSDPG192FAST
+| CROSSrsdpg192small | 0xff04 |No| OQS_CODEPOINT_CROSSRSDPG192SMALL
+| CROSSrsdpg256balanced | 0xff05 |No| OQS_CODEPOINT_CROSSRSDPG256BALANCED
+| CROSSrsdpg256fast | 0xff06 |No| OQS_CODEPOINT_CROSSRSDPG256FAST
+| CROSSrsdpg256small | 0xff07 |No| OQS_CODEPOINT_CROSSRSDPG256SMALL
 <!--- OQS_TEMPLATE_FRAGMENT_IDS_END -->
 
 Changing code points
@@ -241,24 +241,24 @@ adapting the OIDs of all supported signature algorithms as per the table below.
 | p384_mayo3 | 1.3.9999.8.3.2 |Yes| OQS_OID_P384_MAYO3
 | mayo5 | 1.3.9999.8.5.1 |Yes| OQS_OID_MAYO5
 | p521_mayo5 | 1.3.9999.8.5.2 |Yes| OQS_OID_P521_MAYO5
-| CROSSrsdp128balanced | 0.0.0.0.0.0.0.0.0.1 |Yes| OQS_OID_CROSSRSDP128BALANCED
-| CROSSrsdp128fast | 0.0.0.0.0.0.0.0.0.2 |Yes| OQS_OID_CROSSRSDP128FAST
-| CROSSrsdp128small | 0.0.0.0.0.0.0.0.0.3 |Yes| OQS_OID_CROSSRSDP128SMALL
-| CROSSrsdp192balanced | 0.0.0.0.0.0.0.0.0.4 |Yes| OQS_OID_CROSSRSDP192BALANCED
-| CROSSrsdp192fast | 0.0.0.0.0.0.0.0.0.5 |Yes| OQS_OID_CROSSRSDP192FAST
-| CROSSrsdp192small | 0.0.0.0.0.0.0.0.0.6 |Yes| OQS_OID_CROSSRSDP192SMALL
-| CROSSrsdp256balanced | 0.0.0.0.0.0.0.0.0.7 |Yes| OQS_OID_CROSSRSDP256BALANCED
-| CROSSrsdp256fast | 0.0.0.0.0.0.0.0.0.8 |Yes| OQS_OID_CROSSRSDP256FAST
-| CROSSrsdp256small | 0.0.0.0.0.0.0.0.0.9 |Yes| OQS_OID_CROSSRSDP256SMALL
-| CROSSrsdpg128balanced | 0.0.0.0.0.0.0.0.0.10 |Yes| OQS_OID_CROSSRSDPG128BALANCED
-| CROSSrsdpg128fast | 0.0.0.0.0.0.0.0.0.11 |Yes| OQS_OID_CROSSRSDPG128FAST
-| CROSSrsdpg128small | 0.0.0.0.0.0.0.0.0.12 |Yes| OQS_OID_CROSSRSDPG128SMALL
-| CROSSrsdpg192balanced | 0.0.0.0.0.0.0.0.0.13 |Yes| OQS_OID_CROSSRSDPG192BALANCED
-| CROSSrsdpg192fast | 0.0.0.0.0.0.0.0.0.14 |Yes| OQS_OID_CROSSRSDPG192FAST
-| CROSSrsdpg192small | 0.0.0.0.0.0.0.0.0.15 |Yes| OQS_OID_CROSSRSDPG192SMALL
-| CROSSrsdpg256balanced | 0.0.0.0.0.0.0.0.0.16 |Yes| OQS_OID_CROSSRSDPG256BALANCED
-| CROSSrsdpg256fast | 0.0.0.0.0.0.0.0.0.17 |Yes| OQS_OID_CROSSRSDPG256FAST
-| CROSSrsdpg256small | 0.0.0.0.0.0.0.0.0.18 |Yes| OQS_OID_CROSSRSDPG256SMALL
+| CROSSrsdp128balanced | 1.3.9999.9.1 |Yes| OQS_OID_CROSSRSDP128BALANCED
+| CROSSrsdp128fast | 1.3.9999.9.2 |No| OQS_OID_CROSSRSDP128FAST
+| CROSSrsdp128small | 1.3.9999.9.3 |No| OQS_OID_CROSSRSDP128SMALL
+| CROSSrsdp192balanced | 1.3.9999.9.4 |No| OQS_OID_CROSSRSDP192BALANCED
+| CROSSrsdp192fast | 1.3.9999.9.5 |No| OQS_OID_CROSSRSDP192FAST
+| CROSSrsdp192small | 1.3.9999.9.6 |No| OQS_OID_CROSSRSDP192SMALL
+| CROSSrsdp256balanced | 1.3.9999.9.7 |No| OQS_OID_CROSSRSDP256BALANCED
+| CROSSrsdp256fast | 1.3.9999.9.8 |No| OQS_OID_CROSSRSDP256FAST
+| CROSSrsdp256small | 1.3.9999.9.9 |No| OQS_OID_CROSSRSDP256SMALL
+| CROSSrsdpg128balanced | 1.3.9999.9.10 |No| OQS_OID_CROSSRSDPG128BALANCED
+| CROSSrsdpg128fast | 1.3.9999.9.11 |No| OQS_OID_CROSSRSDPG128FAST
+| CROSSrsdpg128small | 1.3.9999.9.12 |No| OQS_OID_CROSSRSDPG128SMALL
+| CROSSrsdpg192balanced | 1.3.9999.9.13 |No| OQS_OID_CROSSRSDPG192BALANCED
+| CROSSrsdpg192fast | 1.3.9999.9.14 |No| OQS_OID_CROSSRSDPG192FAST
+| CROSSrsdpg192small | 1.3.9999.9.15 |No| OQS_OID_CROSSRSDPG192SMALL
+| CROSSrsdpg256balanced | 1.3.9999.9.16 |No| OQS_OID_CROSSRSDPG256BALANCED
+| CROSSrsdpg256fast | 1.3.9999.9.17 |No| OQS_OID_CROSSRSDPG256FAST
+| CROSSrsdpg256small | 1.3.9999.9.18 |No| OQS_OID_CROSSRSDPG256SMALL
 
 If [OQS_KEM_ENCODERS](CONFIGURE.md#OQS_KEM_ENCODERS) is enabled the following list is also available:
 

diff --git a/README.md b/README.md
@@ -52,7 +52,7 @@ This implementation makes available the following quantum safe algorithms:
 - **SPHINCS-SHA2**:`sphincssha2128fsimple`\*, `p256_sphincssha2128fsimple`\*, `rsa3072_sphincssha2128fsimple`\*, `sphincssha2128ssimple`\*, `p256_sphincssha2128ssimple`\*, `rsa3072_sphincssha2128ssimple`\*, `sphincssha2192fsimple`\*, `p384_sphincssha2192fsimple`\*, `sphincssha2192ssimple`, `p384_sphincssha2192ssimple`, `sphincssha2256fsimple`, `p521_sphincssha2256fsimple`, `sphincssha2256ssimple`, `p521_sphincssha2256ssimple`
 - **SPHINCS-SHAKE**:`sphincsshake128fsimple`\*, `p256_sphincsshake128fsimple`\*, `rsa3072_sphincsshake128fsimple`\*, `sphincsshake128ssimple`, `p256_sphincsshake128ssimple`, `rsa3072_sphincsshake128ssimple`, `sphincsshake192fsimple`, `p384_sphincsshake192fsimple`, `sphincsshake192ssimple`, `p384_sphincsshake192ssimple`, `sphincsshake256fsimple`, `p521_sphincsshake256fsimple`, `sphincsshake256ssimple`, `p521_sphincsshake256ssimple`
 - **MAYO**:`mayo1`\*, `p256_mayo1`\*, `mayo2`\*, `p256_mayo2`\*, `mayo3`\*, `p384_mayo3`\*, `mayo5`\*, `p521_mayo5`\*
-- **CROSS**:`CROSSrsdp128balanced`\*, `CROSSrsdp128fast`\*, `CROSSrsdp128small`\*, `CROSSrsdp192balanced`\*, `CROSSrsdp192fast`\*, `CROSSrsdp192small`\*, `CROSSrsdp256balanced`\*, `CROSSrsdp256fast`\*, `CROSSrsdp256small`\*, `CROSSrsdpg128balanced`\*, `CROSSrsdpg128fast`\*, `CROSSrsdpg128small`\*, `CROSSrsdpg192balanced`\*, `CROSSrsdpg192fast`\*, `CROSSrsdpg192small`\*, `CROSSrsdpg256balanced`\*, `CROSSrsdpg256fast`\*, `CROSSrsdpg256small`\*
+- **CROSS**:`CROSSrsdp128balanced`\*, `CROSSrsdp128fast`, `CROSSrsdp128small`, `CROSSrsdp192balanced`, `CROSSrsdp192fast`, `CROSSrsdp192small`, `CROSSrsdp256balanced`, `CROSSrsdp256fast`, `CROSSrsdp256small`, `CROSSrsdpg128balanced`, `CROSSrsdpg128fast`, `CROSSrsdpg128small`, `CROSSrsdpg192balanced`, `CROSSrsdpg192fast`, `CROSSrsdpg192small`, `CROSSrsdpg256balanced`, `CROSSrsdpg256fast`, `CROSSrsdpg256small`
 
 <!--- OQS_TEMPLATE_FRAGMENT_ALGS_END -->
 

diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml
@@ -1517,137 +1517,137 @@ sigs:
                     'oid': '1.3.9999.8.5.2',
                     'code_point': '0xfef5'}]
   -
-    family: 'CROSS' # TODO: add real OIDs
+    family: 'CROSS'
     variants:
       # RSDP 128
       -
         name: 'CROSSrsdp128balanced'
         pretty_name: 'CROSS-rsdp-128-balanced'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_128_balanced'
-        oid: '0.0.0.0.0.0.0.0.0.1'
+        oid: '1.3.9999.9.1'
         code_point: '0xfef6'
         enable: true
       -
         name: 'CROSSrsdp128fast'
         pretty_name: 'CROSS-rsdp-128-fast'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_128_fast'
-        oid: '0.0.0.0.0.0.0.0.0.2'
+        oid: '1.3.9999.9.2'
         code_point: '0xfef7'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdp128small'
         pretty_name: 'CROSS-rsdp-128-small'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_128_small'
-        oid: '0.0.0.0.0.0.0.0.0.3'
+        oid: '1.3.9999.9.3'
         code_point: '0xfef8'
-        enable: true
+        enable: false
       # RSDP 192
       -
         name: 'CROSSrsdp192balanced'
         pretty_name: 'CROSS-rsdp-192-balanced'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_192_balanced'
-        oid: '0.0.0.0.0.0.0.0.0.4'
+        oid: '1.3.9999.9.4'
         code_point: '0xfef9'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdp192fast'
         pretty_name: 'CROSS-rsdp-192-fast'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_192_fast'
-        oid: '0.0.0.0.0.0.0.0.0.5'
+        oid: '1.3.9999.9.5'
         code_point: '0xfefa'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdp192small'
         pretty_name: 'CROSS-rsdp-192-small'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_192_small'
-        oid: '0.0.0.0.0.0.0.0.0.6'
+        oid: '1.3.9999.9.6'
         code_point: '0xfefb'
-        enable: true
+        enable: false
       # RSDP 256
       -
         name: 'CROSSrsdp256balanced'
         pretty_name: 'CROSS-rsdp-256-balanced'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_256_balanced'
-        oid: '0.0.0.0.0.0.0.0.0.7'
+        oid: '1.3.9999.9.7'
         code_point: '0xfefc'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdp256fast'
         pretty_name: 'CROSS-rsdp-256-fast'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_256_fast'
-        oid: '0.0.0.0.0.0.0.0.0.8'
+        oid: '1.3.9999.9.8'
         code_point: '0xfefd'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdp256small'
         pretty_name: 'CROSS-rsdp-256-small'
         oqs_meth: 'OQS_SIG_alg_cross_rsdp_256_small'
-        oid: '0.0.0.0.0.0.0.0.0.9'
+        oid: '1.3.9999.9.9'
         code_point: '0xfefe'
-        enable: true
+        enable: false
       # RSDPG 128
       -
         name: 'CROSSrsdpg128balanced'
         pretty_name: 'CROSS-rsdpg-128-balanced'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_128_balanced'
-        oid: '0.0.0.0.0.0.0.0.0.10'
+        oid: '1.3.9999.9.10'
         code_point: '0xfeff'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdpg128fast'
         pretty_name: 'CROSS-rsdpg-128-fast'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_128_fast'
-        oid: '0.0.0.0.0.0.0.0.0.11'
+        oid: '1.3.9999.9.11'
         code_point: '0xff00'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdpg128small'
         pretty_name: 'CROSS-rsdpg-128-small'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_128_small'
-        oid: '0.0.0.0.0.0.0.0.0.12'
+        oid: '1.3.9999.9.12'
         code_point: '0xff01'
-        enable: true
+        enable: false
       # RSDPG 192
       -
         name: 'CROSSrsdpg192balanced'
         pretty_name: 'CROSS-rsdpg-192-balanced'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_192_balanced'
-        oid: '0.0.0.0.0.0.0.0.0.13'
+        oid: '1.3.9999.9.13'
         code_point: '0xff02'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdpg192fast'
         pretty_name: 'CROSS-rsdpg-192-fast'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_192_fast'
-        oid: '0.0.0.0.0.0.0.0.0.14'
+        oid: '1.3.9999.9.14'
         code_point: '0xff03'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdpg192small'
         pretty_name: 'CROSS-rsdpg-192-small'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_192_small'
-        oid: '0.0.0.0.0.0.0.0.0.15'
+        oid: '1.3.9999.9.15'
         code_point: '0xff04'
-        enable: true
+        enable: false
       # RSDPG 256
       -
         name: 'CROSSrsdpg256balanced'
         pretty_name: 'CROSS-rsdpg-256-balanced'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_balanced'
-        oid: '0.0.0.0.0.0.0.0.0.16'
+        oid: '1.3.9999.9.16'
         code_point: '0xff05'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdpg256fast'
         pretty_name: 'CROSS-rsdpg-256-fast'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_fast'
-        oid: '0.0.0.0.0.0.0.0.0.17'
+        oid: '1.3.9999.9.17'
         code_point: '0xff06'
-        enable: true
+        enable: false
       -
         name: 'CROSSrsdpg256small'
         pretty_name: 'CROSS-rsdpg-256-small'
         oqs_meth: 'OQS_SIG_alg_cross_rsdpg_256_small'
-        oid: '0.0.0.0.0.0.0.0.0.18'
+        oid: '1.3.9999.9.18'
         code_point: '0xff07'
-        enable: true
+        enable: false