From 0a3519fdd9c2c1126229986344706dd09ba328bb Mon Sep 17 00:00:00 2001 From: Felipe Ventura Date: Thu, 29 Feb 2024 08:14:01 -0600 Subject: [PATCH] added more descriptive comments Signed-off-by: Felipe Ventura --- oqs-template/generate.yml | 2 ++ oqs-template/scripts/common.py/sig_algs.fragment | 1 + oqsprov/oqs_prov.h | 6 ++++-- scripts/common.py | 3 ++- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/oqs-template/generate.yml b/oqs-template/generate.yml index f44a388e..d1e011a7 100644 --- a/oqs-template/generate.yml +++ b/oqs-template/generate.yml @@ -422,6 +422,8 @@ sigs: # 'security': '128', # 'oid': '2.16.840.1.114027.80.1.8'}] - + # The Composite OIDs are kept up to date by @feventura (Entrust) + # These are prototype OIDs and are in line with draft-ounsworth-pq-composite-sigs-12 # OID scheme for composite variants: # joint-iso-itu-t (2) # country (16) diff --git a/oqs-template/scripts/common.py/sig_algs.fragment b/oqs-template/scripts/common.py/sig_algs.fragment index d3839008..07706745 100644 --- a/oqs-template/scripts/common.py/sig_algs.fragment +++ b/oqs-template/scripts/common.py/sig_algs.fragment @@ -16,3 +16,4 @@ '{{ variant['name'] }}_{{ composite_alg['name'] }}', {%- endfor -%} {%- endfor %} {%- endfor %} + diff --git a/oqsprov/oqs_prov.h b/oqsprov/oqs_prov.h index 26daec72..e1b6b954 100644 --- a/oqsprov/oqs_prov.h +++ b/oqsprov/oqs_prov.h @@ -177,8 +177,10 @@ struct oqsx_key_st { #endif int references; - /* point to actual priv key material -- classic key, if present, first, - * unless is composite i.e., OQS key always at comp_*key[numkeys-1] + /* point to actual priv key material -- if is a hydrid, the classic key will + * be present first, i.e., OQS key always at comp_*key[numkeys-1] - if is a + * composite, the classic key will be presented second, i.e., OQS key always + * at comp_*key[0] */ void **comp_privkey; void **comp_pubkey; diff --git a/scripts/common.py b/scripts/common.py index 7518854a..83ca6dff 100644 --- a/scripts/common.py +++ b/scripts/common.py @@ -20,7 +20,8 @@ # post-quantum + classical signatures 'p256_dilithium2','rsa3072_dilithium2','p384_dilithium3','p521_dilithium5','p256_mldsa44','rsa3072_mldsa44','p384_mldsa65','p521_mldsa87','p256_falcon512','rsa3072_falcon512','p521_falcon1024','p256_sphincssha2128fsimple','rsa3072_sphincssha2128fsimple','p256_sphincssha2128ssimple','rsa3072_sphincssha2128ssimple','p384_sphincssha2192fsimple','p256_sphincsshake128fsimple','rsa3072_sphincsshake128fsimple', # post-quantum + classical signatures (COMPOSITE) - 'mldsa44_pss2048','mldsa44_rsa2048','mldsa44_ed25519','mldsa44_p256','mldsa44_bp256','mldsa65_pss3072','mldsa65_rsa3072','mldsa65_p256','mldsa65_bp256','mldsa65_ed25519','mldsa87_p384','mldsa87_bp384','mldsa87_ed448','falcon512_p256','falcon512_bp256','falcon512_ed25519',##### OQS_TEMPLATE_FRAGMENT_SIG_ALGS_END + 'mldsa44_pss2048','mldsa44_rsa2048','mldsa44_ed25519','mldsa44_p256','mldsa44_bp256','mldsa65_pss3072','mldsa65_rsa3072','mldsa65_p256','mldsa65_bp256','mldsa65_ed25519','mldsa87_p384','mldsa87_bp384','mldsa87_ed448','falcon512_p256','falcon512_bp256','falcon512_ed25519', +##### OQS_TEMPLATE_FRAGMENT_SIG_ALGS_END ] SERVER_START_ATTEMPTS = 10