diff --git a/go b/go index 4e693d1ec5..5b40e48a29 160000 --- a/go +++ b/go @@ -1 +1 @@ -Subproject commit 4e693d1ec52c86b262ac23f0d6cee6b60fef4fb0 +Subproject commit 5b40e48a2970734e816d2a9f2eac163a3315f3c2 diff --git a/patches/0004-Use-crypto-backends.patch b/patches/0004-Use-crypto-backends.patch index 0b7842f8f7..0596a97943 100644 --- a/patches/0004-Use-crypto-backends.patch +++ b/patches/0004-Use-crypto-backends.patch @@ -1759,10 +1759,10 @@ index 6d67ee8b3429a1..8f8d5937ea913c 100644 // Unwrap returns h, or a crypto/internal/fips140 inner implementation of h. // diff --git a/src/crypto/internal/fips140only/fips140only.go b/src/crypto/internal/fips140only/fips140only.go -index 1b0a4be6ba5897..72fea1cfa7eed8 100644 +index a8d840b17022cc..2a17f7da2d4aaa 100644 --- a/src/crypto/internal/fips140only/fips140only.go +++ b/src/crypto/internal/fips140only/fips140only.go -@@ -20,13 +20,20 @@ func Enforced() bool { +@@ -18,11 +18,18 @@ func Enforced() bool { return fips140.Enforced() } @@ -1783,8 +1783,6 @@ index 1b0a4be6ba5897..72fea1cfa7eed8 100644 + } + return false } - - func ApprovedRandomReader(r io.Reader) bool { diff --git a/src/crypto/internal/fips140only/fips140only_test.go b/src/crypto/internal/fips140only/fips140only_test.go index 96df536d56f345..01613841a3c87e 100644 --- a/src/crypto/internal/fips140only/fips140only_test.go @@ -1934,7 +1932,7 @@ index 7f2824ca9ac052..f0d3b2a8459871 100644 "crypto/internal/fips140/aes" "crypto/internal/fips140/aes/gcm" diff --git a/src/crypto/internal/rand/rand.go b/src/crypto/internal/rand/rand.go -index 29648b9f386ed7..b3113a3ee2e1fa 100644 +index 00e736a579859a..3583dadcf7aeec 100644 --- a/src/crypto/internal/rand/rand.go +++ b/src/crypto/internal/rand/rand.go @@ -5,7 +5,7 @@ @@ -2426,7 +2424,7 @@ index 018fe013cef600..ec710c6f935e3b 100644 "crypto/internal/rand" "io" diff --git a/src/crypto/rand/rand_test.go b/src/crypto/rand/rand_test.go -index 3bb3d5f1acda25..cd4b55de7c48cb 100644 +index 13e4a65db28bd2..3404dd39d73c6f 100644 --- a/src/crypto/rand/rand_test.go +++ b/src/crypto/rand/rand_test.go @@ -7,6 +7,7 @@ package rand @@ -2435,9 +2433,9 @@ index 3bb3d5f1acda25..cd4b55de7c48cb 100644 "compress/flate" + boring "crypto/internal/backend" "crypto/internal/cryptotest" + "crypto/internal/rand" "errors" - "internal/testenv" -@@ -154,13 +155,17 @@ var sink byte +@@ -156,13 +157,17 @@ var sink byte func TestAllocations(t *testing.T) { cryptotest.SkipTestAllocations(t) diff --git a/patches/0006-Add-support-for-logging-used-Windows-APIs.patch b/patches/0006-Add-support-for-logging-used-Windows-APIs.patch index 78a481d991..9b8d777d7a 100644 --- a/patches/0006-Add-support-for-logging-used-Windows-APIs.patch +++ b/patches/0006-Add-support-for-logging-used-Windows-APIs.patch @@ -8,19 +8,19 @@ Subject: [PATCH] Add support for logging used Windows APIs src/runtime/syscalltrace_generate_windows.go | 50 +++++++ src/runtime/syscalltrace_windows.go | 136 +++++++++++++++++++ src/runtime/syscalltrace_windows_test.go | 81 +++++++++++ - src/runtime/zsyscalltrace_windows.go | 59 ++++++++ + src/runtime/zsyscalltrace_windows.go | 60 ++++++++ src/syscall/dll_windows.go | 4 + - 6 files changed, 331 insertions(+) + 6 files changed, 332 insertions(+) create mode 100644 src/runtime/syscalltrace_generate_windows.go create mode 100644 src/runtime/syscalltrace_windows.go create mode 100644 src/runtime/syscalltrace_windows_test.go create mode 100644 src/runtime/zsyscalltrace_windows.go diff --git a/src/runtime/os_windows.go b/src/runtime/os_windows.go -index f47419cf7dfe0d..f08a01b0801fd7 100644 +index 8ed4b12c8a6b12..6d56064feaa7f7 100644 --- a/src/runtime/os_windows.go +++ b/src/runtime/os_windows.go -@@ -220,6 +220,7 @@ func windowsFindfunc(lib uintptr, name []byte) stdFunction { +@@ -222,6 +222,7 @@ func windowsFindfunc(lib uintptr, name []byte) stdFunction { if name[len(name)-1] != 0 { throw("usage") } @@ -315,10 +315,10 @@ index 00000000000000..626c5e98f7eae4 +} diff --git a/src/runtime/zsyscalltrace_windows.go b/src/runtime/zsyscalltrace_windows.go new file mode 100644 -index 00000000000000..d827281b8e9f7b +index 00000000000000..a34fca73d5f7e5 --- /dev/null +++ b/src/runtime/zsyscalltrace_windows.go -@@ -0,0 +1,59 @@ +@@ -0,0 +1,60 @@ +// Code generated by syscalltrace_generate_windows.go. DO NOT EDIT. + +package runtime @@ -346,6 +346,7 @@ index 00000000000000..d827281b8e9f7b + "GetSystemDirectoryA\x00", + "GetSystemInfo\x00", + "GetThreadContext\x00", ++ "IsProcessorFeaturePresent\x00", + "SetThreadContext\x00", + "LoadLibraryExW\x00", + "PostQueuedCompletionStatus\x00",