From 34ee744d006b3d9c8bd67107b012ad0a5f5ef3b8 Mon Sep 17 00:00:00 2001 From: Alex Brainman Date: Tue, 31 Mar 2015 16:59:02 +1100 Subject: [PATCH] crypto/x509: use syscall.GetVersion instead of internal/syscall/windows.GetVersion cl8167 introduced internal/syscall/windows.GetVersion, but we already have that function in syscall.GetVersion. Use that instead. Also revert all internal/syscall/windows cl8167 changes. Change-Id: I512a5bf4b3b696e93aaf69e9e8b7df7022670ec0 Reviewed-on: https://go-review.googlesource.com/8302 Reviewed-by: Daniel Theophanes Reviewed-by: Minux Ma --- src/crypto/x509/sha2_windows_test.go | 8 ++++++-- src/internal/syscall/windows/syscall_windows.go | 6 ------ src/internal/syscall/windows/zsyscall_windows.go | 7 ------- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/crypto/x509/sha2_windows_test.go b/src/crypto/x509/sha2_windows_test.go index 02dd07774f..79dc685c5b 100644 --- a/src/crypto/x509/sha2_windows_test.go +++ b/src/crypto/x509/sha2_windows_test.go @@ -4,10 +4,14 @@ package x509 -import "internal/syscall/windows" +import "syscall" func init() { - if major, _ := windows.GetVersion(); major < 6 { + v, err := syscall.GetVersion() + if err != nil { + return + } + if major := byte(v); major < 6 { // Windows XP SP2 and Windows 2003 do not support SHA2. // http://blogs.technet.com/b/pki/archive/2010/09/30/sha2-and-windows.aspx supportSHA2 = false diff --git a/src/internal/syscall/windows/syscall_windows.go b/src/internal/syscall/windows/syscall_windows.go index 28aa13b5e7..49bfeea1f4 100644 --- a/src/internal/syscall/windows/syscall_windows.go +++ b/src/internal/syscall/windows/syscall_windows.go @@ -97,7 +97,6 @@ const ( //sys GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizeOfPointer *uint32) (errcode error) = iphlpapi.GetAdaptersAddresses //sys GetComputerNameEx(nameformat uint32, buf *uint16, n *uint32) (err error) = GetComputerNameExW -//sys getVersion() (v uint32) = GetVersion const ( ComputerNameNetBIOS = 0 @@ -110,8 +109,3 @@ const ( ComputerNamePhysicalDnsFullyQualified = 7 ComputerNameMax = 8 ) - -func GetVersion() (major, minor byte) { - low := uint16(getVersion()) - return byte(low), byte(low >> 8) -} diff --git a/src/internal/syscall/windows/zsyscall_windows.go b/src/internal/syscall/windows/zsyscall_windows.go index bff242126c..50c7c5165b 100644 --- a/src/internal/syscall/windows/zsyscall_windows.go +++ b/src/internal/syscall/windows/zsyscall_windows.go @@ -13,7 +13,6 @@ var ( procGetAdaptersAddresses = modiphlpapi.NewProc("GetAdaptersAddresses") procGetComputerNameExW = modkernel32.NewProc("GetComputerNameExW") - procGetVersion = modkernel32.NewProc("GetVersion") ) func GetAdaptersAddresses(family uint32, flags uint32, reserved uintptr, adapterAddresses *IpAdapterAddresses, sizeOfPointer *uint32) (errcode error) { @@ -35,9 +34,3 @@ func GetComputerNameEx(nameformat uint32, buf *uint16, n *uint32) (err error) { } return } - -func getVersion() (v uint32) { - r0, _, _ := syscall.Syscall(procGetVersion.Addr(), 0, 0, 0, 0) - v = uint32(r0) - return -} -- 2.48.1