Update OIDs to reflect Falcon KAT changes

open-quantum-safe · Mar 4, 2024 · 3d0cdc6 · 3d0cdc6
1 parent 1abb63d
commit 3d0cdc6
Showing 1 changed file with 43 additions and 23 deletions.
diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml
@@ -393,7 +393,7 @@ kem_nid_end: '0x0250'
 kem_nid_hybrid_end: '0x2FFF'
 # need to edit ssl_local.h macros IS_OQS_KEM_CURVEID and IS_OQS_KEM_HYBRID_CURVEID with the above _end values
 
-# Next free signature ID: 0xfedc
+# Next free signature ID: 0xfee1
 sigs:
   # -
     # iso (1)
@@ -575,20 +575,32 @@ sigs:
         name: 'falcon512'
         pretty_name: 'Falcon-512'
         oqs_meth: 'OQS_SIG_alg_falcon_512'
-        oid: '1.3.9999.3.6'
-        code_point: '0xfeae'
+        oid: '1.3.9999.3.11'
+        code_point: '0xfed7'
         supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk']
         enable: true
         mix_with: [{'name': 'p256',
                     'pretty_name': 'ECDSA p256',
-                    'oid': '1.3.9999.3.7',
-                    'code_point': '0xfeaf'},
+                    'oid': '1.3.9999.3.12',
+                    'code_point': '0xfed8'},
                    {'name': 'rsa3072',
                     'pretty_name': 'RSA3072',
-                    'oid': '1.3.9999.3.8',
-                    'code_point': '0xfeb0'}]
+                    'oid': '1.3.9999.3.13',
+                    'code_point': '0xfed9'}]
         extra_nids:
           old:
+            - implementation_version: PQClean Round 3 version
+              nist-round: 3
+              oid: '1.3.9999.3.6'
+              code_point: '0xfeae'
+              mix_with: [{'name': 'p256',
+                          'pretty_name': 'ECDSA p256',
+                          'oid': '1.3.9999.3.7',
+                          'code_point': '0xfeaf'},
+                         {'name': 'rsa3072',
+                          'pretty_name': 'RSA3072',
+                          'oid': '1.3.9999.3.8',
+                          'code_point': '0xfeb0'}]
             - implementation_version: NIST Round 3 submission
               nist-round: 3
               oid: '1.3.9999.3.1'
@@ -603,34 +615,42 @@ sigs:
                           'code_point': '0xfe0d'}]
       -
         name: 'falcon512_padded'
-        pretty_name: 'Falcon-512 (PADDED)'
+        pretty_name: 'Falcon-512-padded'
         oqs_meth: 'OQS_SIG_alg_falcon_512_padded'
-        oid: '1.3.9999.3.11'
-        code_point: '0xfed7'
+        oid: '1.3.9999.3.16'
+        code_point: '0xfedc'
         supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk']
         enable: true
         mix_with: [{'name': 'p256',
                     'pretty_name': 'ECDSA p256',
-                    'oid': '1.3.9999.3.12',
-                    'code_point': '0xfed8'},
+                    'oid': '1.3.9999.3.17',
+                    'code_point': '0xfedd'},
                    {'name': 'rsa3072',
                     'pretty_name': 'RSA3072',
-                    'oid': '1.3.9999.3.13',
-                    'code_point': '0xfed9'}]
+                    'oid': '1.3.9999.3.18',
+                    'code_point': '0xfede'}]
       -
         name: 'falcon1024'
         pretty_name: 'Falcon-1024'
         oqs_meth: 'OQS_SIG_alg_falcon_1024'
-        oid: '1.3.9999.3.9'
-        code_point: '0xfeb1'
+        oid: '1.3.9999.3.14'
+        code_point: '0xfeda'
         supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk']
         enable: true
         mix_with: [{'name': 'p521',
                     'pretty_name': 'ECDSA p521',
-                    'oid': '1.3.9999.3.10',
-                    'code_point': '0xfeb2'}]
+                    'oid': '1.3.9999.3.15',
+                    'code_point': '0xfedb'}]
         extra_nids:
           old:
+            - implementation_version: PQClean Round 3 version
+              nist-round: 3
+              oid: '1.3.9999.3.9'
+              code_point: '0xfeb1'
+              mix_with: [{'name': 'p521',
+                          'pretty_name': 'ECDSA p521',
+                          'oid': '1.3.9999.3.10',
+                          'code_point': '0xfeb2'}]
             - implementation_version: NIST Round 3 submission
               nist-round: 3
               oid: '1.3.9999.3.4'
@@ -641,16 +661,16 @@ sigs:
                           'code_point': '0xfe0f'}]
       -
         name: 'falcon1024_padded'
-        pretty_name: 'Falcon-1024 (PADDED)'
+        pretty_name: 'Falcon-1024-padded'
         oqs_meth: 'OQS_SIG_alg_falcon_1024_padded'
-        oid: '1.3.9999.3.14'
-        code_point: '0xfeda'
+        oid: '1.3.9999.3.19'
+        code_point: '0xfedf'
         supported_encodings: ['draft-uni-qsckeys-falcon-00/sk-pk']
         enable: true
         mix_with: [{'name': 'p521',
                     'pretty_name': 'ECDSA p521',
-                    'oid': '1.3.9999.3.15',
-                    'code_point': '0xfedb'}]
+                    'oid': '1.3.9999.3.20',
+                    'code_point': '0xfee0'}]
   -
     family: 'SPHINCS-Haraka'
     variants: