| author |  Andrew Kelley <andrew@ziglang.org> 2017-10-11 23:14:48-04:00 |
| committer | Andrew Kelley <andrew@ziglang.org> 2017-10-11 23:14:48-04:00 |
| log | 7f9dc4ebc10eb13e73466224f28ba62747693df9 |
| tree | c9710ef079787b0ebd460006a8f2dce03644d66b |
| parent | b61a6ec8a6ba7222efd3749a9c5ae30db7e4ef6b |
fix std.os.getRandomBytes for windows
2 files changed, 14 insertions(+), 8 deletions(-)
std/os/index.zig+6-1
| ... | ... | @@ -85,7 +85,7 @@ pub fn getRandomBytes(buf: []u8) -> %void { |
| 85 | 85 | }, |
| 86 | 86 | Os.windows => { |
| 87 | 87 | var hCryptProv: windows.HCRYPTPROV = undefined; |
| 88 | if (!windows.CryptAcquireContext(&hCryptProv, null, null, windows.PROV_RSA_FULL, 0)) { | |
| 88 | if (!windows.CryptAcquireContextA(&hCryptProv, null, null, windows.PROV_RSA_FULL, 0)) { | |
| 89 | 89 | return error.Unexpected; |
| 90 | 90 | } |
| 91 | 91 | defer _ = windows.CryptReleaseContext(hCryptProv, 0); |
| ... | ... | @@ -98,6 +98,11 @@ pub fn getRandomBytes(buf: []u8) -> %void { |
| 98 | 98 | } |
| 99 | 99 | } |
| 100 | 100 | |
| 101 | test "os.getRandomBytes" { | |
| 102 | var buf: [50]u8 = undefined; | |
| 103 | %%getRandomBytes(buf[0..]); | |
| 104 | } | |
| 105 | ||
| 101 | 106 | /// Raises a signal in the current kernel thread, ending its execution. |
| 102 | 107 | /// If linking against libc, this calls the abort() libc function. Otherwise |
| 103 | 108 | /// it uses the zig standard library implementation. |
std/os/windows/index.zig+8-7
| ... | ... | @@ -1,18 +1,19 @@ |
| 1 | 1 | pub const ERROR = @import("error.zig"); |
| 2 | 2 | |
| 3 | pub extern "advapi32" stdcallcc fn CryptAcquireContextA(phProv: &HCRYPTPROV, pszContainer: ?LPCSTR, | |
| 4 | pszProvider: ?LPCSTR, dwProvType: DWORD, dwFlags: DWORD) -> bool; | |
| 5 | ||
| 6 | pub extern "advapi32" stdcallcc fn CryptReleaseContext(hProv: HCRYPTPROV, dwFlags: DWORD) -> bool; | |
| 7 | ||
| 8 | pub extern "advapi32" stdcallcc fn CryptGenRandom(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: &BYTE) -> bool; | |
| 9 | ||
| 10 | ||
| 3 | 11 | pub extern "kernel32" stdcallcc fn CloseHandle(hObject: HANDLE) -> BOOL; |
| 4 | 12 | |
| 5 | 13 | pub extern "kernel32" stdcallcc fn CreateFileA(lpFileName: LPCSTR, dwDesiredAccess: DWORD, |
| 6 | 14 | dwShareMode: DWORD, lpSecurityAttributes: ?LPSECURITY_ATTRIBUTES, dwCreationDisposition: DWORD, |
| 7 | 15 | dwFlagsAndAttributes: DWORD, hTemplateFile: ?HANDLE) -> HANDLE; |
| 8 | 16 | |
| 9 | pub extern "kernel32" stdcallcc fn CryptAcquireContext(phProv: &HCRYPTPROV, pszContainer: LPCTSTR, | |
| 10 | pszProvider: LPCTSTR, dwProvType: DWORD, dwFlags: DWORD) -> bool; | |
| 11 | ||
| 12 | pub extern "kernel32" stdcallcc fn CryptReleaseContext(hProv: HCRYPTPROV, dwFlags: DWORD) -> bool; | |
| 13 | ||
| 14 | pub extern "kernel32" stdcallcc fn CryptGenRandom(hProv: HCRYPTPROV, dwLen: DWORD, pbBuffer: &BYTE) -> bool; | |
| 15 | ||
| 16 | 17 | pub extern "kernel32" stdcallcc fn DeleteFileA(lpFileName: LPCSTR) -> bool; |
| 17 | 18 | |
| 18 | 19 | pub extern "kernel32" stdcallcc fn ExitProcess(exit_code: UINT) -> noreturn; |