Merge branch 's2n-bignum-2024-03-04' into aws-lc-s2n-bignum-update-20…

…24-03-04
aws · Mar 4, 2024 · 4035dc6 · 4035dc6
2 parents 6bc2e52 + 7a374fb
commit 4035dc6
Show file tree

Hide file tree

Showing 155 changed files with 3,198 additions and 1,872 deletions.
diff --git a/third_party/s2n-bignum/arm/curve25519/bignum_mod_n25519.S b/third_party/s2n-bignum/arm/curve25519/bignum_mod_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
 
 // ----------------------------------------------------------------------------
 // Reduce modulo basepoint order, z := x mod n_25519

diff --git a/third_party/s2n-bignum/arm/curve25519/bignum_neg_p25519.S b/third_party/s2n-bignum/arm/curve25519/bignum_neg_p25519.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
 
 // ----------------------------------------------------------------------------
 // Negate modulo p_25519, z := (-x) mod p_25519, assuming x reduced

diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519.S
diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519_alt.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519_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
 
 // ----------------------------------------------------------------------------
 // The x25519 function for curve25519

diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519_byte.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519_byte.S
diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519_byte_alt.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519_byte_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
 
 // ----------------------------------------------------------------------------
 // The x25519 function for curve25519 (byte array arguments)

diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base.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
 
 // ----------------------------------------------------------------------------
 // The x25519 function for curve25519 on base element 9

diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_alt.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_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
 
 // ----------------------------------------------------------------------------
 // The x25519 function for curve25519 on base element 9

diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_byte.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_byte.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
 
 // ----------------------------------------------------------------------------
 // The x25519 function for curve25519 on base element 9 (byte array arguments)

diff --git a/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_byte_alt.S b/third_party/s2n-bignum/arm/curve25519/curve25519_x25519base_byte_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
 
 // ----------------------------------------------------------------------------
 // The x25519 function for curve25519 on base element 9 (byte array arguments)

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_decode.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_decode.S
@@ -1,11 +1,11 @@
 // 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
 
 // ----------------------------------------------------------------------------
 // Decode compressed 256-bit form of edwards25519 point
 // Input c[32] (bytes); output function return and z[8]
 //
-// extern uint64_t edwards25519_decode(uint64_t z[static 8],uint8_t c[static 32]);
+// extern uint64_t edwards25519_decode(uint64_t z[static 8], const uint8_t c[static 32]);
 //
 // This interprets the input byte string as a little-endian number
 // representing a point (x,y) on the edwards25519 curve, encoded as

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_decode_alt.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_decode_alt.S
@@ -1,11 +1,11 @@
 // 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
 
 // ----------------------------------------------------------------------------
 // Decode compressed 256-bit form of edwards25519 point
 // Input c[32] (bytes); output function return and z[8]
 //
-// extern uint64_t edwards25519_decode_alt(uint64_t z[static 8],uint8_t c[static 32]);
+// extern uint64_t edwards25519_decode_alt(uint64_t z[static 8], const uint8_t c[static 32]);
 //
 // This interprets the input byte string as a little-endian number
 // representing a point (x,y) on the edwards25519 curve, encoded as

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_encode.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_encode.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
 
 // ----------------------------------------------------------------------------
 // Encode edwards25519 point into compressed form as 256-bit number

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmulbase.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmulbase.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
 
 // ----------------------------------------------------------------------------
 // Scalar multiplication for the edwards25519 standard basepoint

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmulbase_alt.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmulbase_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
 
 // ----------------------------------------------------------------------------
 // Scalar multiplication for the edwards25519 standard basepoint

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmuldouble.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmuldouble.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
 
 // ----------------------------------------------------------------------------
 // Double scalar multiplication for edwards25519, fresh and base point

diff --git a/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmuldouble_alt.S b/third_party/s2n-bignum/arm/curve25519/edwards25519_scalarmuldouble_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
 
 // ----------------------------------------------------------------------------
 // Double scalar multiplication for edwards25519, fresh and base point

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_emontredc_8n.S b/third_party/s2n-bignum/arm/fastmul/bignum_emontredc_8n.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
 
 // ----------------------------------------------------------------------------
 // Extended Montgomery reduce in 8-digit blocks, results in input-output buffer

diff --git a/third_party/s2n-bignum/arm/fastmul/bignum_kmul_16_32.S b/third_party/s2n-bignum/arm/fastmul/bignum_kmul_16_32.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.S b/third_party/s2n-bignum/arm/fastmul/bignum_kmul_32_64.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.S b/third_party/s2n-bignum/arm/fastmul/bignum_ksqr_16_32.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.S b/third_party/s2n-bignum/arm/fastmul/bignum_ksqr_32_64.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/generic/bignum_ge.S b/third_party/s2n-bignum/arm/generic/bignum_ge.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
 
 // ----------------------------------------------------------------------------
 // Compare bignums, x >= y

diff --git a/third_party/s2n-bignum/arm/generic/bignum_mul.S b/third_party/s2n-bignum/arm/generic/bignum_mul.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/generic/bignum_optsub.S b/third_party/s2n-bignum/arm/generic/bignum_optsub.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
 
 // ----------------------------------------------------------------------------
 // Optionally subtract, z := x - y (if p nonzero) or z := x (if p zero)

diff --git a/third_party/s2n-bignum/arm/generic/bignum_sqr.S b/third_party/s2n-bignum/arm/generic/bignum_sqr.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/p384/Makefile b/third_party/s2n-bignum/arm/p384/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # 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
 #############################################################################
 
 # If actually on an ARM8 machine, just use the GNU assembler (as). Otherwise

diff --git a/third_party/s2n-bignum/arm/p384/bignum_add_p384.S b/third_party/s2n-bignum/arm/p384/bignum_add_p384.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
 
 // ----------------------------------------------------------------------------
 // Add modulo p_384, z := (x + y) mod p_384, assuming x and y reduced

diff --git a/third_party/s2n-bignum/arm/p384/bignum_bigendian_6.S b/third_party/s2n-bignum/arm/p384/bignum_bigendian_6.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
 
 // ----------------------------------------------------------------------------
 // Convert 6-digit (384-bit) bignum to/from big-endian form

diff --git a/third_party/s2n-bignum/arm/p384/bignum_cmul_p384.S b/third_party/s2n-bignum/arm/p384/bignum_cmul_p384.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 by a single word modulo p_384, z := (c * x) mod p_384, assuming

diff --git a/third_party/s2n-bignum/arm/p384/bignum_deamont_p384.S b/third_party/s2n-bignum/arm/p384/bignum_deamont_p384.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
 
 // ----------------------------------------------------------------------------
 // Convert from almost-Montgomery form, z := (x / 2^384) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_demont_p384.S b/third_party/s2n-bignum/arm/p384/bignum_demont_p384.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
 
 // ----------------------------------------------------------------------------
 // Convert from Montgomery form z := (x / 2^384) mod p_384, assuming x reduced

diff --git a/third_party/s2n-bignum/arm/p384/bignum_double_p384.S b/third_party/s2n-bignum/arm/p384/bignum_double_p384.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
 
 // ----------------------------------------------------------------------------
 // Double modulo p_384, z := (2 * x) mod p_384, assuming x reduced

diff --git a/third_party/s2n-bignum/arm/p384/bignum_half_p384.S b/third_party/s2n-bignum/arm/p384/bignum_half_p384.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
 
 // ----------------------------------------------------------------------------
 // Halve modulo p_384, z := (x / 2) mod p_384, assuming x reduced

diff --git a/third_party/s2n-bignum/arm/p384/bignum_littleendian_6.S b/third_party/s2n-bignum/arm/p384/bignum_littleendian_6.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
 
 // ----------------------------------------------------------------------------
 // Convert 6-digit (384-bit) bignum to/from little-endian form

diff --git a/third_party/s2n-bignum/arm/p384/bignum_mod_n384.S b/third_party/s2n-bignum/arm/p384/bignum_mod_n384.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
 
 // ----------------------------------------------------------------------------
 // Reduce modulo group order, z := x mod n_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_mod_n384_6.S b/third_party/s2n-bignum/arm/p384/bignum_mod_n384_6.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
 
 // ----------------------------------------------------------------------------
 // Reduce modulo group order, z := x mod n_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_mod_p384.S b/third_party/s2n-bignum/arm/p384/bignum_mod_p384.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
 
 // ----------------------------------------------------------------------------
 // Reduce modulo field characteristic, z := x mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_mod_p384_6.S b/third_party/s2n-bignum/arm/p384/bignum_mod_p384_6.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
 
 // ----------------------------------------------------------------------------
 // Reduce modulo field characteristic, z := x mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_montmul_p384.S b/third_party/s2n-bignum/arm/p384/bignum_montmul_p384.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
 
 // ----------------------------------------------------------------------------
 // Montgomery multiply, z := (x * y / 2^384) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_montmul_p384_alt.S b/third_party/s2n-bignum/arm/p384/bignum_montmul_p384_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
 
 // ----------------------------------------------------------------------------
 // Montgomery multiply, z := (x * y / 2^384) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_montsqr_p384.S b/third_party/s2n-bignum/arm/p384/bignum_montsqr_p384.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
 
 // ----------------------------------------------------------------------------
 // Montgomery square, z := (x^2 / 2^384) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_montsqr_p384_alt.S b/third_party/s2n-bignum/arm/p384/bignum_montsqr_p384_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
 
 // ----------------------------------------------------------------------------
 // Montgomery square, z := (x^2 / 2^384) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_mux_6.S b/third_party/s2n-bignum/arm/p384/bignum_mux_6.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
 
 // ----------------------------------------------------------------------------
 // 384-bit multiplex/select z := x (if p nonzero) or z := y (if p zero)

diff --git a/third_party/s2n-bignum/arm/p384/bignum_neg_p384.S b/third_party/s2n-bignum/arm/p384/bignum_neg_p384.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
 
 // ----------------------------------------------------------------------------
 // Negate modulo p_384, z := (-x) mod p_384, assuming x reduced

diff --git a/third_party/s2n-bignum/arm/p384/bignum_nonzero_6.S b/third_party/s2n-bignum/arm/p384/bignum_nonzero_6.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
 
 // ----------------------------------------------------------------------------
 // 384-bit nonzeroness test, returning 1 if x is nonzero, 0 if x is zero

diff --git a/third_party/s2n-bignum/arm/p384/bignum_optneg_p384.S b/third_party/s2n-bignum/arm/p384/bignum_optneg_p384.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
 
 // ----------------------------------------------------------------------------
 // Optionally negate modulo p_384, z := (-x) mod p_384 (if p nonzero) or

diff --git a/third_party/s2n-bignum/arm/p384/bignum_sub_p384.S b/third_party/s2n-bignum/arm/p384/bignum_sub_p384.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
 
 // ----------------------------------------------------------------------------
 // Subtract modulo p_384, z := (x - y) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_tomont_p384.S b/third_party/s2n-bignum/arm/p384/bignum_tomont_p384.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
 
 // ----------------------------------------------------------------------------
 // Convert to Montgomery form z := (2^384 * x) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/bignum_triple_p384.S b/third_party/s2n-bignum/arm/p384/bignum_triple_p384.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
 
 // ----------------------------------------------------------------------------
 // Triple modulo p_384, z := (3 * x) mod p_384

diff --git a/third_party/s2n-bignum/arm/p384/p384_montjadd.S b/third_party/s2n-bignum/arm/p384/p384_montjadd.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
 
 // ----------------------------------------------------------------------------
 // Point addition on NIST curve P-384 in Montgomery-Jacobian coordinates

diff --git a/third_party/s2n-bignum/arm/p384/p384_montjdouble.S b/third_party/s2n-bignum/arm/p384/p384_montjdouble.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
 
 // ----------------------------------------------------------------------------
 // Point doubling on NIST curve P-384 in Montgomery-Jacobian coordinates

diff --git a/third_party/s2n-bignum/arm/p384/p384_montjmixadd.S b/third_party/s2n-bignum/arm/p384/p384_montjmixadd.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
 
 // ----------------------------------------------------------------------------
 // Point mixed addition on NIST curve P-384 in Montgomery-Jacobian coordinates

diff --git a/third_party/s2n-bignum/arm/p521/Makefile b/third_party/s2n-bignum/arm/p521/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # 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
 #############################################################################
 
 # If actually on an ARM8 machine, just use the GNU assembler (as). Otherwise

diff --git a/third_party/s2n-bignum/arm/p521/bignum_add_p521.S b/third_party/s2n-bignum/arm/p521/bignum_add_p521.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
 
 // ----------------------------------------------------------------------------
 // Add modulo p_521, z := (x + y) mod p_521, assuming x and y reduced

diff --git a/third_party/s2n-bignum/arm/p521/bignum_cmul_p521.S b/third_party/s2n-bignum/arm/p521/bignum_cmul_p521.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 by a single word modulo p_521, z := (c * x) mod p_521, assuming