Skip to content

Commit ed4b477

Browse files
Merge pull request #2111 from microsoft/dev/auto-sync/microsoft/release-branch.go1.24
Update submodule to latest `release-branch.go1.24` in `microsoft/release-branch.go1.24`
2 parents 9c75d32 + 271d1cb commit ed4b477

5 files changed

Lines changed: 15 additions & 23 deletions

File tree

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
go1.24.12
1+
go1.24.13

eng/pipeline/stages/go-builder-matrix-stages.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,13 +87,10 @@ stages:
8787
- { os: linux, arch: amd64, config: devscript }
8888
- { os: linux, arch: amd64, config: test }
8989
- { os: linux, arch: amd64, config: test, distro: ubuntu }
90-
- { os: linux, arch: amd64, config: test, distro: mariner2 }
9190
- { os: linux, arch: amd64, config: test, distro: azurelinux3 }
9291
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test }
9392
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, fips: true }
9493
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: ubuntu }
95-
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: mariner2 }
96-
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: mariner2, fips: true }
9794
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3 }
9895
- { experiment: opensslcrypto, os: linux, arch: amd64, config: test, distro: azurelinux3, fips: true }
9996
- { experiment: boringcrypto, os: linux, arch: amd64, config: test }

eng/pipeline/stages/run-stage.yml

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,17 +69,12 @@ stages:
6969
${{ if eq(parameters.builder.hostArch, 'amd64') }}:
7070
${{ if eq(parameters.builder.distro, 'ubuntu') }}:
7171
container: ubuntu2204
72-
${{ elseif eq(parameters.builder.distro, 'mariner2') }}:
73-
container: mariner2
7472
${{ elseif eq(parameters.builder.distro, 'azurelinux3') }}:
7573
container: azurelinux3
7674
${{ else }}:
77-
container: mariner1
75+
container: mariner2
7876
${{ elseif eq(parameters.builder.hostArch, 'arm64') }}:
79-
${{ if eq(parameters.builder.distro, 'mariner2') }}:
80-
container: mariner2arm64
81-
${{ else }}:
82-
container: mariner1arm64
77+
container: mariner2arm64
8378

8479
variables:
8580
- group: go-cmdscan-rules

patches/0004-Use-crypto-backends.patch

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2139,7 +2139,7 @@ index 027bc22c33c921..eba08da985f832 100644
21392139
package fipsonly
21402140

21412141
diff --git a/src/crypto/tls/handshake_client.go b/src/crypto/tls/handshake_client.go
2142-
index 38bd417a0dca72..8c1ae3c7ec5485 100644
2142+
index 33d9a5be5487bc..665409dd812446 100644
21432143
--- a/src/crypto/tls/handshake_client.go
21442144
+++ b/src/crypto/tls/handshake_client.go
21452145
@@ -11,11 +11,11 @@ import (
@@ -2155,7 +2155,7 @@ index 38bd417a0dca72..8c1ae3c7ec5485 100644
21552155
"crypto/x509"
21562156
"errors"
21572157
"fmt"
2158-
@@ -549,7 +549,15 @@ func (c *Conn) pickTLSVersion(serverHello *serverHelloMsg) error {
2158+
@@ -562,7 +562,15 @@ func (c *Conn) pickTLSVersion(serverHello *serverHelloMsg) error {
21592159

21602160
// Does the handshake, either a full one or resumes old session. Requires hs.c,
21612161
// hs.hello, hs.serverHello, and, optionally, hs.session to be set.
@@ -2173,7 +2173,7 @@ index 38bd417a0dca72..8c1ae3c7ec5485 100644
21732173

21742174
isResume, err := hs.processServerHello()
21752175
diff --git a/src/crypto/tls/handshake_client_tls13.go b/src/crypto/tls/handshake_client_tls13.go
2176-
index c0396e75796add..2c00e119cb66e4 100644
2176+
index e134c88fb0ea1f..afb0dce35c5030 100644
21772177
--- a/src/crypto/tls/handshake_client_tls13.go
21782178
+++ b/src/crypto/tls/handshake_client_tls13.go
21792179
@@ -8,12 +8,12 @@ import (
@@ -2220,7 +2220,7 @@ index c0396e75796add..2c00e119cb66e4 100644
22202220
confTranscript.Sum(nil),
22212221
8,
22222222
diff --git a/src/crypto/tls/handshake_server.go b/src/crypto/tls/handshake_server.go
2223-
index 6aebb742229a50..d859e1294c3143 100644
2223+
index 69307e95b6b101..dc6e1904949da6 100644
22242224
--- a/src/crypto/tls/handshake_server.go
22252225
+++ b/src/crypto/tls/handshake_server.go
22262226
@@ -64,7 +64,15 @@ func (c *Conn) serverHandshake(ctx context.Context) error {
@@ -2241,7 +2241,7 @@ index 6aebb742229a50..d859e1294c3143 100644
22412241

22422242
if err := hs.processClientHello(); err != nil {
22432243
diff --git a/src/crypto/tls/handshake_server_tls13.go b/src/crypto/tls/handshake_server_tls13.go
2244-
index 76fff6974e7403..3ef8b56e5c7898 100644
2244+
index 6d253408c1e160..b4c02c2fc2ff7f 100644
22452245
--- a/src/crypto/tls/handshake_server_tls13.go
22462246
+++ b/src/crypto/tls/handshake_server_tls13.go
22472247
@@ -8,13 +8,14 @@ import (
@@ -2258,10 +2258,10 @@ index 76fff6974e7403..3ef8b56e5c7898 100644
22582258
"crypto/rsa"
22592259
"crypto/tls/internal/fips140tls"
22602260
+ "crypto/tls/internal/tls13"
2261+
"crypto/x509"
22612262
"errors"
22622263
"hash"
2263-
"internal/byteorder"
2264-
@@ -470,15 +471,19 @@ func (hs *serverHandshakeStateTLS13) checkForResumption() error {
2264+
@@ -478,15 +479,19 @@ func (hs *serverHandshakeStateTLS13) checkForResumption() error {
22652265
// interfaces implemented by standard library hashes to clone the state of in
22662266
// to a new instance of h. It returns nil if the operation fails.
22672267
func cloneHash(in hash.Hash, h crypto.Hash) hash.Hash {
@@ -2284,7 +2284,7 @@ index 76fff6974e7403..3ef8b56e5c7898 100644
22842284
state, err := marshaler.MarshalBinary()
22852285
if err != nil {
22862286
return nil
2287-
@@ -572,8 +577,12 @@ func (hs *serverHandshakeStateTLS13) doHelloRetryRequest(selectedGroup CurveID)
2287+
@@ -588,8 +593,12 @@ func (hs *serverHandshakeStateTLS13) doHelloRetryRequest(selectedGroup CurveID)
22882288
if err := transcriptMsg(helloRetryRequest, confTranscript); err != nil {
22892289
return nil, err
22902290
}
@@ -2298,7 +2298,7 @@ index 76fff6974e7403..3ef8b56e5c7898 100644
22982298
"hrr ech accept confirmation",
22992299
confTranscript.Sum(nil),
23002300
8,
2301-
@@ -734,9 +743,13 @@ func (hs *serverHandshakeStateTLS13) sendServerParameters() error {
2301+
@@ -750,9 +759,13 @@ func (hs *serverHandshakeStateTLS13) sendServerParameters() error {
23022302
if err := transcriptMsg(hs.hello, echTranscript); err != nil {
23032303
return err
23042304
}
@@ -2642,10 +2642,10 @@ index e7369542a73270..ff52175e4ac636 100644
26422642
}
26432643
}
26442644
diff --git a/src/crypto/x509/verify_test.go b/src/crypto/x509/verify_test.go
2645-
index 5595f99ea5e43a..e1a87fa839033a 100644
2645+
index 9a21218ee4b465..0b7a2664e6f5bf 100644
26462646
--- a/src/crypto/x509/verify_test.go
26472647
+++ b/src/crypto/x509/verify_test.go
2648-
@@ -3119,7 +3119,7 @@ func dsaSelfSignedCNX(t *testing.T) []byte {
2648+
@@ -3166,7 +3166,7 @@ func dsaSelfSignedCNX(t *testing.T) []byte {
26492649
t.Helper()
26502650
var params dsa.Parameters
26512651
if err := dsa.GenerateParameters(&params, rand.Reader, dsa.L1024N160); err != nil {

0 commit comments

Comments
 (0)