Browse Source

minor modifications.

Ugochukwu Mmaduekwe 7 years ago
parent
commit
cd3374a500

+ 4 - 4
CryptoLib/src/Math/EC/ClpECCurve.pas

@@ -101,12 +101,11 @@ type
       FLock: TCriticalSection;
       FLock: TCriticalSection;
 
 
   var
   var
-
     Fm_field: IFiniteField;
     Fm_field: IFiniteField;
     Fm_order, Fm_cofactor: TBigInteger;
     Fm_order, Fm_cofactor: TBigInteger;
 
 
     Fm_coord: Int32;
     Fm_coord: Int32;
-    // [Weak]
+
     Fm_endomorphism: IECEndomorphism;
     Fm_endomorphism: IECEndomorphism;
     Fm_multiplier: IECMultiplier;
     Fm_multiplier: IECMultiplier;
     Fm_a, Fm_b: IECFieldElement;
     Fm_a, Fm_b: IECFieldElement;
@@ -330,6 +329,7 @@ type
   strict protected
   strict protected
   var
   var
     Fm_q, Fm_r: TBigInteger;
     Fm_q, Fm_r: TBigInteger;
+
     Fm_infinity: IFpPoint;
     Fm_infinity: IFpPoint;
 
 
     constructor Create(const q, r: TBigInteger;
     constructor Create(const q, r: TBigInteger;
@@ -654,6 +654,7 @@ end;
 
 
 constructor TECCurve.Create(const field: IFiniteField);
 constructor TECCurve.Create(const field: IFiniteField);
 begin
 begin
+  inherited Create();
   Fm_field := field;
   Fm_field := field;
 end;
 end;
 
 
@@ -984,7 +985,6 @@ end;
 procedure TECCurve.SetEndomorphism(const Value: IECEndomorphism);
 procedure TECCurve.SetEndomorphism(const Value: IECEndomorphism);
 begin
 begin
   Fm_endomorphism := Value;
   Fm_endomorphism := Value;
-  // TSetWeakRef.SetWeakReference(@Fm_endomorphism, Value);
 end;
 end;
 
 
 procedure TECCurve.SetMultiplier(const Value: IECMultiplier);
 procedure TECCurve.SetMultiplier(const Value: IECMultiplier);
@@ -1050,6 +1050,7 @@ end;
 constructor TECCurve.TConfig.Create(const outer: IECCurve; coord: Int32;
 constructor TECCurve.TConfig.Create(const outer: IECCurve; coord: Int32;
   const endomorphism: IECEndomorphism; const multiplier: IECMultiplier);
   const endomorphism: IECEndomorphism; const multiplier: IECMultiplier);
 begin
 begin
+  Inherited Create();
   Fouter := outer;
   Fouter := outer;
   Fcoord := coord;
   Fcoord := coord;
   Fendomorphism := endomorphism;
   Fendomorphism := endomorphism;
@@ -1216,7 +1217,6 @@ end;
 function TFpCurve.FromBigInteger(x: TBigInteger): IECFieldElement;
 function TFpCurve.FromBigInteger(x: TBigInteger): IECFieldElement;
 begin
 begin
   Result := TFpFieldElement.Create(Fm_q, Fm_r, x);
   Result := TFpFieldElement.Create(Fm_q, Fm_r, x);
-  // TSetWeakRef.SetWeakReference(@Result, TFpFieldElement.Create(Fm_q, Fm_r, x));
 end;
 end;
 
 
 function TFpCurve.GetFieldSize: Int32;
 function TFpCurve.GetFieldSize: Int32;

+ 1 - 0
CryptoLib/src/Math/EC/Multiplier/ClpGlvMultiplier.pas

@@ -72,6 +72,7 @@ end;
 
 
 destructor TGlvMultiplier.Destroy;
 destructor TGlvMultiplier.Destroy;
 begin
 begin
+  TSetWeakRef.SetWeakReference(@Fcurve, Nil);
   inherited Destroy;
   inherited Destroy;
 end;
 end;