diff --git a/main.go b/main.go index f244178..709e838 100644 --- a/main.go +++ b/main.go @@ -21,6 +21,7 @@ package main import ( "context" + "crypto/tls" "net/url" "os" "os/signal" @@ -121,7 +122,12 @@ func main() { } logrus.Infof("SVID: %q", svid.ID) - credsTLS := credentials.NewTLS(tlsconfig.MTLSServerConfig(source, source, tlsconfig.AuthorizeAny())) + tlsClientConfig := tlsconfig.MTLSClientConfig(source, source, tlsconfig.AuthorizeAny()) + tlsClientConfig.MinVersion = tls.VersionTLS12 + tlsServerConfig := tlsconfig.MTLSServerConfig(source, source, tlsconfig.AuthorizeAny()) + tlsServerConfig.MinVersion = tls.VersionTLS12 + + credsTLS := credentials.NewTLS(tlsServerConfig) // Create GRPC Server and register services serverOptions := append(tracing.WithTracing(), grpc.Creds(credsTLS)) server := grpc.NewServer(serverOptions...) @@ -133,7 +139,7 @@ func main() { grpc.WithTransportCredentials( grpcfd.TransportCredentials( credentials.NewTLS( - tlsconfig.MTLSClientConfig(source, source, tlsconfig.AuthorizeAny()), + tlsClientConfig, ), ), ), diff --git a/pkg/imports/gen.go b/pkg/imports/gen.go index 34b8002..1373eeb 100644 --- a/pkg/imports/gen.go +++ b/pkg/imports/gen.go @@ -1,4 +1,4 @@ -// Copyright (c) 2020-2021 Cisco and/or its affiliates. +// Copyright (c) 2020-2022 Cisco and/or its affiliates. // // SPDX-License-Identifier: Apache-2.0 // @@ -18,5 +18,5 @@ package imports //go:generate bash -c "rm -rf imports*.go" -//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/imports-gen@v1.1.0" +//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go install github.com/edwarnicke/imports-gen@v1.1.0" //go:generate bash -c "GOOS=linux ${GOPATH}/bin/imports-gen" diff --git a/pkg/imports/imports_linux.go b/pkg/imports/imports_linux.go index 1400dba..5350f5f 100644 --- a/pkg/imports/imports_linux.go +++ b/pkg/imports/imports_linux.go @@ -3,6 +3,7 @@ package imports import ( _ "context" + _ "crypto/tls" _ "fmt" _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/exechelper"