Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PEM-4556: Fix for TLS v1.3 #882

Merged
merged 1 commit into from
Feb 23, 2024
+4 −4
Merged

PEM-4556: Fix for TLS v1.3 #882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ RUN --mount=type=cache,target=/root/.cache/go-build \
--mount=type=cache,target=/root/.local/share/golang \
if [ ${CRYPTO_LIB} ]; \
then \
GOARCH=${ARCH} go-build-fips.sh -a -o manager main.go ;\
GOARCH=${ARCH} go-build-fips.sh -a -o manager sigs.k8s.io/cluster-api-provider-aws ;\
else \
GOARCH=${ARCH} go-build-static.sh -a -o manager main.go ;\
GOARCH=${ARCH} go-build-static.sh -a -o manager sigs.k8s.io/cluster-api-provider-aws ;\
fi
RUN if [ "${CRYPTO_LIB}" ]; then assert-static.sh manager; fi
RUN if [ "${CRYPTO_LIB}" ]; then assert-fips.sh manager; fi
Expand Down
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

BUILDER_GOLANG_VERSION ?= 1.21
BUILDER_GOLANG_VERSION ?= 1.21.6
ROOT_DIR_RELATIVE := .

include $(ROOT_DIR_RELATIVE)/common.mk
Expand Down
2 changes: 1 addition & 1 deletion util/flags/tls_boring.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ func InsecureSkipVerify(insecureSkipVerify bool) bool {
}

func GetTlsMaxVersion() uint16 {
return tls.VersionTLS12
return tls.VersionTLS13
}
Loading