From 6ca18fc9b3dd0db99c49a049240fc058cf4a9ad5 Mon Sep 17 00:00:00 2001
From: manastasova <manastasova2017@fau.edu>
Date: Wed, 27 Aug 2025 23:10:45 +0000
Subject: [PATCH 1/2] Add support for checking out specific commits in
 s2n-bignum import.sh

Example usage:
GITHUB_REPOSITORY=awslabs/s2n-bignum GITHUB_TARGET=main COMMIT_HASH=717b57a ./import.sh
---
 third_party/s2n-bignum/import.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/third_party/s2n-bignum/import.sh b/third_party/s2n-bignum/import.sh
index 6fbd129162..d0fcc4ed98 100755
--- a/third_party/s2n-bignum/import.sh
+++ b/third_party/s2n-bignum/import.sh
@@ -23,12 +23,13 @@ set -euo pipefail
 # either set GITHUB_TARGET or GITHUB_REPOSITORY as below:
 #
 # ```
-# GITHUB_REPOSITORY=<repo owner>/<repo name> GITHUB_TARGET=<branch or tag> ./import.sh
+# GITHUB_REPOSITORY=<repo owner>/<repo name> GITHUB_TARGET=<branch or tag> COMMIT_HASH=<commit hash> ./import.sh
 # ```
 
 GITHUB_SERVER_URL="https://github.com/"
 GITHUB_REPOSITORY=${GITHUB_REPOSITORY:=awslabs/s2n-bignum.git}
 GITHUB_TARGET=${GITHUB_TARGET:=main}
+COMMIT_HASH=${COMMIT_HASH:=HEAD}
 
 SRC="s2n-bignum-imported"
 TMP="TEMP_CAN_DELETE"
@@ -49,7 +50,7 @@ mkdir ${TMP}
 
 echo "Fetching repository ..."
 git clone ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} ${TMP} --branch ${GITHUB_TARGET} --single-branch > /dev/null
-GITHUB_COMMIT=$(cd ${TMP} >/dev/null; git rev-parse HEAD)
+GITHUB_COMMIT=$(cd ${TMP} > /dev/null; git checkout ${COMMIT_HASH} > /dev/null; git rev-parse HEAD)
 
 echo "Cloned s2n-bignum folder"
 ls -la ${TMP}

From 4f9ee1e86aa42f2778ca19e711e08674296053ce Mon Sep 17 00:00:00 2001
From: manastasova <manastasova2017@fau.edu>
Date: Thu, 2 Oct 2025 20:52:56 +0000
Subject: [PATCH 2/2] Simplify import file

Short commit hashes are no longer supported to avoid fetch complexity
---
 third_party/s2n-bignum/import.sh | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/third_party/s2n-bignum/import.sh b/third_party/s2n-bignum/import.sh
index d0fcc4ed98..c90374d450 100755
--- a/third_party/s2n-bignum/import.sh
+++ b/third_party/s2n-bignum/import.sh
@@ -19,17 +19,16 @@ set -euo pipefail
 # This imports s2n-bignum from https://github.com/awslabs/s2n-bignum
 # and leaves import meta data in META.yml.
 #
-# If you want to import a specific branch/tag or from a specific repository
-# either set GITHUB_TARGET or GITHUB_REPOSITORY as below:
+# If you want to import a specific commit from a specific repository
+# either set COMMIT_HASH or GITHUB_REPOSITORY as below:
 #
 # ```
-# GITHUB_REPOSITORY=<repo owner>/<repo name> GITHUB_TARGET=<branch or tag> COMMIT_HASH=<commit hash> ./import.sh
+# GITHUB_REPOSITORY=<repo owner>/<repo name> COMMIT_HASH=<commit hash> ./import.sh
 # ```
 
 GITHUB_SERVER_URL="https://github.com/"
 GITHUB_REPOSITORY=${GITHUB_REPOSITORY:=awslabs/s2n-bignum.git}
-GITHUB_TARGET=${GITHUB_TARGET:=main}
-COMMIT_HASH=${COMMIT_HASH:=HEAD}
+COMMIT_HASH=${COMMIT_HASH:=main}
 
 SRC="s2n-bignum-imported"
 TMP="TEMP_CAN_DELETE"
@@ -49,8 +48,13 @@ fi
 mkdir ${TMP}
 
 echo "Fetching repository ..."
-git clone ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY} ${TMP} --branch ${GITHUB_TARGET} --single-branch > /dev/null
-GITHUB_COMMIT=$(cd ${TMP} > /dev/null; git checkout ${COMMIT_HASH} > /dev/null; git rev-parse HEAD)
+cd ${TMP}
+git init >/dev/null
+git remote add origin $GITHUB_SERVER_URL/$GITHUB_REPOSITORY >/dev/null
+git fetch origin --depth 1 $COMMIT_HASH >/dev/null
+git checkout FETCH_HEAD >/dev/null
+GITHUB_COMMIT=$(git rev-parse FETCH_HEAD)
+cd ..
 
 echo "Cloned s2n-bignum folder"
 ls -la ${TMP}
@@ -98,12 +102,11 @@ cat <<EOF > META.yml
 name: ${SRC}
 source: ${GITHUB_REPOSITORY}
 commit: ${GITHUB_COMMIT}
-target: ${GITHUB_TARGET}
 imported-at: $(env TZ=UTC date "+%Y-%m-%dT%H:%M:%S%z")
 EOF
 
 # Submodule path might be cached.
 echo ""
 echo "Post actions: Run"
-echo "$ git add ${SRC} META.yml ; git commit -m \"Imported s2n-bignum version: ${GITHUB_TARGET}/${GITHUB_COMMIT}\""
+echo "$ git add ${SRC} META.yml ; git commit -m \"Imported s2n-bignum version: ${GITHUB_COMMIT}\""
 echo "to add new source to git tree"