minor refactoring to ECSchnorr

CryptoLib.Tests/src/Others/ECSchnorrTests.pas

@@ -34,6 +34,8 @@ uses
 {$ENDIF FPC}
   ClpSecureRandom,
   ClpISecureRandom,
+  ClpFixedSecureRandom,
+  ClpIFixedSecureRandom,
   ClpECSchnorrSigner,
   ClpIECSchnorrSigner,
   ClpISigner,
@@ -46,6 +48,8 @@ uses
   ClpIECKeyPairGenerator,
   ClpECKeyPairGenerator,
   ClpIECKeyGenerationParameters,
+  ClpIParametersWithRandom,
+  ClpParametersWithRandom,
   ClpECKeyGenerationParameters,
   ClpIAsymmetricCipherKeyPair,
   ClpIX9ECParameters,
@@ -304,7 +308,8 @@ var
   point: IECPoint;
   LCurve: IX9ECParameters;
   signer: ISigner;
-  k: TBigInteger;
+  k: ISecureRandom;
+  param: IParametersWithRandom;
 begin
 
   LCurve := TSecNamedCurves.GetByName('secp256k1');
@@ -333,11 +338,18 @@ begin
   RegeneratedPrivateKey := TECPrivateKeyParameters.Create('ECSCHNORR',
     TBigInteger.Create(PrivateKeyByteArray), domain);
 
+  k := TFixedSecureRandom.From(TCryptoLibMatrixByteArray.Create
+    (TBigInteger.Create
+    ('4242424242424242424242424242424242424242424242424242424242424242',
+    16).ToByteArrayUnsigned()));
+
+  param := TParametersWithRandom.Create(RegeneratedPrivateKey, k);
+
   signer := TSignerUtilities.GetSigner('SHA-256withECSCHNORRLIBSECP');
 
   // sign
 
-  signer.Init(true, RegeneratedPrivateKey);
+  signer.Init(true, param);
 
   &message := TBigInteger.Create
     ('0101010101010101010101010101010101010101010101010101010101010101', 16)
@@ -345,12 +357,7 @@ begin
 
   signer.BlockUpdate(&message, 0, System.Length(&message));
 
-  k := TBigInteger.Create
-    ('4242424242424242424242424242424242424242424242424242424242424242', 16);
-
-  // cast ISigner instance to be able to access specific method for test purposees.
-  // do not do this.
-  sigBytes := (signer as IECSchnorrSigner).Sign_K(RegeneratedPrivateKey, k);
+  sigBytes := signer.GenerateSignature();
 
   // verify
 

CryptoLib/src/Crypto/Signers/ClpECSchnorrSigner.pas

@@ -64,24 +64,6 @@ type
 
     function Aggregate: TCryptoLibByteArray; inline;
 
-    /// <summary>
-    /// <para>
-    /// Warning...
-    /// </para>
-    /// <para>
-    /// do not use this method, it was exposed solely for testing
-    /// purposes.
-    /// </para>
-    /// </summary>
-    /// <param name="pv_key">
-    /// private key
-    /// </param>
-    /// <param name="k">
-    /// known random number
-    /// </param>
-    function Sign_K(const pv_key: IECPrivateKeyParameters; const k: TBigInteger)
-      : TCryptoLibByteArray;
-
   public
 
     function Do_Sign(const pv_key: IECPrivateKeyParameters;
@@ -360,12 +342,6 @@ begin
   FBuffer.SetSize(0);
 end;
 
-function TECSchnorrSigner.Sign_K(const pv_key: IECPrivateKeyParameters;
-  const k: TBigInteger): TCryptoLibByteArray;
-begin
-  Result := Do_Sign(pv_key, k);
-end;
-
 procedure TECSchnorrSigner.Update(input: Byte);
 begin
   FBuffer.Write(TCryptoLibByteArray.Create(input)[0], 1);

CryptoLib/src/Interfaces/ClpIECSchnorrSigner.pas

@@ -38,24 +38,6 @@ type
     function Do_Verify(const pu_key: IECPublicKeyParameters;
       sig: TCryptoLibByteArray): Boolean;
 
-    /// <summary>
-    /// <para>
-    /// Warning...
-    /// </para>
-    /// <para>
-    /// do not use this method, it was exposed solely for testing
-    /// purposes.
-    /// </para>
-    /// </summary>
-    /// <param name="pv_key">
-    /// private key
-    /// </param>
-    /// <param name="k">
-    /// known random number
-    /// </param>
-    function Sign_K(const pv_key: IECPrivateKeyParameters; const k: TBigInteger)
-      : TCryptoLibByteArray;
-
   end;
 
 implementation