OSS/tanya
1
0
Fork 0
Code Issues 1 Pull Requests Releases Activity

Merge remote-tracking branch 'n8sh/getrandom-syscall'

Browse Source 
Fix #18.
This commit is contained in:
Eugen Wissner 2018-02-22 05:25:59 +01:00
commit af942116e4
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dub.json
View File

@ -9,6 +9,10 @@
"targetType": "library", "targetType": "library",
"dependencies-linux": {
"mir-linux-kernel": "~>1.0.0",
},
"configurations": [ "configurations": [
{ {
"name": "library", "name": "library",

19
source/tanya/math/random.d
View File

@ -117,7 +117,8 @@ else version (Solaris)
version (linux) version (linux)
{ {
extern (C) long syscall(long number, ...) nothrow @system @nogc; import core.stdc.config : c_long;
extern (C) c_long syscall(c_long number, ...) nothrow @system @nogc;
/** /**
* Uses getrandom system call. * Uses getrandom system call.
@ -158,7 +159,8 @@ version (linux)
do do
{ {
// int getrandom(void *buf, size_t buflen, unsigned int flags); // int getrandom(void *buf, size_t buflen, unsigned int flags);
auto length = syscall(318, output.ptr, output.length, 0); import mir.linux._asm.unistd : NR_getrandom;
auto length = syscall(NR_getrandom, output.ptr, output.length, 0);
Nullable!ubyte ret; Nullable!ubyte ret;
if (length >= 0) if (length >= 0)
@ -169,16 +171,13 @@ version (linux)
} }
} }
version (X86_64) @nogc @system unittest
{ {
private unittest auto entropy = defaultAllocator.make!Entropy();
{ ubyte[blockSize] output;
auto entropy = defaultAllocator.make!Entropy(); output = entropy.random;
ubyte[blockSize] output;
output = entropy.random;
defaultAllocator.dispose(entropy); defaultAllocator.dispose(entropy);
}
} }
} }
else version (SecureARC4Random) else version (SecureARC4Random)