update master-with-bazel from main branch

master-with-bazel
BoringSSL Robot 2 months ago
commit fe3a51e5e1
  1. 8
      src/CMakeLists.txt
  2. 2
      src/go.mod
  3. 2
      src/ssl/test/runner/common.go
  4. 4
      src/ssl/test/runner/handshake_client.go
  5. 4
      src/ssl/test/runner/handshake_server.go
  6. 2
      src/ssl/test/runner/key_agreement.go
  7. 4
      src/ssl/test/runner/runner.go
  8. 4
      src/util/all_tests.go
  9. 4
      src/util/fipstools/acvp/acvptool/acvp.go
  10. 2
      src/util/fipstools/acvp/acvptool/interactive.go
  11. 2
      src/util/fipstools/acvp/acvptool/nointeractive.go
  12. 4
      src/util/fipstools/delocate/delocate.go
  13. 4
      src/util/fipstools/inject_hash/inject_hash.go
  14. 2
      src/util/pregenerate/build.go
  15. 2
      src/util/pregenerate/pregenerate.go
  16. 2
      src/util/read_symbols.go
  17. 4
      src/util/run_android_tests.go

@ -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

@ -1,4 +1,4 @@
module boringssl.googlesource.com/boringssl
module boringssl.googlesource.com/boringssl.git
go 1.24

@ -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 (

@ -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"
)

@ -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"
)

@ -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"
)

@ -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"
)

@ -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.

@ -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 (

@ -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"
)

@ -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

@ -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.

@ -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 {

@ -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

@ -28,7 +28,7 @@ import (
"strings"
"sync"
"boringssl.googlesource.com/boringssl/util/build"
"boringssl.googlesource.com/boringssl.git/util/build"
)
var (

@ -30,7 +30,7 @@ import (
"sort"
"strings"
"boringssl.googlesource.com/boringssl/util/ar"
"boringssl.googlesource.com/boringssl.git/util/ar"
)
const (

@ -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 (

Loading…
Cancel
Save