Update Kyber and Dilithium from upstream (#1316)

open-quantum-safe · Nov 23, 2022 · 2e2ddb4 · 2e2ddb4
1 parent e9cd9a5
commit 2e2ddb4
Show file tree

Hide file tree

Showing 23 changed files with 38 additions and 26 deletions.
diff --git a/docs/algorithms/kem/kyber.md b/docs/algorithms/kem/kyber.md
@@ -7,9 +7,9 @@
 - **Authors' website**: https://pq-crystals.org/
 - **Specification version**: NIST Round 3 submission.
 - **Primary Source**<a name="primary-source"></a>:
-  - **Source**: https://github.com/pq-crystals/kyber/commit/8e00ec73035147d18b27d06048dff322f8de1f29 with copy_from_upstream patches
+  - **Source**: https://github.com/pq-crystals/kyber/commit/1ee0baa2100a545ac852edea2e4441b8f742814d with copy_from_upstream patches
   - **Implementation license (SPDX-Identifier)**: CC0-1.0
-- **Optimized Implementation sources**: https://github.com/pq-crystals/kyber/commit/8e00ec73035147d18b27d06048dff322f8de1f29 with copy_from_upstream patches
+- **Optimized Implementation sources**: https://github.com/pq-crystals/kyber/commit/1ee0baa2100a545ac852edea2e4441b8f742814d with copy_from_upstream patches
   - **pqclean-aarch64**:<a name="pqclean-aarch64"></a>
       - **Source**: https://github.com/PQClean/PQClean/commit/4c9e5a3aa715cc8d1d0e377e4e6e682ebd7602d6 with copy_from_upstream patches
       - **Implementation license (SPDX-Identifier)**: CC0-1.0

diff --git a/docs/algorithms/kem/kyber.yml b/docs/algorithms/kem/kyber.yml
@@ -17,7 +17,7 @@ website: https://pq-crystals.org/
 nist-round: 3
 spec-version: NIST Round 3 submission
 primary-upstream:
-  source: https://github.com/pq-crystals/kyber/commit/8e00ec73035147d18b27d06048dff322f8de1f29
+  source: https://github.com/pq-crystals/kyber/commit/1ee0baa2100a545ac852edea2e4441b8f742814d
     with copy_from_upstream patches
   spdx-license-identifier: CC0-1.0
 optimized-upstreams:

diff --git a/docs/algorithms/sig/dilithium.md b/docs/algorithms/sig/dilithium.md
@@ -7,9 +7,9 @@
 - **Authors' website**: https://pq-crystals.org/dilithium/
 - **Specification version**: 3.1.
 - **Primary Source**<a name="primary-source"></a>:
-  - **Source**: https://github.com/pq-crystals/dilithium/commit/61b51a71701b8ae9f546a1e5d220e1950ed20d06 with copy_from_upstream patches
+  - **Source**: https://github.com/pq-crystals/dilithium/commit/3e9b9f1412f6c7435dbeb4e10692ea58f181ee51 with copy_from_upstream patches
   - **Implementation license (SPDX-Identifier)**: CC0-1.0
-- **Optimized Implementation sources**: https://github.com/pq-crystals/dilithium/commit/61b51a71701b8ae9f546a1e5d220e1950ed20d06 with copy_from_upstream patches
+- **Optimized Implementation sources**: https://github.com/pq-crystals/dilithium/commit/3e9b9f1412f6c7435dbeb4e10692ea58f181ee51 with copy_from_upstream patches
   - **pqclean-aarch64**:<a name="pqclean-aarch64"></a>
       - **Source**: https://github.com/PQClean/PQClean/commit/4c9e5a3aa715cc8d1d0e377e4e6e682ebd7602d6 with copy_from_upstream patches
       - **Implementation license (SPDX-Identifier)**: CC0-1.0

diff --git a/docs/algorithms/sig/dilithium.yml b/docs/algorithms/sig/dilithium.yml
@@ -15,7 +15,7 @@ website: https://pq-crystals.org/dilithium/
 nist-round: 3
 spec-version: 3.1
 primary-upstream:
-  source: https://github.com/pq-crystals/dilithium/commit/61b51a71701b8ae9f546a1e5d220e1950ed20d06
+  source: https://github.com/pq-crystals/dilithium/commit/3e9b9f1412f6c7435dbeb4e10692ea58f181ee51
     with copy_from_upstream patches
   spdx-license-identifier: CC0-1.0
 optimized-upstreams:

diff --git a/scripts/copy_from_upstream/copy_from_upstream.yml b/scripts/copy_from_upstream/copy_from_upstream.yml
@@ -13,15 +13,15 @@ upstreams:
     name: pqcrystals-kyber
     git_url: https://github.com/pq-crystals/kyber.git
     git_branch: master
-    git_commit: 8e00ec73035147d18b27d06048dff322f8de1f29
+    git_commit: 1ee0baa2100a545ac852edea2e4441b8f742814d
     kem_meta_path: '{pretty_name_full}_META.yml'
     kem_scheme_path: '.'
     patches: [pqcrystals-kyber-yml.patch, pqcrystals-kyber-ref-shake-aes.patch, pqcrystals-kyber-avx2-shake-aes.patch]
   -
     name: pqcrystals-dilithium
     git_url: https://github.com/pq-crystals/dilithium.git
     git_branch: master
-    git_commit: 61b51a71701b8ae9f546a1e5d220e1950ed20d06
+    git_commit: 3e9b9f1412f6c7435dbeb4e10692ea58f181ee51
     sig_meta_path: '{pretty_name_full}_META.yml'
     sig_scheme_path: '.'
     patches: [pqcrystals-dilithium-yml.patch, pqcrystals-dilithium-ref-shake-aes.patch, pqcrystals-dilithium-avx2-shake-aes.patch]

diff --git a/src/kem/kyber/pqcrystals-kyber_kyber1024-90s_ref/poly.h b/src/kem/kyber/pqcrystals-kyber_kyber1024-90s_ref/poly.h
@@ -6,7 +6,7 @@
 
 /*
  * Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
- * coeffs[0] + X*coeffs[1] + X^2*xoeffs[2] + ... + X^{n-1}*coeffs[n-1]
+ * coeffs[0] + X*coeffs[1] + X^2*coeffs[2] + ... + X^{n-1}*coeffs[n-1]
  */
 typedef struct{
   int16_t coeffs[KYBER_N];

diff --git a/src/kem/kyber/pqcrystals-kyber_kyber1024_ref/poly.h b/src/kem/kyber/pqcrystals-kyber_kyber1024_ref/poly.h
@@ -6,7 +6,7 @@
 
 /*
  * Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
- * coeffs[0] + X*coeffs[1] + X^2*xoeffs[2] + ... + X^{n-1}*coeffs[n-1]
+ * coeffs[0] + X*coeffs[1] + X^2*coeffs[2] + ... + X^{n-1}*coeffs[n-1]
  */
 typedef struct{
   int16_t coeffs[KYBER_N];

diff --git a/src/kem/kyber/pqcrystals-kyber_kyber512-90s_ref/poly.h b/src/kem/kyber/pqcrystals-kyber_kyber512-90s_ref/poly.h
@@ -6,7 +6,7 @@
 
 /*
  * Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
- * coeffs[0] + X*coeffs[1] + X^2*xoeffs[2] + ... + X^{n-1}*coeffs[n-1]
+ * coeffs[0] + X*coeffs[1] + X^2*coeffs[2] + ... + X^{n-1}*coeffs[n-1]
  */
 typedef struct{
   int16_t coeffs[KYBER_N];

diff --git a/src/kem/kyber/pqcrystals-kyber_kyber512_ref/poly.h b/src/kem/kyber/pqcrystals-kyber_kyber512_ref/poly.h
@@ -6,7 +6,7 @@
 
 /*
  * Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
- * coeffs[0] + X*coeffs[1] + X^2*xoeffs[2] + ... + X^{n-1}*coeffs[n-1]
+ * coeffs[0] + X*coeffs[1] + X^2*coeffs[2] + ... + X^{n-1}*coeffs[n-1]
  */
 typedef struct{
   int16_t coeffs[KYBER_N];

diff --git a/src/kem/kyber/pqcrystals-kyber_kyber768-90s_ref/poly.h b/src/kem/kyber/pqcrystals-kyber_kyber768-90s_ref/poly.h
@@ -6,7 +6,7 @@
 
 /*
  * Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
- * coeffs[0] + X*coeffs[1] + X^2*xoeffs[2] + ... + X^{n-1}*coeffs[n-1]
+ * coeffs[0] + X*coeffs[1] + X^2*coeffs[2] + ... + X^{n-1}*coeffs[n-1]
  */
 typedef struct{
   int16_t coeffs[KYBER_N];

diff --git a/src/kem/kyber/pqcrystals-kyber_kyber768_ref/poly.h b/src/kem/kyber/pqcrystals-kyber_kyber768_ref/poly.h
@@ -6,7 +6,7 @@
 
 /*
  * Elements of R_q = Z_q[X]/(X^n + 1). Represents polynomial
- * coeffs[0] + X*coeffs[1] + X^2*xoeffs[2] + ... + X^{n-1}*coeffs[n-1]
+ * coeffs[0] + X*coeffs[1] + X^2*coeffs[2] + ... + X^{n-1}*coeffs[n-1]
  */
 typedef struct{
   int16_t coeffs[KYBER_N];

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium2_avx2/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium2_avx2/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium2_ref/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium2aes_avx2/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium2aes_avx2/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium2aes_ref/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium2aes_ref/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium3_avx2/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium3_avx2/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium3_ref/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium3aes_avx2/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium3aes_avx2/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium3aes_ref/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium3aes_ref/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium5_avx2/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium5_avx2/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium5_ref/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium5aes_avx2/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium5aes_avx2/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources 

diff --git a/src/sig/dilithium/pqcrystals-dilithium_dilithium5aes_ref/LICENSE b/src/sig/dilithium/pqcrystals-dilithium_dilithium5aes_ref/LICENSE
@@ -1,4 +1,5 @@
-Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/)
+Public Domain (https://creativecommons.org/share-your-work/public-domain/cc0/);
+or Apache 2.0 License (https://www.apache.org/licenses/LICENSE-2.0.html).
 
 For Keccak and the random number generator 
 we are using public-domain code from sources