integrated src and doc upstream copy [skip ci]

open-quantum-safe · Aug 6, 2021 · 82a4a16 · 82a4a16
1 parent 773d506
commit 82a4a16
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 241 deletions.
diff --git a/docs/algorithms/kem/kyber.yml b/docs/algorithms/kem/kyber.yml
@@ -44,8 +44,8 @@ parameter-sets:
       - Darwin
       required_flags:
       - popcnt
-      - avx2
       - bmi2
+      - avx2
     common-crypto:
     - SHA3: liboqs
     no-secret-dependent-branching-claimed: true
@@ -75,12 +75,12 @@ parameter-sets:
       - Linux
       - Darwin
       required_flags:
-      - popcnt
-      - sse2
-      - avx2
       - aes
+      - avx2
+      - popcnt
       - ssse3
       - bmi2
+      - sse2
     common-crypto:
     - AES: pqcrystals-kyber_common_aes
     - SHA3: liboqs
@@ -111,8 +111,8 @@ parameter-sets:
       - Darwin
       required_flags:
       - popcnt
-      - avx2
       - bmi2
+      - avx2
     common-crypto:
     - SHA3: liboqs
     no-secret-dependent-branching-claimed: true
@@ -142,12 +142,12 @@ parameter-sets:
       - Linux
       - Darwin
       required_flags:
-      - popcnt
-      - sse2
-      - avx2
       - aes
+      - avx2
+      - popcnt
       - ssse3
       - bmi2
+      - sse2
     common-crypto:
     - AES: pqcrystals-kyber_common_aes
     - SHA3: liboqs
@@ -178,8 +178,8 @@ parameter-sets:
       - Darwin
       required_flags:
       - popcnt
-      - avx2
       - bmi2
+      - avx2
     common-crypto:
     - SHA3: liboqs
     no-secret-dependent-branching-claimed: true
@@ -209,12 +209,12 @@ parameter-sets:
       - Linux
       - Darwin
       required_flags:
-      - popcnt
-      - sse2
-      - avx2
       - aes
+      - avx2
+      - popcnt
       - ssse3
       - bmi2
+      - sse2
     common-crypto:
     - AES: pqcrystals-kyber_common_aes
     - SHA3: liboqs

diff --git a/docs/algorithms/sig/dilithium.yml b/docs/algorithms/sig/dilithium.yml
@@ -133,10 +133,10 @@ parameter-sets:
       - Darwin
       - Linux
       required_flags:
+      - aes
+      - avx2
       - popcnt
       - sse2
-      - avx2
-      - aes
       - ssse3
     common-crypto:
     - AES: pqcrystals
@@ -167,10 +167,10 @@ parameter-sets:
       - Darwin
       - Linux
       required_flags:
+      - aes
+      - avx2
       - popcnt
       - sse2
-      - avx2
-      - aes
       - ssse3
     common-crypto:
     - AES: pqcrystals
@@ -201,10 +201,10 @@ parameter-sets:
       - Darwin
       - Linux
       required_flags:
+      - aes
+      - avx2
       - popcnt
       - sse2
-      - avx2
-      - aes
       - ssse3
     common-crypto:
     - AES: pqcrystals

diff --git a/scripts/copy_from_upstream/copy_from_upstream.py b/scripts/copy_from_upstream/copy_from_upstream.py
@@ -13,6 +13,7 @@
 from pathlib import Path
 import sys
 import json
+import update_upstream_alg_docs
 
 # kats of all algs
 kats = {}
@@ -512,7 +513,7 @@ def copy_from_upstream():
     if not keepdata:
         shutil.rmtree('repos')
 
-    print("Remember to update the docs by running update_pqclean_alg_docs.py")
+    update_upstream_alg_docs.do_it(os.environ['LIBOQS_DIR'])
 
 
 def verify_from_upstream():

diff --git a/scripts/copy_from_upstream/update_pqclean_alg_docs.py b/scripts/copy_from_upstream/update_pqclean_alg_docs.py