From 263272421fb3b2e48c9c210a892369ce179d6635 Mon Sep 17 00:00:00 2001 From: Yegor Ievlev Date: Sat, 21 Apr 2018 05:22:42 +0300 Subject: [PATCH 1/3] Use SHA256 in make.sh --- make.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index 7b4a6ae5e5b2..b52fc9e34ac7 100755 --- a/make.sh +++ b/make.sh @@ -118,7 +118,7 @@ trap 'rm -f "$pub" "$sig" "$zip"' EXIT # zip up the crx dir cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "CWS crx package has sha1sum: `sha1sum "$cwd/$zip"`" +echo >&2 "CWS crx package has sha256sum: `sha256sum "$cwd/$zip"`" # signature openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig" @@ -157,7 +157,7 @@ zip="$name.zip" cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "AMO xpi package has sha1sum: `sha1sum "$cwd/$zip"`" +echo >&2 "AMO xpi package has sha256sum: `sha256sum "$cwd/$zip"`" cp $zip $xpi_amo @@ -170,7 +170,7 @@ zip="$name.zip" cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "EFF xpi package has sha1sum: `sha1sum "$cwd/$zip"`" +echo >&2 "EFF xpi package has sha256sum: `sha256sum "$cwd/$zip"`" cp $zip $xpi_eff From 7943d587f39b299dbd1e78fa1fd0bc94bea3a3cf Mon Sep 17 00:00:00 2001 From: Yegor Ievlev Date: Wed, 16 May 2018 20:59:16 +0300 Subject: [PATCH 2/3] Use OpenSSL CLI --- make.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index b52fc9e34ac7..9fb5e25b30c2 100755 --- a/make.sh +++ b/make.sh @@ -118,7 +118,7 @@ trap 'rm -f "$pub" "$sig" "$zip"' EXIT # zip up the crx dir cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "CWS crx package has sha256sum: `sha256sum "$cwd/$zip"`" +echo >&2 "CWS crx package has sha256sum: `openssl dgst -sha256 "$cwd/$zip"`" # signature openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig" @@ -157,7 +157,7 @@ zip="$name.zip" cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "AMO xpi package has sha256sum: `sha256sum "$cwd/$zip"`" +echo >&2 "AMO xpi package has sha256sum: `openssl dgst -sha256 "$cwd/$zip"`" cp $zip $xpi_amo @@ -170,7 +170,7 @@ zip="$name.zip" cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "EFF xpi package has sha256sum: `sha256sum "$cwd/$zip"`" +echo >&2 "EFF xpi package has sha256sum: `openssl dgst -sha256 "$cwd/$zip"`" cp $zip $xpi_eff From 3ff3b459b685f5ea696e522a5d15cd6bc9100043 Mon Sep 17 00:00:00 2001 From: Yegor Ievlev Date: Fri, 18 May 2018 20:24:54 +0300 Subject: [PATCH 3/3] Better output formatting --- make.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/make.sh b/make.sh index 9fb5e25b30c2..a3a45706cf38 100755 --- a/make.sh +++ b/make.sh @@ -118,7 +118,7 @@ trap 'rm -f "$pub" "$sig" "$zip"' EXIT # zip up the crx dir cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "CWS crx package has sha256sum: `openssl dgst -sha256 "$cwd/$zip"`" +echo >&2 "CWS crx package has sha256sum: `openssl dgst -sha256 -binary "$cwd/$zip" | xxd -p`" # signature openssl sha1 -sha1 -binary -sign "$key" < "$zip" > "$sig" @@ -157,7 +157,7 @@ zip="$name.zip" cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "AMO xpi package has sha256sum: `openssl dgst -sha256 "$cwd/$zip"`" +echo >&2 "AMO xpi package has sha256sum: `openssl dgst -sha256 -binary "$cwd/$zip" | xxd -p`" cp $zip $xpi_amo @@ -170,7 +170,7 @@ zip="$name.zip" cwd=$(pwd -P) (cd "$dir" && ../../utils/create_zip.py -n "$cwd/$zip" -x "../../.build_exclusions" .) -echo >&2 "EFF xpi package has sha256sum: `openssl dgst -sha256 "$cwd/$zip"`" +echo >&2 "EFF xpi package has sha256sum: `openssl dgst -sha256 -binary "$cwd/$zip" | xxd -p`" cp $zip $xpi_eff