Skip to content

Commit

Permalink
Merge pull request #1139 from aqjune-aws/aws-lc-s2n-bignum-update-202…
Browse files Browse the repository at this point in the history
…3-08-04

 Pull in the latest changes from s2n-bignum (2023-08-04)
The commands used:
(PATHS_TO_KEEP includes 5 new files)

TODAY=$(date +%Y-%m-%d)

git fetch upstream main  # Fetch the tip of main of AWS-LC 
git checkout -b aws-lc-s2n-bignum-update-${TODAY} upstream/main

git fetch s2n-bignum     # Fetch the tip of main of s2n-bignum
git checkout -b s2n-bignum-${TODAY} s2n-bignum/main

PATHS_TO_KEEP="./arm/p384 ./x86_att/p384 ./arm/p521 ./x86_att/p521 ./x86_att/curve25519/curve25519_x25519.S ./x86_att/curve25519/curve25519_x25519base.S ./x86_att/curve25519/curve25519_x25519_alt.S ./x86_att/curve25519/curve25519_x25519base_alt.S  ./arm/curve25519/curve25519_x25519.S ./arm/curve25519/curve25519_x25519base.S ./arm/curve25519/curve25519_x25519_alt.S ./arm/curve25519/curve25519_x25519base_alt.S ./arm/curve25519/curve25519_x25519_byte.S ./arm/curve25519/curve25519_x25519base_byte.S ./arm/curve25519/curve25519_x25519_byte_alt.S ./arm/curve25519/curve25519_x25519base_byte_alt.S ./arm/fastmul/bignum_emontredc_8n.S ./arm/fastmul/bignum_emontredc_8n_neon.S ./arm/fastmul/bignum_kmul_16_32.S ./arm/fastmul/bignum_kmul_16_32_neon.S ./arm/fastmul/bignum_kmul_32_64.S ./arm/fastmul/bignum_kmul_32_64_neon.S ./arm/fastmul/bignum_ksqr_16_32.S ./arm/fastmul/bignum_ksqr_16_32_neon.S ./arm/fastmul/bignum_ksqr_32_64.S ./arm/fastmul/bignum_ksqr_32_64_neon.S ./arm/generic/bignum_ge.S ./arm/generic/bignum_mul.S ./arm/generic/bignum_optsub.S ./arm/generic/bignum_sqr.S ./include/_internal_s2n_bignum.h"

git filter-branch -f --index-filter "git rm --ignore-unmatch --cached -qr -- . && git reset -q \$GIT_COMMIT -- $PATHS_TO_KEEP" --msg-filter 'cat; echo; echo "s2n-bignum original commit: awslabs/s2n-bignum@$GIT_COMMIT"' --prune-empty -- HEAD

git checkout aws-lc-s2n-bignum-update-${TODAY}
git merge -s subtree -Xsubtree="third_party/s2n-bignum" s2n-bignum-${TODAY} --allow-unrelated-histories
  • Loading branch information
nebeid authored Aug 10, 2023
2 parents 754a124 + 52fba49 commit f1d3a58
Show file tree
Hide file tree
Showing 5 changed files with 5,048 additions and 0 deletions.
Loading

0 comments on commit f1d3a58

Please sign in to comment.