Update OIDs and code points for signature MAYO round 2

Signed-off-by: Basil Hess <[email protected]>

Author: bhess

ALGORITHMS.md

@@ -113,14 +113,14 @@ As standardization for these algorithms within TLS is not done, all TLS code poi
 | p521_sphincsshake256fsimple | 0xfecd |No| OQS_CODEPOINT_P521_SPHINCSSHAKE256FSIMPLE
 | sphincsshake256ssimple | 0xfece |No| OQS_CODEPOINT_SPHINCSSHAKE256SSIMPLE
 | p521_sphincsshake256ssimple | 0xfecf |No| OQS_CODEPOINT_P521_SPHINCSSHAKE256SSIMPLE
-| mayo1 | 0xfeee |Yes| OQS_CODEPOINT_MAYO1
-| p256_mayo1 | 0xfef2 |Yes| OQS_CODEPOINT_P256_MAYO1
-| mayo2 | 0xfeef |Yes| OQS_CODEPOINT_MAYO2
-| p256_mayo2 | 0xfef3 |Yes| OQS_CODEPOINT_P256_MAYO2
-| mayo3 | 0xfef0 |Yes| OQS_CODEPOINT_MAYO3
-| p384_mayo3 | 0xfef4 |Yes| OQS_CODEPOINT_P384_MAYO3
-| mayo5 | 0xfef1 |Yes| OQS_CODEPOINT_MAYO5
-| p521_mayo5 | 0xfef5 |Yes| OQS_CODEPOINT_P521_MAYO5
+| mayo1 | 0xff32 |Yes| OQS_CODEPOINT_MAYO1
+| p256_mayo1 | 0xff36 |Yes| OQS_CODEPOINT_P256_MAYO1
+| mayo2 | 0xff33 |Yes| OQS_CODEPOINT_MAYO2
+| p256_mayo2 | 0xff37 |Yes| OQS_CODEPOINT_P256_MAYO2
+| mayo3 | 0xff34 |Yes| OQS_CODEPOINT_MAYO3
+| p384_mayo3 | 0xff38 |Yes| OQS_CODEPOINT_P384_MAYO3
+| mayo5 | 0xff35 |Yes| OQS_CODEPOINT_MAYO5
+| p521_mayo5 | 0xff39 |Yes| OQS_CODEPOINT_P521_MAYO5
 | CROSSrsdp128balanced | 0xfef6 |Yes| OQS_CODEPOINT_CROSSRSDP128BALANCED
 | CROSSrsdp128fast | 0xfef7 |No| OQS_CODEPOINT_CROSSRSDP128FAST
 | CROSSrsdp128small | 0xfef8 |No| OQS_CODEPOINT_CROSSRSDP128SMALL
@@ -224,14 +224,14 @@ discussed in https://github.com/open-quantum-safe/oqs-provider/issues/351.
 | p521_sphincsshake256fsimple | 1.3.9999.6.9.11 |No| OQS_OID_P521_SPHINCSSHAKE256FSIMPLE
 | sphincsshake256ssimple | 1.3.9999.6.9.12 |No| OQS_OID_SPHINCSSHAKE256SSIMPLE
 | p521_sphincsshake256ssimple | 1.3.9999.6.9.13 |No| OQS_OID_P521_SPHINCSSHAKE256SSIMPLE
-| mayo1 | 1.3.9999.8.1.1 |Yes| OQS_OID_MAYO1
-| p256_mayo1 | 1.3.9999.8.1.2 |Yes| OQS_OID_P256_MAYO1
-| mayo2 | 1.3.9999.8.2.1 |Yes| OQS_OID_MAYO2
-| p256_mayo2 | 1.3.9999.8.2.2 |Yes| OQS_OID_P256_MAYO2
-| mayo3 | 1.3.9999.8.3.1 |Yes| OQS_OID_MAYO3
-| 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
+| mayo1 | 1.3.9999.8.1.3 |Yes| OQS_OID_MAYO1
+| p256_mayo1 | 1.3.9999.8.1.4 |Yes| OQS_OID_P256_MAYO1
+| mayo2 | 1.3.9999.8.2.3 |Yes| OQS_OID_MAYO2
+| p256_mayo2 | 1.3.9999.8.2.4 |Yes| OQS_OID_P256_MAYO2
+| mayo3 | 1.3.9999.8.3.3 |Yes| OQS_OID_MAYO3
+| p384_mayo3 | 1.3.9999.8.3.4 |Yes| OQS_OID_P384_MAYO3
+| mayo5 | 1.3.9999.8.5.3 |Yes| OQS_OID_MAYO5
+| p521_mayo5 | 1.3.9999.8.5.4 |Yes| OQS_OID_P521_MAYO5
 | CROSSrsdp128balanced | 1.3.6.1.4.1.62245.2.1.1 |Yes| OQS_OID_CROSSRSDP128BALANCED
 | CROSSrsdp128fast | 1.3.6.1.4.1.62245.2.1.2 |No| OQS_OID_CROSSRSDP128FAST
 | CROSSrsdp128small | 1.3.6.1.4.1.62245.2.1.3 |No| OQS_OID_CROSSRSDP128SMALL

oqs-template/generate.yml

@@ -448,7 +448,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: 0xff0a
+# Next free signature ID: 0xff3a
 sigs:
   # -
     # iso (1)
@@ -1542,46 +1542,46 @@ sigs:
         name: 'mayo1'
         pretty_name: 'MAYO-1'
         oqs_meth: 'OQS_SIG_alg_mayo_1'
-        oid: '1.3.9999.8.1.1'
-        code_point: '0xfeee'
+        oid: '1.3.9999.8.1.3'
+        code_point: '0xff32'
         enable: true
         mix_with: [{'name': 'p256',
                     'pretty_name': 'ECDSA p256',
-                    'oid': '1.3.9999.8.1.2',
-                    'code_point': '0xfef2'}]
+                    'oid': '1.3.9999.8.1.4',
+                    'code_point': '0xff36'}]
       -
         name: 'mayo2'
         pretty_name: 'MAYO-2'
         oqs_meth: 'OQS_SIG_alg_mayo_2'
-        oid: '1.3.9999.8.2.1'
-        code_point: '0xfeef'
+        oid: '1.3.9999.8.2.3'
+        code_point: '0xff33'
         enable: true
         mix_with: [{'name': 'p256',
                     'pretty_name': 'ECDSA p256',
-                    'oid': '1.3.9999.8.2.2',
-                    'code_point': '0xfef3'}]
+                    'oid': '1.3.9999.8.2.4',
+                    'code_point': '0xff37'}]
       -
         name: 'mayo3'
         pretty_name: 'MAYO-3'
         oqs_meth: 'OQS_SIG_alg_mayo_3'
-        oid: '1.3.9999.8.3.1'
-        code_point: '0xfef0'
+        oid: '1.3.9999.8.3.3'
+        code_point: '0xff34'
         enable: true
         mix_with: [{'name': 'p384',
                     'pretty_name': 'ECDSA p384',
-                    'oid': '1.3.9999.8.3.2',
-                    'code_point': '0xfef4'}]
+                    'oid': '1.3.9999.8.3.4',
+                    'code_point': '0xff38'}]
       -
         name: 'mayo5'
         pretty_name: 'MAYO-5'
         oqs_meth: 'OQS_SIG_alg_mayo_5'
-        oid: '1.3.9999.8.5.1'
-        code_point: '0xfef1'
+        oid: '1.3.9999.8.5.3'
+        code_point: '0xff35'
         enable: true
         mix_with: [{'name': 'p521',
                     'pretty_name': 'ECDSA p521',
-                    'oid': '1.3.9999.8.5.2',
-                    'code_point': '0xfef5'}]
+                    'oid': '1.3.9999.8.5.4',
+                    'code_point': '0xff39'}]
   -
     family: 'CROSS'
     variants: