add lock in CryptoApiRandomGenerator NextBytes

CryptoLib/src/Asn1/ClpDerObjectIdentifier.pas

@@ -69,8 +69,6 @@ type
     class constructor CreateDerObjectIdentifier();
     class destructor DestroyDerObjectIdentifier();
 
-    class procedure Boot();
-
     constructor Create(const oid: IDerObjectIdentifier;
       const branchID: String); overload;
     constructor Create(const bytes: TCryptoLibByteArray); overload;
@@ -123,6 +121,8 @@ type
     class function FromOctetString(const enc: TCryptoLibByteArray)
       : IDerObjectIdentifier; static;
 
+    class procedure Boot(); static;
+
     constructor Create(const identifier: String); overload;
 
     property ID: String read GetID;

CryptoLib/src/Crypto/Prng/ClpCryptoApiRandomGenerator.pas

@@ -22,6 +22,7 @@ unit ClpCryptoApiRandomGenerator;
 interface
 
 uses
+  SyncObjs,
   ClpCryptoLibTypes,
   ClpIRandomNumberGenerator,
   ClpRandomNumberGenerator,
@@ -40,8 +41,17 @@ type
     ICryptoApiRandomGenerator, IRandomGenerator)
 
   strict private
+  var
     FrndProv: IRandomNumberGenerator;
 
+  class var
+
+    FLock: TCriticalSection;
+    FIsBooted: Boolean;
+
+    class constructor CreateCryptoApiRandomGenerator();
+    class destructor DestroyCryptoApiRandomGenerator();
+
   public
     /// <summary>
     /// Uses TRandomNumberGenerator.CreateRNG() to Get randomness generator
@@ -69,6 +79,8 @@ type
     procedure NextBytes(const bytes: TCryptoLibByteArray; start, len: Int32);
       overload; virtual;
 
+    class procedure Boot(); static;
+
   end;
 
 implementation
@@ -80,6 +92,16 @@ begin
   // We don't care about the seed
 end;
 
+class procedure TCryptoApiRandomGenerator.Boot;
+begin
+  if not FIsBooted then
+  begin
+    FLock := TCriticalSection.Create;
+
+    FIsBooted := True;
+  end;
+end;
+
 procedure TCryptoApiRandomGenerator.AddSeedMaterial
   (const seed: TCryptoLibByteArray);
 begin
@@ -92,6 +114,16 @@ begin
   FrndProv := rng;
 end;
 
+class constructor TCryptoApiRandomGenerator.CreateCryptoApiRandomGenerator;
+begin
+  TCryptoApiRandomGenerator.Boot;
+end;
+
+class destructor TCryptoApiRandomGenerator.DestroyCryptoApiRandomGenerator;
+begin
+  FLock.Free;
+end;
+
 constructor TCryptoApiRandomGenerator.Create;
 begin
   Create(TRandomNumberGenerator.CreateRNG());
@@ -99,7 +131,12 @@ end;
 
 procedure TCryptoApiRandomGenerator.NextBytes(const bytes: TCryptoLibByteArray);
 begin
-  FrndProv.GetBytes(bytes);
+  FLock.Acquire;
+  try
+    FrndProv.GetBytes(bytes);
+  finally
+    FLock.Release;
+  end;
 end;
 
 procedure TCryptoApiRandomGenerator.NextBytes(const bytes: TCryptoLibByteArray;