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 <davidben@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: Bob Beck <bbe@google.com>
Reviewed-by: Bob Beck <bbe@google.com>
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 12a043e..50f5e37 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -549,7 +549,7 @@
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 @@
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 @@
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 4febf34..b308b1e 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 6a04a2c..d7a1ea4 100644
--- a/ssl/test/runner/common.go
+++ b/ssl/test/runner/common.go
@@ -19,7 +19,7 @@
"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 0d259fc..91f0833 100644
--- a/ssl/test/runner/handshake_client.go
+++ b/ssl/test/runner/handshake_client.go
@@ -21,8 +21,8 @@
"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 3470e17..8dc6348 100644
--- a/ssl/test/runner/handshake_server.go
+++ b/ssl/test/runner/handshake_server.go
@@ -20,8 +20,8 @@
"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 03ed46e..b5a0e1a 100644
--- a/ssl/test/runner/key_agreement.go
+++ b/ssl/test/runner/key_agreement.go
@@ -18,7 +18,7 @@
"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 459673b..2a52dfd 100644
--- a/ssl/test/runner/runner.go
+++ b/ssl/test/runner/runner.go
@@ -47,8 +47,8 @@
"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 b46d901..62f1e8e 100644
--- a/util/all_tests.go
+++ b/util/all_tests.go
@@ -30,8 +30,8 @@
"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 1137d2a..3a089ae 100644
--- a/util/fipstools/acvp/acvptool/acvp.go
+++ b/util/fipstools/acvp/acvptool/acvp.go
@@ -39,8 +39,8 @@
"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 045e177..d3c83a3 100644
--- a/util/fipstools/acvp/acvptool/interactive.go
+++ b/util/fipstools/acvp/acvptool/interactive.go
@@ -33,7 +33,7 @@
"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 51e2ce4..53d2a28 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 6f794ae..a1107f1 100644
--- a/util/fipstools/delocate/delocate.go
+++ b/util/fipstools/delocate/delocate.go
@@ -28,8 +28,8 @@
"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 2f579af..36a938d 100644
--- a/util/fipstools/inject_hash/inject_hash.go
+++ b/util/fipstools/inject_hash/inject_hash.go
@@ -30,8 +30,8 @@
"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 b548978..8d62d62 100644
--- a/util/pregenerate/build.go
+++ b/util/pregenerate/build.go
@@ -24,7 +24,7 @@
"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 32df323..bd743df 100644
--- a/util/pregenerate/pregenerate.go
+++ b/util/pregenerate/pregenerate.go
@@ -28,7 +28,7 @@
"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 77a91cc..1aeb52d 100644
--- a/util/read_symbols.go
+++ b/util/read_symbols.go
@@ -30,7 +30,7 @@
"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 087e872..3ef22b8 100644
--- a/util/run_android_tests.go
+++ b/util/run_android_tests.go
@@ -31,8 +31,8 @@
"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 (
