From b8291f83a1461693a5f58c772bdcd754cd78e045 Mon Sep 17 00:00:00 2001 From: Filippo Valsorda Date: Mon, 10 Feb 2025 15:49:28 +0100 Subject: [PATCH] Add ".git" hint to Go module name Currently, trying to "go install" something from BoringSSL's Go module fails because the proxy-reachable name is boringssl.googlesource.com/boringssl.git, but the go.mod name is boringssl.googlesource.com/boringssl. $ go install -v boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool@master go: downloading boringssl.googlesource.com/boringssl.git v0.0.0-20250122182937-e056f59c7dfd go: boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool@master: version constraints conflict: boringssl.googlesource.com/boringssl.git@v0.0.0-20250122182937-e056f59c7dfd: parsing go.mod: module declares its path as: boringssl.googlesource.com/boringssl but was required as: boringssl.googlesource.com/boringssl.git Using boringssl.googlesource.com/boringssl fails because without the .git hint, the go tool will fetch https://boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool?go-get=1 which is not implemented by gitiles. Adding .git to the module name makes the first command work. Change-Id: I6a6a4656a34fac424114a5d65d23df677ca7de47 Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/76107 Commit-Queue: David Benjamin Reviewed-by: David Benjamin Commit-Queue: Bob Beck Reviewed-by: Bob Beck --- CMakeLists.txt | 8 ++++---- go.mod | 2 +- ssl/test/runner/common.go | 2 +- ssl/test/runner/handshake_client.go | 4 ++-- ssl/test/runner/handshake_server.go | 4 ++-- ssl/test/runner/key_agreement.go | 2 +- ssl/test/runner/runner.go | 4 ++-- util/all_tests.go | 4 ++-- util/fipstools/acvp/acvptool/acvp.go | 4 ++-- util/fipstools/acvp/acvptool/interactive.go | 2 +- util/fipstools/acvp/acvptool/nointeractive.go | 2 +- util/fipstools/delocate/delocate.go | 4 ++-- util/fipstools/inject_hash/inject_hash.go | 4 ++-- util/pregenerate/build.go | 2 +- util/pregenerate/pregenerate.go | 2 +- util/read_symbols.go | 2 +- util/run_android_tests.go | 4 ++-- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 12a043e72..50f5e3799 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -549,7 +549,7 @@ if(FIPS_DELOCATE) set(TARGET_FLAG "--target=${CMAKE_ASM_COMPILER_TARGET}") endif() - go_executable(delocate boringssl.googlesource.com/boringssl/util/fipstools/delocate) + go_executable(delocate boringssl.googlesource.com/boringssl.git/util/fipstools/delocate) add_custom_command( OUTPUT bcm-delocated.S COMMAND ${CMAKE_CURRENT_BINARY_DIR}/delocate @@ -571,7 +571,7 @@ if(FIPS_DELOCATE) set_target_properties(bcm_hashunset PROPERTIES LINKER_LANGUAGE C) go_executable(inject_hash - boringssl.googlesource.com/boringssl/util/fipstools/inject_hash) + boringssl.googlesource.com/boringssl.git/util/fipstools/inject_hash) add_custom_command( OUTPUT bcm.o COMMAND ./inject_hash -o bcm.o -in-archive $ @@ -753,9 +753,9 @@ if(FIPS) add_custom_target( acvp_tests COMMAND ${GO_EXECUTABLE} build -o ${CMAKE_CURRENT_BINARY_DIR}/acvptool - boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool + boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool COMMAND ${GO_EXECUTABLE} build -o ${CMAKE_CURRENT_BINARY_DIR}/testmodulewrapper - boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/testmodulewrapper + boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool/testmodulewrapper COMMAND cd util/fipstools/acvp/acvptool/test && ${GO_EXECUTABLE} run check_expected.go -tool ${CMAKE_CURRENT_BINARY_DIR}/acvptool diff --git a/go.mod b/go.mod index 4febf34d3..b308b1ed5 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module boringssl.googlesource.com/boringssl +module boringssl.googlesource.com/boringssl.git go 1.24 diff --git a/ssl/test/runner/common.go b/ssl/test/runner/common.go index 6a04a2c44..d7a1ea40a 100644 --- a/ssl/test/runner/common.go +++ b/ssl/test/runner/common.go @@ -19,7 +19,7 @@ import ( "sync" "time" - "boringssl.googlesource.com/boringssl/ssl/test/runner/hpke" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/hpke" ) const ( diff --git a/ssl/test/runner/handshake_client.go b/ssl/test/runner/handshake_client.go index 0d259fc28..91f083356 100644 --- a/ssl/test/runner/handshake_client.go +++ b/ssl/test/runner/handshake_client.go @@ -21,8 +21,8 @@ import ( "slices" "time" - "boringssl.googlesource.com/boringssl/ssl/test/runner/hpke" - "boringssl.googlesource.com/boringssl/ssl/test/runner/spake2plus" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/hpke" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/spake2plus" "golang.org/x/crypto/cryptobyte" ) diff --git a/ssl/test/runner/handshake_server.go b/ssl/test/runner/handshake_server.go index 3470e1700..8dc6348b6 100644 --- a/ssl/test/runner/handshake_server.go +++ b/ssl/test/runner/handshake_server.go @@ -20,8 +20,8 @@ import ( "slices" "time" - "boringssl.googlesource.com/boringssl/ssl/test/runner/hpke" - "boringssl.googlesource.com/boringssl/ssl/test/runner/spake2plus" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/hpke" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/spake2plus" "golang.org/x/crypto/cryptobyte" ) diff --git a/ssl/test/runner/key_agreement.go b/ssl/test/runner/key_agreement.go index 03ed46edc..b5a0e1aca 100644 --- a/ssl/test/runner/key_agreement.go +++ b/ssl/test/runner/key_agreement.go @@ -18,7 +18,7 @@ import ( "math/big" "slices" - "boringssl.googlesource.com/boringssl/ssl/test/runner/kyber" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/kyber" "filippo.io/mlkem768" "golang.org/x/crypto/curve25519" ) diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index 459673bdb..2a52dfd5e 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go @@ -47,8 +47,8 @@ import ( "syscall" "time" - "boringssl.googlesource.com/boringssl/ssl/test/runner/hpke" - "boringssl.googlesource.com/boringssl/util/testresult" + "boringssl.googlesource.com/boringssl.git/ssl/test/runner/hpke" + "boringssl.googlesource.com/boringssl.git/util/testresult" "golang.org/x/crypto/cryptobyte" ) diff --git a/util/all_tests.go b/util/all_tests.go index b46d90143..62f1e8e85 100644 --- a/util/all_tests.go +++ b/util/all_tests.go @@ -30,8 +30,8 @@ import ( "sync" "syscall" - "boringssl.googlesource.com/boringssl/util/testconfig" - "boringssl.googlesource.com/boringssl/util/testresult" + "boringssl.googlesource.com/boringssl.git/util/testconfig" + "boringssl.googlesource.com/boringssl.git/util/testresult" ) // TODO(davidben): Link tests with the malloc shim and port -malloc-test to this runner. diff --git a/util/fipstools/acvp/acvptool/acvp.go b/util/fipstools/acvp/acvptool/acvp.go index 1137d2ad7..3a089ae43 100644 --- a/util/fipstools/acvp/acvptool/acvp.go +++ b/util/fipstools/acvp/acvptool/acvp.go @@ -39,8 +39,8 @@ import ( "strings" "time" - "boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/acvp" - "boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/subprocess" + "boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool/acvp" + "boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool/subprocess" ) var ( diff --git a/util/fipstools/acvp/acvptool/interactive.go b/util/fipstools/acvp/acvptool/interactive.go index 045e17748..d3c83a37c 100644 --- a/util/fipstools/acvp/acvptool/interactive.go +++ b/util/fipstools/acvp/acvptool/interactive.go @@ -33,7 +33,7 @@ import ( "strings" "syscall" - "boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/acvp" + "boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool/acvp" "golang.org/x/crypto/ssh/terminal" ) diff --git a/util/fipstools/acvp/acvptool/nointeractive.go b/util/fipstools/acvp/acvptool/nointeractive.go index 51e2ce486..53d2a28ff 100644 --- a/util/fipstools/acvp/acvptool/nointeractive.go +++ b/util/fipstools/acvp/acvptool/nointeractive.go @@ -18,7 +18,7 @@ package main import ( - "boringssl.googlesource.com/boringssl/util/fipstools/acvp/acvptool/acvp" + "boringssl.googlesource.com/boringssl.git/util/fipstools/acvp/acvptool/acvp" ) const interactiveModeSupported = false diff --git a/util/fipstools/delocate/delocate.go b/util/fipstools/delocate/delocate.go index 6f794aeb6..a1107f132 100644 --- a/util/fipstools/delocate/delocate.go +++ b/util/fipstools/delocate/delocate.go @@ -28,8 +28,8 @@ import ( "strconv" "strings" - "boringssl.googlesource.com/boringssl/util/ar" - "boringssl.googlesource.com/boringssl/util/fipstools/fipscommon" + "boringssl.googlesource.com/boringssl.git/util/ar" + "boringssl.googlesource.com/boringssl.git/util/fipstools/fipscommon" ) // inputFile represents a textual assembly file. diff --git a/util/fipstools/inject_hash/inject_hash.go b/util/fipstools/inject_hash/inject_hash.go index 2f579afd6..36a938de5 100644 --- a/util/fipstools/inject_hash/inject_hash.go +++ b/util/fipstools/inject_hash/inject_hash.go @@ -30,8 +30,8 @@ import ( "os" "strings" - "boringssl.googlesource.com/boringssl/util/ar" - "boringssl.googlesource.com/boringssl/util/fipstools/fipscommon" + "boringssl.googlesource.com/boringssl.git/util/ar" + "boringssl.googlesource.com/boringssl.git/util/fipstools/fipscommon" ) func do(outPath, oInput string, arInput string) error { diff --git a/util/pregenerate/build.go b/util/pregenerate/build.go index b54897827..8d62d62f5 100644 --- a/util/pregenerate/build.go +++ b/util/pregenerate/build.go @@ -24,7 +24,7 @@ import ( "slices" "strings" - "boringssl.googlesource.com/boringssl/util/build" + "boringssl.googlesource.com/boringssl.git/util/build" ) // An InputTarget is a build target with build inputs that still need to be diff --git a/util/pregenerate/pregenerate.go b/util/pregenerate/pregenerate.go index 32df323f9..bd743dfa9 100644 --- a/util/pregenerate/pregenerate.go +++ b/util/pregenerate/pregenerate.go @@ -28,7 +28,7 @@ import ( "strings" "sync" - "boringssl.googlesource.com/boringssl/util/build" + "boringssl.googlesource.com/boringssl.git/util/build" ) var ( diff --git a/util/read_symbols.go b/util/read_symbols.go index 77a91cc13..1aeb52d23 100644 --- a/util/read_symbols.go +++ b/util/read_symbols.go @@ -30,7 +30,7 @@ import ( "sort" "strings" - "boringssl.googlesource.com/boringssl/util/ar" + "boringssl.googlesource.com/boringssl.git/util/ar" ) const ( diff --git a/util/run_android_tests.go b/util/run_android_tests.go index 087e872aa..3ef22b8d2 100644 --- a/util/run_android_tests.go +++ b/util/run_android_tests.go @@ -31,8 +31,8 @@ import ( "strconv" "strings" - "boringssl.googlesource.com/boringssl/util/build" - "boringssl.googlesource.com/boringssl/util/testconfig" + "boringssl.googlesource.com/boringssl.git/util/build" + "boringssl.googlesource.com/boringssl.git/util/testconfig" ) var (