Merge branch 'main' into main

aws · Sep 20, 2024 · b3f75f4 · b3f75f4
2 parents 7dcb411 + 9c8bd6d
commit b3f75f4
Show file tree

Hide file tree

Showing 8 changed files with 12 additions and 9 deletions.
diff --git a/crypto/pkcs8/pkcs8.c b/crypto/pkcs8/pkcs8.c
@@ -167,8 +167,11 @@ int pkcs12_key_gen(const char *pass, size_t pass_len, const uint8_t *salt,
   for (size_t i = 0; i < S_len; i++) {
     I[i] = salt[i % salt_len];
   }
-  for (size_t i = 0; i < P_len; i++) {
-    I[i + S_len] = pass_raw[i % pass_raw_len];
+  // P_len would be 0 in this case, but static analyzers don't always see that
+  if(pass_raw_len > 0) {
+    for (size_t i = 0; i < P_len; i++) {
+      I[i + S_len] = pass_raw[i % pass_raw_len];
+    }
   }
 
   while (out_len != 0) {

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_emontredc_8n_neon.S b/third_party/s2n-bignum/arm/fastmul/bignum_emontredc_8n_neon.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Extend Montgomery reduce in 8-digit blocks, results in input-output buffer

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_kmul_16_32_neon.S b/third_party/s2n-bignum/arm/fastmul/bignum_kmul_16_32_neon.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Multiply z := x * y

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_kmul_32_64_neon.S b/third_party/s2n-bignum/arm/fastmul/bignum_kmul_32_64_neon.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Multiply z := x * y

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_ksqr_16_32_neon.S b/third_party/s2n-bignum/arm/fastmul/bignum_ksqr_16_32_neon.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Square, z := x^2

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_ksqr_32_64_neon.S b/third_party/s2n-bignum/arm/fastmul/bignum_ksqr_32_64_neon.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Square, z := x^2

diff --git a/third_party/s2n-bignum/x86_att/curve25519/bignum_madd_n25519.S b/third_party/s2n-bignum/x86_att/curve25519/bignum_madd_n25519.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Multiply-add modulo the order of the curve25519/edwards25519 basepoint

diff --git a/third_party/s2n-bignum/x86_att/curve25519/bignum_madd_n25519_alt.S b/third_party/s2n-bignum/x86_att/curve25519/bignum_madd_n25519_alt.S
@@ -1,5 +1,5 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
-// SPDX-License-Identifier: Apache-2.0 OR ISC
+// SPDX-License-Identifier: Apache-2.0 OR ISC OR MIT-0
 
 // ----------------------------------------------------------------------------
 // Multiply-add modulo the order of the curve25519/edwards25519 basepoint