OERV-RUNTIME/boringssl
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add ".git" hint to Go module name

Browse Source 
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 <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
This commit is contained in:
Filippo Valsorda
2025-02-13 10:12:55 -08:00
committed by Boringssl LUCI CQ
parent d820bb6100
commit b8291f83a1
17 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+4 -4
View File
@@ -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 $<TARGET_FILE:bcm_hashunset>
@@ -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
go.mod
+1 -1
View File
@@ -1,4 +1,4 @@
module boringssl.googlesource.com/boringssl
module boringssl.googlesource.com/boringssl.git
go 1.24
ssl/test/runner/common.go
+1 -1
View File
@@ -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 (
ssl/test/runner/handshake_client.go
+2 -2
View File
@@ -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"
)
ssl/test/runner/handshake_server.go
+2 -2
View File
@@ -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"
)
ssl/test/runner/key_agreement.go
+1 -1
View File
@@ -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"
)
ssl/test/runner/runner.go
+2 -2
View File
@@ -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"
)
util/all_tests.go
+2 -2
View File
@@ -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.
util/fipstools/acvp/acvptool/acvp.go
+2 -2
View File
@@ -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 (
util/fipstools/acvp/acvptool/interactive.go
+1 -1
View File
@@ -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"
)
util/fipstools/acvp/acvptool/nointeractive.go
+1 -1
View File
@@ -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
util/fipstools/delocate/delocate.go
+2 -2
View File
@@ -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.
util/fipstools/inject_hash/inject_hash.go
+2 -2
View File
@@ -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 {
util/pregenerate/build.go
+1 -1
View File
@@ -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
util/pregenerate/pregenerate.go
+1 -1
View File
@@ -28,7 +28,7 @@ import (
"strings"
"sync"
"boringssl.googlesource.com/boringssl/util/build"
"boringssl.googlesource.com/boringssl.git/util/build"
)
var (
util/read_symbols.go
+1 -1
View File
@@ -30,7 +30,7 @@ import (
"sort"
"strings"
"boringssl.googlesource.com/boringssl/util/ar"
"boringssl.googlesource.com/boringssl.git/util/ar"
)
const (
util/run_android_tests.go
+2 -2
View File
@@ -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 (