mirror of
https://github.com/open-quantum-safe/liboqs.git
synced 2025-10-04 00:02:01 -04:00
This commit includes following changes: * Revert "Removed NTRU. (#1335)" * Replace the uses of malloc with OQS_MEM_malloc * Add a derandomized keypair function * Add "all" entries of NTRU algorithms to the KATs file * Fix reflecting the removal of NTRU from PQClean * Update NTRU documents with the latest manners * Change the CODEOWNERS of NTRU KEM Signed-off-by: Saito Masataka <saitomst@intellilink.co.jp>
483 lines
30 KiB
Python
Executable File
483 lines
30 KiB
Python
Executable File
#!/usr/bin/env python3
|
|
|
|
# SPDX-License-Identifier: MIT
|
|
|
|
import argparse
|
|
import os
|
|
import subprocess
|
|
import yaml
|
|
import inspect
|
|
|
|
DEBUG = 0
|
|
|
|
def shell(command, expect=0):
|
|
subprocess_stdout = None if DEBUG > 0 else subprocess.DEVNULL
|
|
ret = subprocess.run(command, stdout=subprocess_stdout, stderr=subprocess_stdout)
|
|
if ret.returncode != expect:
|
|
raise Exception("'{}' failed with error {}. Expected {}.".format(" ".join(command), ret, expect))
|
|
|
|
def load_yaml(filename, encoding='utf-8'):
|
|
with open(filename, mode='r', encoding=encoding) as fh:
|
|
return yaml.safe_load(fh.read())
|
|
|
|
def store_yaml(filename, contents, encoding='utf-8'):
|
|
with open(filename, mode='w', encoding=encoding) as fh:
|
|
yaml.dump(contents, fh, sort_keys=False, allow_unicode=True)
|
|
|
|
def fetch_upstream(liboqs_root, upstream_info):
|
|
work_dir_root = os.path.join(liboqs_root, 'scripts', 'copy_from_upstream', 'repos')
|
|
os.makedirs(work_dir_root, exist_ok=True)
|
|
|
|
work_dir = os.path.join(work_dir_root, upstream_info['name'])
|
|
work_dotgit = os.path.join(work_dir, '.git')
|
|
if not os.path.exists(work_dotgit):
|
|
shell(['git', 'init', work_dir])
|
|
shell(['git', '--git-dir', work_dotgit, 'remote', 'add', 'origin', upstream_info['git_url']])
|
|
shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'remote', 'set-url', 'origin', upstream_info['git_url']])
|
|
shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'fetch', '--depth=1', 'origin', upstream_info['git_commit']])
|
|
shell(['git', '--git-dir', work_dotgit, '--work-tree', work_dir, 'reset', '--hard', upstream_info['git_commit']])
|
|
|
|
return work_dir
|
|
|
|
def rhs_if_not_equal(lhs, rhs, not_equal_msg):
|
|
if lhs != rhs:
|
|
if DEBUG > 0:
|
|
caller = inspect.getframeinfo(inspect.stack()[1][0])
|
|
print("Line {}: Discrepancy in {}: lhs: {}, rhs: {}".format(caller.lineno, not_equal_msg, lhs, rhs))
|
|
if DEBUG > 1:
|
|
exit(1)
|
|
return rhs
|
|
return lhs
|
|
|
|
def get_upstream_info(upstream_list, location):
|
|
for i in upstream_list:
|
|
if i['name'] == location:
|
|
return i
|
|
print("Error: Cannot find location %s in upstream list" % (location))
|
|
print(upstream_list)
|
|
exit(1)
|
|
|
|
def get_oqs_yaml(param_list, name):
|
|
ctr=0
|
|
for i in param_list:
|
|
if i['name'] == name:
|
|
return ctr, i
|
|
ctr=ctr+1
|
|
print("Error: Cannot find name %s in param list" % (name))
|
|
print(param_list)
|
|
exit(1)
|
|
|
|
# Merge documentation contained in liboqs_root/docs/algorithms/kem/kem['name'].yml with upstream information:
|
|
# Args:
|
|
# kems: List of kems in copy_from_upstream.yml
|
|
# upstream_info: Hashtable of upstream information (keyed by upstream source)
|
|
# incl. entry: 'upstream_root' pointing to local folder containing source code
|
|
def update_upstream_kem_alg_docs(liboqs_root, kems, upstream_info, write_changes=False):
|
|
for kem in kems:
|
|
ui = get_upstream_info(upstream_info, kem['upstream_location'])
|
|
|
|
ouis = dict()
|
|
if 'arch_specific_upstream_locations' in kem:
|
|
for arch_specific_ul in kem['arch_specific_upstream_locations']:
|
|
name = kem['arch_specific_upstream_locations'][arch_specific_ul] + '-' + str(arch_specific_ul)
|
|
ouis[name] = get_upstream_info(upstream_info, kem['arch_specific_upstream_locations'][arch_specific_ul])
|
|
patches_done=""
|
|
if 'patches' in ui:
|
|
for patchfilename in ui['patches']:
|
|
if kem['name'] in patchfilename:
|
|
patches_done=" with copy_from_upstream patches"
|
|
|
|
upstream_root = ui['upstream_root']
|
|
meta_yaml_path_template = ui['kem_meta_path']
|
|
if DEBUG > 1:
|
|
print("Working on KEM %s using path %s and META file %s" % (kem, upstream_root, meta_yaml_path_template))
|
|
if True: # for all upstream sources:
|
|
oqs_yaml_path = os.path.join(liboqs_root, 'docs', 'algorithms', 'kem', '{}.yml'.format(kem['name']))
|
|
if os.path.isfile(oqs_yaml_path):
|
|
oqs_yaml = load_yaml(oqs_yaml_path)
|
|
|
|
upstream_base_url = ui['git_url'][:-len(".git")]
|
|
# upstream is special: We will take the upstream git commit information
|
|
# (possibly with added patch comment) as it is what drove the update
|
|
|
|
# Need to check if yml is of old format. If so, update to new format
|
|
if 'primary-upstream' not in oqs_yaml:
|
|
print("Updating format of {}. Please double check ordering of yaml file".format(scheme['pretty_name_full']))
|
|
lhs = oqs_yaml['upstream']
|
|
oqs_yaml['primary-upstream'] = dict()
|
|
oqs_yaml['primary-upstream']['spdx-license-identifier'] = oqs_yaml['spdx-license-identifier']
|
|
for i in range(len(oqs_yaml['parameter-sets'])):
|
|
for j in range(len(oqs_yaml['parameter-sets'][i]['implementations'])):
|
|
oqs_yaml['parameter-sets'][i]['implementations'][j]['upstream'] = 'primary-upstream'
|
|
else:
|
|
lhs = oqs_yaml['primary-upstream']['source']
|
|
oqs_yaml['primary-upstream']['source'] = rhs_if_not_equal(lhs, ("{}/commit/{}"+patches_done).format(upstream_base_url, ui['git_commit']), "primary-upstream")
|
|
if 'upstream' in oqs_yaml:
|
|
del oqs_yaml['upstream']
|
|
del oqs_yaml['spdx-license-identifier']
|
|
|
|
if ouis:
|
|
for upstream in ouis:
|
|
optimized_upstream_base_url = ouis[upstream]['git_url'][:-len(".git")]
|
|
optimized_patches_done=""
|
|
if 'patches' in ouis[upstream]:
|
|
for patchfilename in ouis[upstream]['patches']:
|
|
if kem['name'] in patchfilename:
|
|
optimized_patches_done=" with copy_from_upstream patches"
|
|
if 'optimized-upstreams' in oqs_yaml and upstream in oqs_yaml['optimized-upstreams']:
|
|
lhs = oqs_yaml['optimized-upstreams'][upstream]['source']
|
|
else:
|
|
lhs = ''
|
|
oqs_yaml['optimized-upstreams'] = oqs_yaml.get('optimized-upstreams', dict())
|
|
oqs_yaml['optimized-upstreams'][upstream] = oqs_yaml['optimized-upstreams'].get(upstream, dict())
|
|
git_commit = ouis[upstream]['git_commit']
|
|
oqs_yaml['optimized-upstreams'][upstream]['source'] = rhs_if_not_equal(lhs, ("{}/commit/{}"+optimized_patches_done).format(optimized_upstream_base_url, git_commit), "optimized-upstreams")
|
|
|
|
# We cannot assume that the ordering of "parameter-sets"
|
|
# in the OQS YAML files matches that of copy_from_upstream.yml
|
|
# hence use helper function get_oqs_yaml(alg_name)
|
|
for scheme in kem['schemes']:
|
|
meta_yaml_path_template = ui['kem_meta_path']
|
|
upstream_meta_path = os.path.join(upstream_root, meta_yaml_path_template.format_map(scheme))
|
|
if DEBUG > 0:
|
|
print("Examining {}'s META.yml.".format(scheme['pretty_name_full']))
|
|
upstream_yaml = load_yaml(upstream_meta_path)
|
|
|
|
oqs_yaml['type'] = rhs_if_not_equal(oqs_yaml['type'], upstream_yaml['type'], "type")
|
|
oqs_yaml['principal-submitters'] = rhs_if_not_equal(oqs_yaml['principal-submitters'], upstream_yaml['principal-submitters'], "principal-submitters")
|
|
|
|
if 'auxiliary-submitters' in upstream_yaml:
|
|
oqs_yaml['auxiliary-submitters'] = rhs_if_not_equal(oqs_yaml['auxiliary-submitters'] if 'auxiliary-submitters' in oqs_yaml else '', upstream_yaml['auxiliary-submitters'], "auxiliary-submitters")
|
|
|
|
index, oqs_scheme_yaml = get_oqs_yaml(oqs_yaml['parameter-sets'], scheme['pretty_name_full'])
|
|
|
|
# TODO: PQClean and liboqs pretty-naming conventions for the
|
|
# following algorithms are out of sync.
|
|
if kem['name'] == 'classic_mceliece' or kem['name'] == 'hqc' or kem['name'] == 'ntru':
|
|
oqs_scheme_yaml['name'] = rhs_if_not_equal(oqs_scheme_yaml['name'], scheme['pretty_name_full'], "scheme pretty name")
|
|
else:
|
|
oqs_scheme_yaml['name'] = rhs_if_not_equal(oqs_scheme_yaml['name'], upstream_yaml['name'], "scheme pretty name")
|
|
|
|
oqs_scheme_yaml['claimed-nist-level'] = rhs_if_not_equal(oqs_scheme_yaml['claimed-nist-level'], upstream_yaml['claimed-nist-level'], "claimed-nist-level")
|
|
oqs_scheme_yaml['claimed-security'] = rhs_if_not_equal(oqs_scheme_yaml['claimed-security'], upstream_yaml['claimed-security'], "claimed-security")
|
|
oqs_scheme_yaml['length-public-key'] = rhs_if_not_equal(oqs_scheme_yaml['length-public-key'], upstream_yaml['length-public-key'], "length-public-key")
|
|
oqs_scheme_yaml['length-ciphertext'] = rhs_if_not_equal(oqs_scheme_yaml['length-ciphertext'], upstream_yaml['length-ciphertext'], "length-ciphertext")
|
|
oqs_scheme_yaml['length-secret-key'] = rhs_if_not_equal(oqs_scheme_yaml['length-secret-key'], upstream_yaml['length-secret-key'], "legnth-secret-key")
|
|
oqs_scheme_yaml['length-shared-secret'] = rhs_if_not_equal(oqs_scheme_yaml['length-shared-secret'], upstream_yaml['length-shared-secret'], "length-shared-secret")
|
|
|
|
if "length-keypair-seed" in oqs_scheme_yaml:
|
|
oqs_scheme_yaml['length-keypair-seed'] = rhs_if_not_equal(oqs_scheme_yaml['length-keypair-seed'], upstream_yaml['length-keypair-seed'], "length-keypair-seed")
|
|
|
|
if "length-encaps-seed" in oqs_scheme_yaml:
|
|
oqs_scheme_yaml['length-encaps-seed'] = rhs_if_not_equal(oqs_scheme_yaml['length-encaps-seed'], upstream_yaml['length-encaps-seed'], "length-encaps-seed")
|
|
|
|
_upstream_yaml = upstream_yaml
|
|
for impl_index, impl in enumerate(oqs_scheme_yaml['implementations']):
|
|
if impl['upstream'] != 'libjade':
|
|
upstream_yaml = _upstream_yaml
|
|
if impl['upstream'] in ouis:
|
|
upstream_name = impl['upstream']
|
|
meta_yaml_path_template = ouis[upstream_name]['kem_meta_path']
|
|
opt_upstream_root = ouis[upstream_name]['upstream_root']
|
|
upstream_meta_path = os.path.join(opt_upstream_root, meta_yaml_path_template.format_map(scheme))
|
|
upstream_yaml = load_yaml(upstream_meta_path)
|
|
|
|
for upstream_impl in upstream_yaml['implementations']:
|
|
if impl['upstream-id'] == upstream_impl['name']:
|
|
break
|
|
# Logic to add Common_META.yml components
|
|
|
|
implementations = upstream_yaml['implementations']
|
|
uir = get_upstream_info(implementations, impl['upstream-id'])
|
|
if (uir != None) and ('common_dep' in uir):
|
|
upstream_common_path = upstream_meta_path.replace(scheme['pretty_name_full'], "Common")
|
|
upstream_common_yaml = load_yaml(upstream_common_path)
|
|
for c in uir['common_dep'].split(' '):
|
|
ur = get_upstream_info(upstream_common_yaml['commons'], c)
|
|
if (ur != None) and ('supported_platforms' in ur):
|
|
if 'required_flags' in ur['supported_platforms'][0] and not ur['supported_platforms'][0]['required_flags']:
|
|
del ur['supported_platforms'][0]['required_flags']
|
|
if 'required_flags' in ur['supported_platforms'][0].keys():
|
|
upstream_impl['supported_platforms'][0]['required_flags']=list(set(upstream_impl['supported_platforms'][0]['required_flags']+ur['supported_platforms'][0]['required_flags']))
|
|
upstream_impl['supported_platforms'][0]['required_flags'].sort()
|
|
if 'supported_platforms' in upstream_impl:
|
|
for i in range(len(upstream_impl['supported_platforms'])):
|
|
if upstream_impl['supported_platforms'][i]['architecture'] == 'arm_8':
|
|
upstream_impl['supported_platforms'][i]['architecture'] = 'ARM64_V8'
|
|
if 'asimd' in upstream_impl['supported_platforms'][i]['required_flags']:
|
|
upstream_impl['supported_platforms'][i]['required_flags'].remove('asimd')
|
|
if 'required_flags' in upstream_impl['supported_platforms'][i] and not upstream_impl['supported_platforms'][i]['required_flags']:
|
|
del upstream_impl['supported_platforms'][i]['required_flags']
|
|
|
|
impl['supported-platforms'] = rhs_if_not_equal(impl['supported-platforms'], upstream_impl['supported_platforms'], "supported-platforms")
|
|
else:
|
|
impl['supported-platforms'] = rhs_if_not_equal(impl['supported-platforms'], "all", "supported-platforms")
|
|
oqs_scheme_yaml['implementations'][impl_index] = impl
|
|
|
|
oqs_yaml['parameter-sets'][index] = oqs_scheme_yaml
|
|
|
|
if write_changes:
|
|
store_yaml(oqs_yaml_path, oqs_yaml)
|
|
|
|
|
|
# Merge documentation in liboqs_root/docs/algorithms/kem/kem['name'].yml with
|
|
# upstream information from libjade (patched with copy_from_upstream.py):
|
|
# Args:
|
|
# kems: List of kems in copy_from_libjade.yml
|
|
# upstream_info: Hashtable of upstream information (keyed by upstream source)
|
|
# incl. entry: 'upstream_root' pointing to local folder containing source code
|
|
def update_libjade_kem_alg_docs(liboqs_root, kems, upstream_info, write_changes=False):
|
|
for kem in kems:
|
|
ui = get_upstream_info(upstream_info, kem['upstream_location'])
|
|
upstream_root = ui['upstream_root']
|
|
meta_yaml_path_template = ui['kem_meta_path']
|
|
|
|
oqs_yaml_path = os.path.join(liboqs_root, 'docs', 'algorithms', 'kem', '{}.yml'.format(kem['name']))
|
|
oqs_yaml = load_yaml(oqs_yaml_path)
|
|
# We cannot assume that the ordering of "parameter-sets"
|
|
# in the OQS YAML files matches that of copy_from_upstream.yml
|
|
# hence use helper function get_oqs_yaml(alg_name)
|
|
for scheme in kem['schemes']:
|
|
scheme['family'] = kem['name']
|
|
upstream_meta_path = os.path.join(upstream_root, meta_yaml_path_template.format_map(scheme))
|
|
upstream_yaml = load_yaml(upstream_meta_path)
|
|
|
|
oqs_yaml['type'] = rhs_if_not_equal(oqs_yaml['type'], upstream_yaml['type'], "type")
|
|
|
|
oqs_yaml['principal-submitters'] = rhs_if_not_equal(oqs_yaml['principal-submitters'], upstream_yaml['principal-submitters'], "principal-submitters")
|
|
if 'auxiliary-submitters' in upstream_yaml:
|
|
oqs_yaml['auxiliary-submitters'] = rhs_if_not_equal(oqs_yaml['auxiliary-submitters'] if 'auxiliary-submitters' in oqs_yaml else '', upstream_yaml['auxiliary-submitters'], "auxiliary-submitters")
|
|
|
|
for upstream in upstream_info:
|
|
verified_upstream_base_url = upstream['git_url'][:-len(".git")]
|
|
for patchfilename in upstream['patches']:
|
|
if kem['name'] in patchfilename:
|
|
patches_done=" with copy_from_upstream patches"
|
|
patches_done=""
|
|
if 'patches' in upstream:
|
|
for patchfilename in upstream['patches']:
|
|
if kem['name'] in patchfilename:
|
|
patches_done=" with copy_from_upstream patches"
|
|
if 'formally-verified-upstreams' in oqs_yaml and upstream['name'] in oqs_yaml['formally-verified-upstreams']:
|
|
|
|
lhs = oqs_yaml['formally-verified-upstreams'][upstream['name']]['source']
|
|
else:
|
|
lhs = ''
|
|
git_branch = upstream['git_branch']
|
|
oqs_yaml['formally-verified-upstreams'][upstream['name']]['source'] = rhs_if_not_equal(lhs, ("{}/tree/{}"+patches_done).format(verified_upstream_base_url, git_branch), "formally-verified-upstreams")
|
|
|
|
index, oqs_scheme_yaml = get_oqs_yaml(oqs_yaml['parameter-sets'], scheme['pretty_name_full'])
|
|
|
|
oqs_scheme_yaml['claimed-nist-level'] = rhs_if_not_equal(oqs_scheme_yaml['claimed-nist-level'], upstream_yaml['claimed-nist-level'], "claimed-nist-level")
|
|
oqs_scheme_yaml['claimed-security'] = rhs_if_not_equal(oqs_scheme_yaml['claimed-security'], upstream_yaml['claimed-security'], "claimed-security")
|
|
oqs_scheme_yaml['length-public-key'] = rhs_if_not_equal(oqs_scheme_yaml['length-public-key'], upstream_yaml['length-public-key'], "length-public-key")
|
|
oqs_scheme_yaml['length-ciphertext'] = rhs_if_not_equal(oqs_scheme_yaml['length-ciphertext'], upstream_yaml['length-ciphertext'], "length-ciphertext")
|
|
oqs_scheme_yaml['length-secret-key'] = rhs_if_not_equal(oqs_scheme_yaml['length-secret-key'], upstream_yaml['length-secret-key'], "legnth-secret-key")
|
|
oqs_scheme_yaml['length-shared-secret'] = rhs_if_not_equal(oqs_scheme_yaml['length-shared-secret'], upstream_yaml['length-shared-secret'], "length-shared-secret")
|
|
|
|
for impl_index, impl in enumerate(oqs_scheme_yaml['implementations']):
|
|
if impl['upstream'] == kem['upstream_location']:
|
|
for upstream_impl in upstream_yaml['implementations']:
|
|
if impl['upstream-id'] == upstream_impl['name']:
|
|
break
|
|
if 'supported_platforms' in upstream_impl:
|
|
impl['supported-platforms'] = rhs_if_not_equal(impl['supported-platforms'], upstream_impl['supported_platforms'], "supported-platforms")
|
|
for i in range(len(impl['supported-platforms'])):
|
|
if not impl['supported-platforms'][i]['required_flags']:
|
|
del impl['supported-platforms'][i]['required_flags']
|
|
|
|
oqs_scheme_yaml['implementations'][impl_index] = impl
|
|
|
|
oqs_yaml['parameter-sets'][index] = oqs_scheme_yaml
|
|
if write_changes:
|
|
store_yaml(oqs_yaml_path, oqs_yaml)
|
|
|
|
|
|
|
|
def update_upstream_sig_alg_docs(liboqs_root, sigs, upstream_info, write_changes=False):
|
|
for sig in sigs:
|
|
ui = get_upstream_info(upstream_info, sig['upstream_location'])
|
|
|
|
ouis = dict()
|
|
if 'arch_specific_upstream_locations' in sig:
|
|
for arch_specific_ul in sig['arch_specific_upstream_locations']:
|
|
name = sig['arch_specific_upstream_locations'][arch_specific_ul] + '-' + str(arch_specific_ul)
|
|
ouis[name] = get_upstream_info(upstream_info, sig['arch_specific_upstream_locations'][arch_specific_ul])
|
|
patches_done=""
|
|
if 'patches' in ui:
|
|
for patchfilename in ui['patches']:
|
|
if sig['name'] in patchfilename:
|
|
patches_done=" with copy_from_upstream patches"
|
|
|
|
upstream_root = ui['upstream_root']
|
|
meta_yaml_path_template = ui['sig_meta_path']
|
|
if DEBUG > 1:
|
|
print("Working on KEM %s using path %s and META file %s" % (sig, upstream_root, meta_yaml_path_template))
|
|
if True: # for all upstream sources:
|
|
oqs_yaml_path = os.path.join(liboqs_root, 'docs', 'algorithms', 'sig', '{}.yml'.format(sig['name']))
|
|
if os.path.isfile(oqs_yaml_path):
|
|
oqs_yaml = load_yaml(oqs_yaml_path)
|
|
else:
|
|
continue
|
|
|
|
# We cannot assume that the ordering of "parameter-sets"
|
|
# in the OQS YAML files matches that of copy_from_upstream.yml
|
|
# hence use helper function get_oqs_yaml(alg_name)
|
|
for scheme in sig['schemes']:
|
|
meta_yaml_path_template = ui['sig_meta_path']
|
|
upstream_meta_path = os.path.join(upstream_root, meta_yaml_path_template.format_map(scheme))
|
|
if DEBUG > 0:
|
|
print("Examining {}'s META.yml.".format(scheme['pretty_name_full']))
|
|
upstream_yaml = load_yaml(upstream_meta_path)
|
|
|
|
oqs_yaml['type'] = rhs_if_not_equal(oqs_yaml['type'], upstream_yaml['type'], "type")
|
|
oqs_yaml['principal-submitters'] = rhs_if_not_equal(oqs_yaml['principal-submitters'], upstream_yaml['principal-submitters'], "principal-submitters")
|
|
|
|
upstream_base_url = ui['git_url'][:-len(".git")]
|
|
# upstream is special: We will take the upstream git commit information
|
|
# (possibly with added patch comment) as it is what drove the update
|
|
|
|
# Need to check if yml is of old format. If so, update to new format
|
|
if 'primary-upstream' not in oqs_yaml:
|
|
print("Updating format of {}. Please double check ordering of yaml file".format(scheme['pretty_name_full']))
|
|
lhs = oqs_yaml['upstream']
|
|
oqs_yaml['primary-upstream'] = dict()
|
|
oqs_yaml['primary-upstream']['spdx-license-identifier'] = oqs_yaml['spdx-license-identifier']
|
|
for i in range(len(oqs_yaml['parameter-sets'])):
|
|
for j in range(len(oqs_yaml['parameter-sets'][i]['implementations'])):
|
|
oqs_yaml['parameter-sets'][i]['implementations'][j]['upstream'] = 'primary-upstream'
|
|
else:
|
|
lhs = oqs_yaml['primary-upstream']['source']
|
|
oqs_yaml['primary-upstream']['source'] = rhs_if_not_equal(lhs, ("{}/commit/{}"+patches_done).format(upstream_base_url, ui['git_commit']), "primary-upstream")
|
|
if 'upstream' in oqs_yaml:
|
|
del oqs_yaml['upstream']
|
|
del oqs_yaml['spdx-license-identifier']
|
|
|
|
if ouis:
|
|
for upstream in ouis:
|
|
optimized_upstream_base_url = ouis[upstream]['git_url'][:-len(".git")]
|
|
for patchfilename in ouis[upstream]['patches']:
|
|
if sig['name'] in patchfilename:
|
|
patches_done=" with copy_from_upstream patches"
|
|
patches_done=""
|
|
if 'patches' in ouis[upstream]:
|
|
for patchfilename in ouis[upstream]['patches']:
|
|
if sig['name'] in patchfilename:
|
|
patches_done=" with copy_from_upstream patches"
|
|
if 'optimized-upstreams' in oqs_yaml and upstream in oqs_yaml['optimized-upstreams']:
|
|
lhs = oqs_yaml['optimized-upstreams'][upstream]['source']
|
|
else:
|
|
lhs = ''
|
|
git_commit = ouis[upstream]['git_commit']
|
|
oqs_yaml['optimized-upstreams'][upstream]['source'] = rhs_if_not_equal(lhs, ("{}/commit/{}"+patches_done).format(optimized_upstream_base_url, git_commit), "optimized-upstreams")
|
|
|
|
|
|
if 'auxiliary-submitters' in upstream_yaml:
|
|
oqs_yaml['auxiliary-submitters'] = rhs_if_not_equal(oqs_yaml['auxiliary-submitters'] if 'auxiliary-submitters' in oqs_yaml else '', upstream_yaml['auxiliary-submitters'], "auxiliary-submitters")
|
|
|
|
index, oqs_scheme_yaml = get_oqs_yaml(oqs_yaml['parameter-sets'], scheme['pretty_name_full'])
|
|
|
|
# TODO: PQClean and liboqs pretty-naming conventions for the
|
|
# following algorithms are out of sync.
|
|
if sig['name'] == 'sphincs':
|
|
oqs_scheme_yaml['name'] = rhs_if_not_equal(oqs_scheme_yaml['name'], scheme['pretty_name_full'], "scheme pretty name")
|
|
else:
|
|
oqs_scheme_yaml['name'] = rhs_if_not_equal(oqs_scheme_yaml['name'], upstream_yaml['name'], "scheme pretty name")
|
|
|
|
oqs_scheme_yaml['claimed-nist-level'] = rhs_if_not_equal(oqs_scheme_yaml['claimed-nist-level'], upstream_yaml['claimed-nist-level'], "claimed-nist-level")
|
|
if oqs_scheme_yaml['claimed-security'] not in ["EUF-CMA", "SUF-CMA"]:
|
|
oqs_scheme_yaml['claimed-security'] = rhs_if_not_equal(oqs_scheme_yaml['claimed-security'], 'EUF-CMA', "claimed-security")
|
|
oqs_scheme_yaml['length-public-key'] = rhs_if_not_equal(oqs_scheme_yaml['length-public-key'], upstream_yaml['length-public-key'], "length-public-key")
|
|
oqs_scheme_yaml['length-secret-key'] = rhs_if_not_equal(oqs_scheme_yaml['length-secret-key'], upstream_yaml['length-secret-key'], "legnth-secret-key")
|
|
oqs_scheme_yaml['length-signature'] = rhs_if_not_equal(oqs_scheme_yaml['length-signature'], upstream_yaml['length-signature'], "length-signature")
|
|
|
|
_upstream_yaml = upstream_yaml
|
|
for impl_index, impl in enumerate(oqs_scheme_yaml['implementations']):
|
|
upstream_yaml = _upstream_yaml
|
|
if impl['upstream'] in ouis:
|
|
upstream_name = impl['upstream']
|
|
meta_yaml_path_template = ouis[upstream_name]['sig_meta_path']
|
|
opt_upstream_root = ouis[upstream_name]['upstream_root']
|
|
upstream_meta_path = os.path.join(opt_upstream_root, meta_yaml_path_template.format_map(scheme))
|
|
upstream_yaml = load_yaml(upstream_meta_path)
|
|
|
|
for upstream_impl in upstream_yaml['implementations']:
|
|
try:
|
|
x = impl['upstream-id']
|
|
except:
|
|
print(sig['name'])
|
|
print(impl)
|
|
exit(0)
|
|
if impl['upstream-id'] == upstream_impl['name']:
|
|
break
|
|
# Logic to add Common_META.yml components
|
|
|
|
implementations = upstream_yaml['implementations']
|
|
uir = get_upstream_info(implementations, impl['upstream-id'])
|
|
if (uir != None) and ('common_dep' in uir):
|
|
upstream_common_path = upstream_meta_path.replace(scheme['pretty_name_full'], "Common")
|
|
upstream_common_yaml = load_yaml(upstream_common_path)
|
|
for c in uir['common_dep'].split(' '):
|
|
ur = get_upstream_info(upstream_common_yaml['commons'], c)
|
|
if (ur != None) and ('supported_platforms' in ur):
|
|
if 'required_flags' in ur['supported_platforms'][0] and not ur['supported_platforms'][0]['required_flags']:
|
|
del ur['supported_platforms'][0]['required_flags']
|
|
if 'required_flags' in ur['supported_platforms'][0].keys():
|
|
upstream_impl['supported_platforms'][0]['required_flags']=list(set(upstream_impl['supported_platforms'][0]['required_flags']+ur['supported_platforms'][0]['required_flags']))
|
|
upstream_impl['supported_platforms'][0]['required_flags'].sort()
|
|
if 'supported_platforms' in upstream_impl:
|
|
for i in range(len(upstream_impl['supported_platforms'])):
|
|
if upstream_impl['supported_platforms'][i]['architecture'] == 'arm_8':
|
|
upstream_impl['supported_platforms'][i]['architecture'] = 'ARM64_V8'
|
|
if 'asimd' in upstream_impl['supported_platforms'][i]['required_flags']:
|
|
upstream_impl['supported_platforms'][i]['required_flags'].remove('asimd')
|
|
if not upstream_impl['supported_platforms'][i]['required_flags']:
|
|
del upstream_impl['supported_platforms'][i]['required_flags']
|
|
|
|
impl['supported-platforms'] = rhs_if_not_equal(impl['supported-platforms'], upstream_impl['supported_platforms'], "supported-platforms")
|
|
else:
|
|
impl['supported-platforms'] = rhs_if_not_equal(impl['supported-platforms'], "all", "supported-platforms")
|
|
oqs_scheme_yaml['implementations'][impl_index] = impl
|
|
|
|
oqs_yaml['parameter-sets'][index] = oqs_scheme_yaml
|
|
|
|
if write_changes:
|
|
store_yaml(oqs_yaml_path, oqs_yaml)
|
|
|
|
|
|
def do_it(liboqs_root, upstream_location='upstream'):
|
|
global DEBUG
|
|
if liboqs_root == None:
|
|
parser = argparse.ArgumentParser()
|
|
parser.add_argument("--liboqs-root", default=os.path.join("..", ".."))
|
|
parser.add_argument("-w", "--write-changes", dest="write_changes", action='store_true')
|
|
parser.add_argument("-v", "--verbosity", type=int)
|
|
args = parser.parse_args()
|
|
|
|
if args.verbosity:
|
|
DEBUG = args.verbosity
|
|
|
|
liboqs_root = args.liboqs_root
|
|
write_changes = args.write_changes
|
|
else:
|
|
write_changes = True
|
|
|
|
if not write_changes:
|
|
print("--write-changes not set; changes will not be written out.")
|
|
instructions = load_yaml(
|
|
os.path.join(liboqs_root, 'scripts', 'copy_from_upstream', 'copy_from_{}.yml'.format(upstream_location)),
|
|
encoding='utf-8')
|
|
|
|
for upstream in instructions['upstreams']:
|
|
if 'git_url' in upstream.keys():
|
|
upstream['upstream_root'] = fetch_upstream(liboqs_root, upstream)
|
|
|
|
if upstream_location == 'libjade':
|
|
update_libjade_kem_alg_docs(liboqs_root, instructions['kems'], instructions['upstreams'], write_changes)
|
|
else:
|
|
update_upstream_kem_alg_docs(liboqs_root, instructions['kems'], instructions['upstreams'], write_changes)
|
|
update_upstream_sig_alg_docs(liboqs_root, instructions['sigs'], instructions['upstreams'], write_changes)
|
|
|
|
if __name__ == "__main__":
|
|
do_it(None)
|