diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-05 10:38:04 +0200 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2019-08-05 20:12:19 +0200 |
| commit | a1346c069998c66bdf27201937bed4ecd3c9ae9e (patch) | |
| tree | 86dbfa6633a7ccdb508ba298f97a07a18b775f09 /elevate/zsyscall_windows.go | |
| parent | elevate: do not show UAC prompt for frictionless UX (diff) | |
| download | wireguard-windows-a1346c069998c66bdf27201937bed4ecd3c9ae9e.tar.xz wireguard-windows-a1346c069998c66bdf27201937bed4ecd3c9ae9e.zip | |
elevate: do not rely on undocumented ldr function
Diffstat (limited to 'elevate/zsyscall_windows.go')
| -rw-r--r-- | elevate/zsyscall_windows.go | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/elevate/zsyscall_windows.go b/elevate/zsyscall_windows.go index b16b5f5d..a3c5400d 100644 --- a/elevate/zsyscall_windows.go +++ b/elevate/zsyscall_windows.go @@ -41,13 +41,13 @@ var ( modntdll = windows.NewLazySystemDLL("ntdll.dll") modole32 = windows.NewLazySystemDLL("ole32.dll") - procGetModuleHandleW = modkernel32.NewProc("GetModuleHandleW") - procGetWindowsDirectoryW = modkernel32.NewProc("GetWindowsDirectoryW") - procRtlInitUnicodeString = modntdll.NewProc("RtlInitUnicodeString") - procLdrFindEntryForAddress = modntdll.NewProc("LdrFindEntryForAddress") - procCoInitializeEx = modole32.NewProc("CoInitializeEx") - procCoUninitialize = modole32.NewProc("CoUninitialize") - procCoGetObject = modole32.NewProc("CoGetObject") + procGetModuleHandleW = modkernel32.NewProc("GetModuleHandleW") + procGetWindowsDirectoryW = modkernel32.NewProc("GetWindowsDirectoryW") + procRtlInitUnicodeString = modntdll.NewProc("RtlInitUnicodeString") + procRtlGetCurrentPeb = modntdll.NewProc("RtlGetCurrentPeb") + procCoInitializeEx = modole32.NewProc("CoInitializeEx") + procCoUninitialize = modole32.NewProc("CoUninitialize") + procCoGetObject = modole32.NewProc("CoGetObject") ) func getModuleHandle(moduleName *uint16) (moduleHandle uintptr, err error) { @@ -81,9 +81,9 @@ func rtlInitUnicodeString(destinationString *cUNICODE_STRING, sourceString *uint return } -func ldrFindEntryForAddress(moduleHandle uintptr, entry **cLDR_DATA_TABLE_ENTRY) (ntstatus uint32) { - r0, _, _ := syscall.Syscall(procLdrFindEntryForAddress.Addr(), 2, uintptr(moduleHandle), uintptr(unsafe.Pointer(entry)), 0) - ntstatus = uint32(r0) +func rtlGetCurrentPeb() (peb *cPEB) { + r0, _, _ := syscall.Syscall(procRtlGetCurrentPeb.Addr(), 0, 0, 0, 0) + peb = (*cPEB)(unsafe.Pointer(r0)) return } |