additional edge-case thread safety for RNG buffer filling
This commit is contained in:
parent
a5b7e6c78c
commit
cfdd943142
1 changed files with 45 additions and 32 deletions
|
|
@ -116,7 +116,8 @@ namespace Server {
|
||||||
private int _Index = 0;
|
private int _Index = 0;
|
||||||
|
|
||||||
private object _sync = new object();
|
private object _sync = new object();
|
||||||
private object _syncB = new object();
|
|
||||||
|
private ManualResetEvent _filled = new ManualResetEvent(false);
|
||||||
|
|
||||||
public CSPRandom() {
|
public CSPRandom() {
|
||||||
_CSP.GetBytes(_Working);
|
_CSP.GetBytes(_Working);
|
||||||
|
|
@ -127,19 +128,23 @@ namespace Server {
|
||||||
if (_Index + c < BUFFER_SIZE)
|
if (_Index + c < BUFFER_SIZE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
lock (_syncB) {
|
_filled.WaitOne();
|
||||||
byte[] b = _Working;
|
|
||||||
_Working = _Buffer;
|
byte[] b = _Working;
|
||||||
_Buffer = b;
|
_Working = _Buffer;
|
||||||
_Index = 0;
|
_Buffer = b;
|
||||||
}
|
_Index = 0;
|
||||||
|
|
||||||
|
_filled.Reset();
|
||||||
|
|
||||||
ThreadPool.QueueUserWorkItem(new WaitCallback(Fill));
|
ThreadPool.QueueUserWorkItem(new WaitCallback(Fill));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Fill(object o) {
|
private void Fill(object o) {
|
||||||
lock (_syncB)
|
lock (_CSP)
|
||||||
lock (_CSP)
|
_CSP.GetBytes(_Buffer);
|
||||||
_CSP.GetBytes(_Buffer);
|
|
||||||
|
_filled.Set();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _GetBytes(byte[] b) {
|
private void _GetBytes(byte[] b) {
|
||||||
|
|
@ -228,7 +233,8 @@ namespace Server {
|
||||||
private int _Index = 0;
|
private int _Index = 0;
|
||||||
|
|
||||||
private object _sync = new object();
|
private object _sync = new object();
|
||||||
private object _syncB = new object();
|
|
||||||
|
private ManualResetEvent _filled = new ManualResetEvent(false);
|
||||||
|
|
||||||
public RDRand32() {
|
public RDRand32() {
|
||||||
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Working);
|
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Working);
|
||||||
|
|
@ -244,18 +250,21 @@ namespace Server {
|
||||||
if (_Index + c < BUFFER_SIZE)
|
if (_Index + c < BUFFER_SIZE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
lock (_syncB) {
|
_filled.WaitOne();
|
||||||
byte[] b = _Working;
|
|
||||||
_Working = _Buffer;
|
byte[] b = _Working;
|
||||||
_Buffer = b;
|
_Working = _Buffer;
|
||||||
_Index = 0;
|
_Buffer = b;
|
||||||
}
|
_Index = 0;
|
||||||
|
|
||||||
|
_filled.Reset();
|
||||||
|
|
||||||
ThreadPool.QueueUserWorkItem(new WaitCallback(Fill));
|
ThreadPool.QueueUserWorkItem(new WaitCallback(Fill));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Fill(object o) {
|
private void Fill(object o) {
|
||||||
lock (_syncB)
|
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Buffer);
|
||||||
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Buffer);
|
_filled.Set();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _GetBytes(byte[] b) {
|
private void _GetBytes(byte[] b) {
|
||||||
|
|
@ -343,7 +352,8 @@ namespace Server {
|
||||||
private int _Index = 0;
|
private int _Index = 0;
|
||||||
|
|
||||||
private object _sync = new object();
|
private object _sync = new object();
|
||||||
private object _syncB = new object();
|
|
||||||
|
private ManualResetEvent _filled = new ManualResetEvent(false);
|
||||||
|
|
||||||
public RDRand64() {
|
public RDRand64() {
|
||||||
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Working);
|
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Working);
|
||||||
|
|
@ -359,18 +369,21 @@ namespace Server {
|
||||||
if (_Index + c < BUFFER_SIZE)
|
if (_Index + c < BUFFER_SIZE)
|
||||||
return;
|
return;
|
||||||
|
|
||||||
lock (_syncB) {
|
_filled.WaitOne();
|
||||||
byte[] b = _Working;
|
|
||||||
_Working = _Buffer;
|
byte[] b = _Working;
|
||||||
_Buffer = b;
|
_Working = _Buffer;
|
||||||
_Index = 0;
|
_Buffer = b;
|
||||||
}
|
_Index = 0;
|
||||||
|
|
||||||
|
_filled.Reset();
|
||||||
|
|
||||||
ThreadPool.QueueUserWorkItem(new WaitCallback(Fill));
|
ThreadPool.QueueUserWorkItem(new WaitCallback(Fill));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Fill(object o) {
|
private void Fill(object o) {
|
||||||
lock (_syncB)
|
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Buffer);
|
||||||
SafeNativeMethods.rdrand_get_bytes(BUFFER_SIZE, _Buffer);
|
_filled.Set();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void _GetBytes(byte[] b) {
|
private void _GetBytes(byte[] b) {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue