runner: replace ptrTo with value-based new Go has this built-in now. Change-Id: I134a0cfbd6fb7ac3dee241e87913f90e178eaaee Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/100767 Presubmit-BoringSSL-Verified: boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com <boringssl-scoped@luci-project-accounts.iam.gserviceaccount.com> Auto-Submit: David Benjamin <davidben@google.com> Commit-Queue: Rudolf Polzer <rpolzer@google.com> Reviewed-by: Rudolf Polzer <rpolzer@google.com>
diff --git a/go.mod b/go.mod index 2cbe31f..1925d12 100644 --- a/go.mod +++ b/go.mod
@@ -1,6 +1,6 @@ module boringssl.googlesource.com/boringssl.git -go 1.25.8 +go 1.26.5 require ( cloud.google.com/go/storage v1.62.3
diff --git a/ssl/test/runner/common.go b/ssl/test/runner/common.go index ed7416e..53fd5ea 100644 --- a/ssl/test/runner/common.go +++ b/ssl/test/runner/common.go
@@ -2809,6 +2809,3 @@ } return true } - -// https://github.com/golang/go/issues/45624 -func ptrTo[T any](t T) *T { return &t }
diff --git a/ssl/test/runner/extension_tests.go b/ssl/test/runner/extension_tests.go index 19f5326..6c520c8 100644 --- a/ssl/test/runner/extension_tests.go +++ b/ssl/test/runner/extension_tests.go
@@ -138,7 +138,7 @@ flags: []string{"-expect-server-name", "example.com"}, resumeSession: true, expectations: connectionExpectations{ - serverNameAck: ptrTo(true), + serverNameAck: new(true), }, }) testCases = append(testCases, testCase{ @@ -155,7 +155,7 @@ }, resumeSession: true, expectations: connectionExpectations{ - serverNameAck: ptrTo(false), + serverNameAck: new(false), }, })
diff --git a/ssl/test/runner/handshake_messages.go b/ssl/test/runner/handshake_messages.go index fa561c7..34d2c44 100644 --- a/ssl/test/runner/handshake_messages.go +++ b/ssl/test/runner/handshake_messages.go
@@ -1241,7 +1241,7 @@ if !body.ReadUint16(&serverPaddingRequest) || len(body) != 0 { return false } - m.serverPaddingRequest = ptrTo(serverPaddingRequest) + m.serverPaddingRequest = new(serverPaddingRequest) case extensionClientCertificateType: var certTypes cryptobyte.String if !body.ReadUint8LengthPrefixed(&certTypes) || len(body) != 0 { @@ -1997,15 +1997,15 @@ if !body.ReadUint8(&certType) || len(body) != 0 { return false } - m.clientCertificateType = ptrTo(CertificateType(certType)) + m.clientCertificateType = new(CertificateType(certType)) case extensionServerCertificateType: var certType uint8 if !body.ReadUint8(&certType) || len(body) != 0 { return false } - m.serverCertificateType = ptrTo(CertificateType(certType)) + m.serverCertificateType = new(CertificateType(certType)) case extensionServerPaddingRequest: - m.serverPadding = ptrTo(uint16(len(body))) + m.serverPadding = new(uint16(len(body))) if !isAllZero(body) { return false }
diff --git a/ssl/test/runner/handshake_server.go b/ssl/test/runner/handshake_server.go index eead92d..87f24f3 100644 --- a/ssl/test/runner/handshake_server.go +++ b/ssl/test/runner/handshake_server.go
@@ -1820,7 +1820,7 @@ if len(sendClientCertType) == 0 { serverExtensions.clientCertificateType = nil } else { - serverExtensions.clientCertificateType = ptrTo(sendClientCertType[0]) + serverExtensions.clientCertificateType = new(sendClientCertType[0]) c.clientCertificateType = serverExtensions.clientCertificateType } } @@ -1831,7 +1831,7 @@ if len(sendServerCertType) == 0 { serverExtensions.serverCertificateType = nil } else { - serverExtensions.serverCertificateType = ptrTo(sendServerCertType[0]) + serverExtensions.serverCertificateType = new(sendServerCertType[0]) c.serverCertificateType = serverExtensions.serverCertificateType } }
diff --git a/ssl/test/runner/pake_tests.go b/ssl/test/runner/pake_tests.go index 794ebf7..aadb0ed 100644 --- a/ssl/test/runner/pake_tests.go +++ b/ssl/test/runner/pake_tests.go
@@ -511,7 +511,7 @@ ExpectNoTLS13PSK: true, // Respond with an unsolicited PSK extension in ServerHello, to // check that the client rejects it. - AlwaysSelectPSKIdentity: ptrTo(uint16(0)), + AlwaysSelectPSKIdentity: new(uint16(0)), }, }, resumeShimCredentials: []*Credential{&spakeCredential},
diff --git a/ssl/test/runner/psk_tests.go b/ssl/test/runner/psk_tests.go index b2bc901..742c5f0a 100644 --- a/ssl/test/runner/psk_tests.go +++ b/ssl/test/runner/psk_tests.go
@@ -196,7 +196,7 @@ Bugs: ProtocolBugs{ // The shim will import two PSKs from the credential, so // only indices 0 and 1 are valid, - AlwaysSelectPSKIdentity: ptrTo(uint16(2)), + AlwaysSelectPSKIdentity: new(uint16(2)), }, }, shimCredentials: []*Credential{&pskSHA256Credential}, @@ -215,7 +215,7 @@ // The shim will import two PSKs from the credential, but // then prune them in the second ClientHello, so only index // 0 is valid. - AlwaysSelectPSKIdentity: ptrTo(uint16(1)), + AlwaysSelectPSKIdentity: new(uint16(1)), }, }, shimCredentials: []*Credential{&pskSHA256Credential},
diff --git a/ssl/test/runner/resumption_tests.go b/ssl/test/runner/resumption_tests.go index efae49d..9222209 100644 --- a/ssl/test/runner/resumption_tests.go +++ b/ssl/test/runner/resumption_tests.go
@@ -1068,7 +1068,7 @@ MinVersion: ver.version, MaxVersion: ver.version, Bugs: ProtocolBugs{ - ExpectResumptionAcrossNames: ptrTo(false), + ExpectResumptionAcrossNames: new(false), }, }, }) @@ -1079,7 +1079,7 @@ MinVersion: ver.version, MaxVersion: ver.version, Bugs: ProtocolBugs{ - ExpectResumptionAcrossNames: ptrTo(true), + ExpectResumptionAcrossNames: new(true), }, }, flags: []string{"-resumption-across-names-enabled"},
diff --git a/ssl/test/runner/runner.go b/ssl/test/runner/runner.go index 384b4cc..9684cd1 100644 --- a/ssl/test/runner/runner.go +++ b/ssl/test/runner/runner.go
@@ -1627,12 +1627,12 @@ }() // Make a copy of the testCase before modifying it in-place. - test = ptrTo(*test) + test = new(*test) if test.resumeConfig != nil { - test.resumeConfig = ptrTo(*test.resumeConfig) + test.resumeConfig = new(*test.resumeConfig) } if test.resumeExpectations != nil { - test.resumeExpectations = ptrTo(*test.resumeExpectations) + test.resumeExpectations = new(*test.resumeExpectations) } var flags []string
diff --git a/ssl/test/runner/server_padding_tests.go b/ssl/test/runner/server_padding_tests.go index a5b89f3..f4faba4 100644 --- a/ssl/test/runner/server_padding_tests.go +++ b/ssl/test/runner/server_padding_tests.go
@@ -22,7 +22,7 @@ config: Config{ MinVersion: VersionTLS13, Bugs: ProtocolBugs{ - SendServerPaddingLength: ptrTo(uint16(10)), + SendServerPaddingLength: new(uint16(10)), }, }, flags: []string{ @@ -37,7 +37,7 @@ config: Config{ MinVersion: VersionTLS13, Bugs: ProtocolBugs{ - SendServerPaddingLength: ptrTo(uint16(0)), + SendServerPaddingLength: new(uint16(0)), }, }, flags: []string{ @@ -52,7 +52,7 @@ config: Config{ MinVersion: VersionTLS13, Bugs: ProtocolBugs{ - SendServerPaddingLength: ptrTo(uint16(16384)), + SendServerPaddingLength: new(uint16(16384)), }, }, flags: []string{ @@ -68,7 +68,7 @@ config: Config{ MinVersion: VersionTLS13, Bugs: ProtocolBugs{ - SendServerPaddingLength: ptrTo(uint16(5)), + SendServerPaddingLength: new(uint16(5)), }, }, flags: []string{ @@ -86,7 +86,7 @@ config: Config{ MinVersion: VersionTLS13, Bugs: ProtocolBugs{ - SendServerPaddingLength: ptrTo(uint16(50)), + SendServerPaddingLength: new(uint16(50)), }, }, flags: []string{ @@ -127,7 +127,7 @@ config: Config{ MaxVersion: VersionTLS12, Bugs: ProtocolBugs{ - SendServerPaddingLength: ptrTo(uint16(10)), + SendServerPaddingLength: new(uint16(10)), }, }, flags: []string{ @@ -152,7 +152,7 @@ testType: serverTest, config: Config{ MinVersion: VersionTLS13, - RequestServerPadding: ptrTo(uint16(10)), + RequestServerPadding: new(uint16(10)), }, }) // Runner requests padding, shim sends padding. @@ -161,7 +161,7 @@ testType: serverTest, config: Config{ MinVersion: VersionTLS13, - RequestServerPadding: ptrTo(uint16(10)), + RequestServerPadding: new(uint16(10)), Bugs: ProtocolBugs{ ExpectedServerPadding: true, }, @@ -175,7 +175,7 @@ testType: serverTest, config: Config{ MinVersion: VersionTLS13, - RequestServerPadding: ptrTo(uint16(0)), + RequestServerPadding: new(uint16(0)), Bugs: ProtocolBugs{ ExpectedServerPadding: true, }, @@ -189,7 +189,7 @@ testType: serverTest, config: Config{ MinVersion: VersionTLS13, - RequestServerPadding: ptrTo(uint16(16384)), + RequestServerPadding: new(uint16(16384)), Bugs: ProtocolBugs{ ExpectedServerPadding: true, }, @@ -205,7 +205,7 @@ testType: serverTest, config: Config{ MinVersion: VersionTLS13, - RequestServerPadding: ptrTo(uint16(16385)), + RequestServerPadding: new(uint16(16385)), }, flags: []string{ "-server-supports-padding", @@ -218,7 +218,7 @@ testType: serverTest, config: Config{ MaxVersion: VersionTLS12, - RequestServerPadding: ptrTo(uint16(1024)), + RequestServerPadding: new(uint16(1024)), }, flags: []string{ "-server-supports-padding", @@ -233,7 +233,7 @@ resumeSession: true, config: Config{ MinVersion: VersionTLS13, - RequestServerPadding: ptrTo(uint16(10)), + RequestServerPadding: new(uint16(10)), Bugs: ProtocolBugs{ ExpectedServerPadding: true, },
diff --git a/ssl/test/runner/tls13_tests.go b/ssl/test/runner/tls13_tests.go index 809fbf3..a7e08bc 100644 --- a/ssl/test/runner/tls13_tests.go +++ b/ssl/test/runner/tls13_tests.go
@@ -1218,7 +1218,7 @@ config: Config{ MaxVersion: VersionTLS13, Bugs: ProtocolBugs{ - AlwaysSelectPSKIdentity: ptrTo(uint16(0)), + AlwaysSelectPSKIdentity: new(uint16(0)), }, }, shouldFail: true, @@ -1233,7 +1233,7 @@ resumeConfig: &Config{ MaxVersion: VersionTLS13, Bugs: ProtocolBugs{ - AlwaysSelectPSKIdentity: ptrTo(uint16(1)), + AlwaysSelectPSKIdentity: new(uint16(1)), }, }, resumeSession: true,
diff --git a/ssl/test/runner/trust_anchor_tests.go b/ssl/test/runner/trust_anchor_tests.go index cf0043a..5d19dc3 100644 --- a/ssl/test/runner/trust_anchor_tests.go +++ b/ssl/test/runner/trust_anchor_tests.go
@@ -165,7 +165,7 @@ RequestTrustAnchors: [][]byte{id2}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{id1, id2}, - ExpectPeerMatchTrustAnchor: ptrTo(true), + ExpectPeerMatchTrustAnchor: new(true), }, }, shimCredentials: []*Credential{ @@ -196,7 +196,7 @@ RequestTrustAnchors: [][]byte{id1}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{id2, id3}, - ExpectPeerMatchTrustAnchor: ptrTo(false), + ExpectPeerMatchTrustAnchor: new(false), }, }, shimCredentials: []*Credential{ @@ -222,7 +222,7 @@ VerifySignatureAlgorithms: []signatureAlgorithm{signatureRSAPSSWithSHA256, signatureECDSAWithP256AndSHA256}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{id2}, - ExpectPeerMatchTrustAnchor: ptrTo(false), + ExpectPeerMatchTrustAnchor: new(false), }, }, shimCredentials: []*Credential{ @@ -246,7 +246,7 @@ VerifySignatureAlgorithms: []signatureAlgorithm{signatureRSAPSSWithSHA256, signatureECDSAWithP256AndSHA256}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{}, - ExpectPeerMatchTrustAnchor: ptrTo(false), + ExpectPeerMatchTrustAnchor: new(false), }, }, shimCredentials: []*Credential{ @@ -309,7 +309,7 @@ RequestTrustAnchors: [][]byte{}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{id1, id2}, - ExpectPeerMatchTrustAnchor: ptrTo(false), + ExpectPeerMatchTrustAnchor: new(false), }, }, shimCredentials: []*Credential{ @@ -374,7 +374,7 @@ RequestTrustAnchors: [][]byte{group}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{id1, id2}, - ExpectPeerMatchTrustAnchor: ptrTo(true), + ExpectPeerMatchTrustAnchor: new(true), }, }, shimCredentials: []*Credential{ @@ -407,7 +407,7 @@ RequestTrustAnchors: [][]byte{group}, Bugs: ProtocolBugs{ ExpectPeerAvailableTrustAnchors: [][]byte{id1, id2}, - ExpectPeerMatchTrustAnchor: ptrTo(true), + ExpectPeerMatchTrustAnchor: new(true), }, }, shimCredentials: []*Credential{
diff --git a/util/bot/DEPS b/util/bot/DEPS index 216739c..343c081 100644 --- a/util/bot/DEPS +++ b/util/bot/DEPS
@@ -38,7 +38,7 @@ # infra/3pp/tools/cmake/linux-amd64 'cmake_version': 'version:3@3.31.11.chromium.8', # infra/3pp/tools/go/linux-amd64 - 'go_version': 'version:3@1.26.1', + 'go_version': 'version:3@1.26.5', # infra/3pp/tools/perl/windows-amd64 'perl_version': 'version:3@5.42.0.1', # infra/3pp/tools/qemu_static/linux-amd64