Skip to content

Commit 63fb656

Browse files
committed
Use openssl sha to calculate shasums [EFForg#1504]
sha256sum is not available on BSD systems. There's a shasum that may be available everywhere, but openssl should be even more ubiquitous. openssl's output looks a little different from the sha*sums' commands, but I don't think that matters much. For posterity, sha256sum looks like a54680cfaa331e1d1d6e2f61b2fa5aafe89302046ebc92d98f0070a63459e821 pkg/https-everywhere-5.0.4~578663d-amo.xpi while openssl sha looks like SHA256(pkg/https-everywhere-5.0.4~578663d-amo.xpi)= a54680cfaa331e1d1d6e2f61b2fa5aafe89302046ebc92d98f0070a63459e821
1 parent bafd40a commit 63fb656

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

locate-gnu-utils.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,6 @@ if [ -x "$GMKTEMP" ]; then
1818
fi
1919
unset GMKTEMP
2020

21-
SHA256SUM=$(which sha256sum 2>/dev/null || true)
22-
GSHA256SUM=$(which gsha256sum 2>/dev/null || true)
23-
if [ -x "$GSHA256SUM" ]; then
24-
SHA256SUM="$GSHA256SUM"
25-
fi
26-
unset GSHA256SUM
27-
2821
check_for_gnu_version() {
2922
gnu_available=$("$1" --version 2>&1 | grep GNU)
3023
if [ ! "$gnu_available" ]; then
@@ -38,4 +31,3 @@ check_for_gnu_version() {
3831

3932
check_for_gnu_version "$MKTEMP" "mktemp"
4033
check_for_gnu_version "$READLINK" "readlink"
41-
check_for_gnu_version "$SHA256SUM" "sha256sum"

test.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,5 @@ bash test-ruleset-coverage.sh
6767
echo "To reproduce this build (https://wiki.debian.org/ReproducibleBuilds)," \
6868
"please use this version of sqlite3:"
6969
sqlite3 -version
70-
shasum=$("$SHA256SUM" "$XPI_NAME")
71-
echo -e "Git commit `git rev-parse HEAD`\nsha256sum $shasum"
70+
shasum=$(openssl sha -sha256 "$XPI_NAME")
71+
echo -e "Git commit `git rev-parse HEAD`\n$shasum"

0 commit comments

Comments
 (0)