Skip to content

Commit 85c598c

Browse files
committed
Fix the sha sum format to be compatible with coreutils
Fixes openssl/openssl#18313 Reviewed-by: Richard Levitte <[email protected]> Reviewed-by: Neil Horman <[email protected]> (Merged from #214)
1 parent 601b00f commit 85c598c

4 files changed

+12
-12
lines changed

Diff for: release-tools/release-aux/openssl-announce-pre-release.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
The checksums were calculated using the following commands:
3333

34-
openssl sha1 $tarfile
35-
openssl sha256 $tarfile
34+
openssl sha1 -r $tarfile
35+
openssl sha256 -r $tarfile
3636

3737
Please download and check this $label release as soon as possible.
3838
To report a bug, open an issue on GitHub:

Diff for: release-tools/release-aux/openssl-announce-release-premium.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
The checksums were calculated using the following commands:
3232

33-
openssl sha1 $tarfile
34-
openssl sha256 $tarfile
33+
openssl sha1 -r $tarfile
34+
openssl sha256 -r $tarfile
3535

3636
Yours,
3737

Diff for: release-tools/release-aux/openssl-announce-release-public.tmpl

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929

3030
The checksums were calculated using the following commands:
3131

32-
openssl sha1 $tarfile
33-
openssl sha256 $tarfile
32+
openssl sha1 -r $tarfile
33+
openssl sha256 -r $tarfile
3434

3535
Yours,
3636

Diff for: release-tools/stage-release.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -655,13 +655,13 @@ if ! [ -f "../$tgzfile" ]; then
655655
fi
656656

657657
$VERBOSE "== Generating checksums: $tgzfile.sha1 $tgzfile.sha256"
658-
openssl sha1 < "../$tgzfile" | \
659-
(IFS='='; while read X H; do echo $H; done) > "../$tgzfile.sha1"
660-
openssl sha256 < "../$tgzfile" | \
661-
(IFS='='; while read X H; do echo $H; done) > "../$tgzfile.sha256"
658+
sha1hash=$(openssl sha1 < "../$tgzfile" | \
659+
(IFS='= '; while read X H; do echo $H; done))
660+
echo $sha1hash "$tgzfile" > "../$tgzfile.sha1"
661+
sha256hash=$(openssl sha256 < "../$tgzfile" | \
662+
(IFS='= '; while read X H; do echo $H; done))
663+
echo $sha256hash "$tgzfile" > "../$tgzfile.sha256"
662664
length=$(wc -c < "../$tgzfile")
663-
sha1hash=$(cat "../$tgzfile.sha1")
664-
sha256hash=$(cat "../$tgzfile.sha256")
665665
666666
$VERBOSE "== Generating announcement text: $announce"
667667
# Hack the announcement template

0 commit comments

Comments
 (0)