From 5cf9cc32be1c2d4f359c85863165adab5b768bae Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Tue, 1 Aug 2023 11:18:37 +0200 Subject: [PATCH 1/4] Update Go to 1.20.6 Update Go from 1.20.5 to 1.20.6. See: https://go.dev/doc/devel/release#go1.20 Changelog: changed --- scripts/install-golang | 2 +- scripts/lib/custom-docker-build | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/install-golang b/scripts/install-golang index 975fd03..2131bfa 100755 --- a/scripts/install-golang +++ b/scripts/install-golang @@ -31,7 +31,7 @@ function build_ubi() { else # This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved. if [[ $GO_MAJOR_VERSION == "1.20" ]]; then - GO_BRANCH="go1.20.5-2-openssl-fips" + GO_BRANCH="go1.20.6-1-openssl-fips" # This is a workaround until https://github.com/golang-fips/go/pull/107 is released. elif [[ $GO_MAJOR_VERSION == "1.21" ]]; then GO_BRANCH="go1.20.6-1-openssl-fips" diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 5351c38..efe4c85 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -50,9 +50,9 @@ function print_golang_args() { GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1" ;; 1.20) - INSTALL_GOLANG_VERSION=1.20.5 # Update scripts/install-golang for FIPS if this version is bumped - GOLANG_DOWNLOAD_SHA256[amd64]="d7ec48cde0d3d2be2c69203bc3e0a44de8660b9c09a6e85c4732a3f7dc442612" - GOLANG_DOWNLOAD_SHA256[arm64]="aa2fab0a7da20213ff975fa7876a66d47b48351558d98851b87d1cfef4360d09" + INSTALL_GOLANG_VERSION=1.20.6 # Update scripts/install-golang for FIPS if this version is bumped + GOLANG_DOWNLOAD_SHA256[amd64]="b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb" + GOLANG_DOWNLOAD_SHA256[arm64]="4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b" ;; 1.21) INSTALL_GOLANG_VERSION=1.21.0 # Update scripts/install-golang for FIPS if this version is bumped From a722154b4337a7495696a3495b3923bda1ca831f Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Thu, 10 Aug 2023 09:06:02 +0200 Subject: [PATCH 2/4] Update Go to 1.19.12 Update Go from 1.19.9 to 1.19.12. See: https://go.dev/doc/devel/release#go1.19 Changelog: changed --- scripts/lib/custom-docker-build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index efe4c85..2733604 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -45,9 +45,9 @@ function print_golang_args() { GOLANG_DOWNLOAD_SHA256[arm64]="160497c583d4c7cbc1661230e68b758d01f741cf4bece67e48edc4fdd40ed92d" ;; 1.19) - INSTALL_GOLANG_VERSION=1.19.9 - GOLANG_DOWNLOAD_SHA256[amd64]="e858173b489ec1ddbe2374894f52f53e748feed09dde61be5b4b4ba2d73ef34b" - GOLANG_DOWNLOAD_SHA256[arm64]="b947e457be9d7b52a082c68e42b6939f9cc151f1ad5b3d8fd646ca3352f6f2f1" + INSTALL_GOLANG_VERSION=1.19.12 + GOLANG_DOWNLOAD_SHA256[amd64]="48e4fcfb6abfdaa01aaf1429e43bdd49cea5e4687bd5f5b96df1e193fcfd3e7e" + GOLANG_DOWNLOAD_SHA256[arm64]="18da7cf1ae5341e6ee120948221aff96df9145ce70f429276514ca7c67c929b1" ;; 1.20) INSTALL_GOLANG_VERSION=1.20.6 # Update scripts/install-golang for FIPS if this version is bumped From 0231fd714e8ee3d79d5a1853d1a7e8c150f8abea Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Mon, 14 Aug 2023 15:41:08 +0200 Subject: [PATCH 3/4] Update default Go to 1.20.7 Update Go from 1.20.6 to 1.20.7. Does not bump FIPS Go, as 1.20.7 has not yet released for it. See: https://go.dev/doc/devel/release#go1.20 Changelog: changed --- scripts/lib/custom-docker-build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/lib/custom-docker-build b/scripts/lib/custom-docker-build index 2733604..54c0c26 100755 --- a/scripts/lib/custom-docker-build +++ b/scripts/lib/custom-docker-build @@ -50,9 +50,9 @@ function print_golang_args() { GOLANG_DOWNLOAD_SHA256[arm64]="18da7cf1ae5341e6ee120948221aff96df9145ce70f429276514ca7c67c929b1" ;; 1.20) - INSTALL_GOLANG_VERSION=1.20.6 # Update scripts/install-golang for FIPS if this version is bumped - GOLANG_DOWNLOAD_SHA256[amd64]="b945ae2bb5db01a0fb4786afde64e6fbab50b67f6fa0eb6cfa4924f16a7ff1eb" - GOLANG_DOWNLOAD_SHA256[arm64]="4e15ab37556e979181a1a1cc60f6d796932223a0f5351d7c83768b356f84429b" + INSTALL_GOLANG_VERSION=1.20.7 # Update scripts/install-golang for FIPS if this version is bumped + GOLANG_DOWNLOAD_SHA256[amd64]="f0a87f1bcae91c4b69f8dc2bc6d7e6bfcd7524fceec130af525058c0c17b1b44" + GOLANG_DOWNLOAD_SHA256[arm64]="44781ae3b153c3b07651d93b6bc554e835a36e2d72a696281c1e4dad9efffe43" ;; 1.21) INSTALL_GOLANG_VERSION=1.21.0 # Update scripts/install-golang for FIPS if this version is bumped From 8358164a331cbfc81304ede4a1e9c4e5674a41a8 Mon Sep 17 00:00:00 2001 From: Clemens Beck Date: Mon, 21 Aug 2023 19:02:09 +0200 Subject: [PATCH 4/4] Built FIPS Go 1.20 from branch --- scripts/install-golang | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/install-golang b/scripts/install-golang index 2131bfa..a00dbd9 100755 --- a/scripts/install-golang +++ b/scripts/install-golang @@ -29,12 +29,9 @@ function build_ubi() { cd /usr/local/go/src PATH=$PATH:/tmp/golang/go/bin CGO_ENABLED=1 ./make.bash else - # This is a workaround until https://github.com/golang-fips/go/issues/82 is resolved. - if [[ $GO_MAJOR_VERSION == "1.20" ]]; then - GO_BRANCH="go1.20.6-1-openssl-fips" # This is a workaround until https://github.com/golang-fips/go/pull/107 is released. - elif [[ $GO_MAJOR_VERSION == "1.21" ]]; then - GO_BRANCH="go1.20.6-1-openssl-fips" + if [[ $GO_MAJOR_VERSION == "1.21" ]]; then + GO_BRANCH="go1.20-fips-release" else GO_BRANCH="go${GO_MAJOR_VERSION}-fips-release" fi