move TX962Parameters to ClpX9ECAsn1Objects

CryptoLib/src/Asn1/X9/ClpX9Asn1Objects.pas

@@ -47,40 +47,6 @@ resourcestring
   SInvalidDHDomainParameters = 'Invalid DHDomainParameters: %s';
 
 type
-  /// <summary>
-  /// The X962Parameters object.
-  /// </summary>
-  TX962Parameters = class(TAsn1Encodable, IX962Parameters)
-
-  strict private
-  var
-    FParameters: IAsn1Object;
-
-  strict protected
-    function GetParameters: IAsn1Object;
-    function GetNamedCurve: IDerObjectIdentifier;
-    function IsImplicitlyCA: Boolean;
-    function IsNamedCurve: Boolean;
-
-  public
-    class function GetInstance(AObj: TObject): IX962Parameters; overload; static;
-    class function GetInstance(const AObj: IAsn1Object): IX962Parameters; overload; static;
-    class function GetInstance(const AElement: IAsn1Encodable): IX962Parameters; overload; static;
-    class function GetInstance(const AEncoded: TCryptoLibByteArray): IX962Parameters; overload; static;
-    class function GetInstance(const AObj: IAsn1TaggedObject;
-      AExplicitly: Boolean): IX962Parameters; overload; static;
-    class function GetOptional(const AElement: IAsn1Encodable): IX962Parameters; static;
-
-    constructor Create(const AParameters: IX9ECParameters); overload;
-    constructor Create(const AParameters: IDerObjectIdentifier); overload;
-    constructor Create(const AParameters: IAsn1Null); overload;
-
-    function ToAsn1Object: IAsn1Object; override;
-
-    property Parameters: IAsn1Object read GetParameters;
-
-  end;
-
   /// <summary>
   /// The DHValidationParms object.
   /// </summary>
@@ -193,157 +159,6 @@ type
 
 implementation
 
-{ TX962Parameters }
-
-class function TX962Parameters.GetInstance(AObj: TObject): IX962Parameters;
-begin
-  Result := TAsn1Utilities.GetInstanceChoice<IX962Parameters>(AObj,
-    function(AElement: IAsn1Encodable): IX962Parameters
-    begin
-      Result := GetOptional(AElement);
-    end);
-end;
-
-class function TX962Parameters.GetOptional(const AElement: IAsn1Encodable): IX962Parameters;
-var
-  LECParams: IX9ECParameters;
-  LNamedCurve: IDerObjectIdentifier;
-  LNull: IAsn1Null;
-begin
-  if AElement = nil then
-    raise EArgumentNilCryptoLibException.Create('element');
-
-  if Supports(AElement, IX962Parameters, Result) then
-    Exit;
-
-  LECParams := TX9ECParameters.GetOptional(AElement);
-  if LECParams <> nil then
-  begin
-    Result := TX962Parameters.Create(LECParams);
-    Exit;
-  end;
-
-  LNamedCurve := TDerObjectIdentifier.GetOptional(AElement);
-  if LNamedCurve <> nil then
-  begin
-    Result := TX962Parameters.Create(LNamedCurve);
-    Exit;
-  end;
-
-  LNull := TAsn1Null.GetOptional(AElement);
-  if LNull <> nil then
-  begin
-    Result := TX962Parameters.Create(LNull);
-    Exit;
-  end;
-
-  Result := nil;
-end;
-
-class function TX962Parameters.GetInstance(const AObj: IAsn1Object): IX962Parameters;
-begin
-  if AObj = nil then
-  begin
-    Result := nil;
-    Exit;
-  end;
-
-  if Supports(AObj, IX962Parameters, Result) then
-    Exit;
-
-  Result := GetOptional(AObj);
-end;
-
-class function TX962Parameters.GetInstance(const AElement: IAsn1Encodable): IX962Parameters;
-begin
-  if AElement = nil then
-  begin
-    Result := nil;
-    Exit;
-  end;
-
-  Result := GetOptional(AElement);
-  if Result = nil then
-    raise EArgumentCryptoLibException.Create('unable to parse X962Parameters');
-end;
-
-class function TX962Parameters.GetInstance(const AEncoded: TCryptoLibByteArray): IX962Parameters;
-var
-  LAsn1Obj: IAsn1Object;
-begin
-  if AEncoded = nil then
-  begin
-    Result := nil;
-    Exit;
-  end;
-
-  try
-    LAsn1Obj := TAsn1Object.FromByteArray(AEncoded);
-    Result := GetInstance(LAsn1Obj);
-  except
-    on E: EIOCryptoLibException do
-      raise EArgumentCryptoLibException.Create('failed to construct X962Parameters from byte[]: ' + E.Message);
-  end;
-end;
-
-class function TX962Parameters.GetInstance(const AObj: IAsn1TaggedObject;
-  AExplicitly: Boolean): IX962Parameters;
-begin
-  Result := TAsn1Utilities.GetInstanceChoice<IX962Parameters>(AObj, AExplicitly,
-    function(AElement: IAsn1Encodable): IX962Parameters
-    begin
-      Result := GetInstance(AElement);
-    end);
-end;
-
-constructor TX962Parameters.Create(const AParameters: IX9ECParameters);
-begin
-  inherited Create();
-  FParameters := AParameters.ToAsn1Object();
-end;
-
-constructor TX962Parameters.Create(const AParameters: IDerObjectIdentifier);
-begin
-  inherited Create();
-  FParameters := AParameters;
-end;
-
-constructor TX962Parameters.Create(const AParameters: IAsn1Null);
-begin
-  inherited Create();
-  FParameters := AParameters;
-end;
-
-function TX962Parameters.GetParameters: IAsn1Object;
-begin
-  Result := FParameters;
-end;
-
-function TX962Parameters.IsImplicitlyCA: Boolean;
-var
-  LNull: IAsn1Null;
-begin
-  // IsImplicitlyCA => m_params is Asn1Null
-  // Check if FParameters is an Asn1Null instance (not nil check)
-  Result := Supports(FParameters, IAsn1Null, LNull);
-end;
-
-function TX962Parameters.GetNamedCurve: IDerObjectIdentifier;
-begin
-  if not Supports(FParameters, IDerObjectIdentifier, Result) then
-    Result := nil;
-end;
-
-function TX962Parameters.IsNamedCurve: Boolean;
-begin
-  Result := GetNamedCurve <> nil;
-end;
-
-function TX962Parameters.ToAsn1Object: IAsn1Object;
-begin
-  Result := FParameters;
-end;
-
 { TDHValidationParms }
 
 class function TDHValidationParms.GetInstance(AObj: TObject): IDHValidationParms;

CryptoLib/src/Asn1/X9/ClpX9ECAsn1Objects.pas

@@ -56,6 +56,41 @@ resourcestring
   SEncodingNil = 'encoding';
   SOctetStringNil = 's';
 
+type
+  /// <summary>
+  /// The X962Parameters object.
+  /// </summary>
+  TX962Parameters = class(TAsn1Encodable, IX962Parameters)
+
+  strict private
+  var
+    FParameters: IAsn1Object;
+
+  strict protected
+    function GetParameters: IAsn1Object;
+    function GetNamedCurve: IDerObjectIdentifier;
+    function IsImplicitlyCA: Boolean;
+    function IsNamedCurve: Boolean;
+
+  public
+    class function GetInstance(AObj: TObject): IX962Parameters; overload; static;
+    class function GetInstance(const AObj: IAsn1Object): IX962Parameters; overload; static;
+    class function GetInstance(const AElement: IAsn1Encodable): IX962Parameters; overload; static;
+    class function GetInstance(const AEncoded: TCryptoLibByteArray): IX962Parameters; overload; static;
+    class function GetInstance(const AObj: IAsn1TaggedObject;
+      AExplicitly: Boolean): IX962Parameters; overload; static;
+    class function GetOptional(const AElement: IAsn1Encodable): IX962Parameters; static;
+
+    constructor Create(const AParameters: IX9ECParameters); overload;
+    constructor Create(const AParameters: IDerObjectIdentifier); overload;
+    constructor Create(const AParameters: IAsn1Null); overload;
+
+    function ToAsn1Object: IAsn1Object; override;
+
+    property Parameters: IAsn1Object read GetParameters;
+
+  end;
+
 type
   /// <summary>
   /// ASN.1 def for Elliptic-Curve Field ID structure. See X9.62 for further details.
@@ -884,4 +919,155 @@ begin
   Result := TDerSequence.Create(LV);
 end;
 
+{ TX962Parameters }
+
+class function TX962Parameters.GetInstance(AObj: TObject): IX962Parameters;
+begin
+  Result := TAsn1Utilities.GetInstanceChoice<IX962Parameters>(AObj,
+    function(AElement: IAsn1Encodable): IX962Parameters
+    begin
+      Result := GetOptional(AElement);
+    end);
+end;
+
+class function TX962Parameters.GetOptional(const AElement: IAsn1Encodable): IX962Parameters;
+var
+  LECParams: IX9ECParameters;
+  LNamedCurve: IDerObjectIdentifier;
+  LNull: IAsn1Null;
+begin
+  if AElement = nil then
+    raise EArgumentNilCryptoLibException.Create('element');
+
+  if Supports(AElement, IX962Parameters, Result) then
+    Exit;
+
+  LECParams := TX9ECParameters.GetOptional(AElement);
+  if LECParams <> nil then
+  begin
+    Result := TX962Parameters.Create(LECParams);
+    Exit;
+  end;
+
+  LNamedCurve := TDerObjectIdentifier.GetOptional(AElement);
+  if LNamedCurve <> nil then
+  begin
+    Result := TX962Parameters.Create(LNamedCurve);
+    Exit;
+  end;
+
+  LNull := TAsn1Null.GetOptional(AElement);
+  if LNull <> nil then
+  begin
+    Result := TX962Parameters.Create(LNull);
+    Exit;
+  end;
+
+  Result := nil;
+end;
+
+class function TX962Parameters.GetInstance(const AObj: IAsn1Object): IX962Parameters;
+begin
+  if AObj = nil then
+  begin
+    Result := nil;
+    Exit;
+  end;
+
+  if Supports(AObj, IX962Parameters, Result) then
+    Exit;
+
+  Result := GetOptional(AObj);
+end;
+
+class function TX962Parameters.GetInstance(const AElement: IAsn1Encodable): IX962Parameters;
+begin
+  if AElement = nil then
+  begin
+    Result := nil;
+    Exit;
+  end;
+
+  Result := GetOptional(AElement);
+  if Result = nil then
+    raise EArgumentCryptoLibException.Create('unable to parse X962Parameters');
+end;
+
+class function TX962Parameters.GetInstance(const AEncoded: TCryptoLibByteArray): IX962Parameters;
+var
+  LAsn1Obj: IAsn1Object;
+begin
+  if AEncoded = nil then
+  begin
+    Result := nil;
+    Exit;
+  end;
+
+  try
+    LAsn1Obj := TAsn1Object.FromByteArray(AEncoded);
+    Result := GetInstance(LAsn1Obj);
+  except
+    on E: EIOCryptoLibException do
+      raise EArgumentCryptoLibException.Create('failed to construct X962Parameters from byte[]: ' + E.Message);
+  end;
+end;
+
+class function TX962Parameters.GetInstance(const AObj: IAsn1TaggedObject;
+  AExplicitly: Boolean): IX962Parameters;
+begin
+  Result := TAsn1Utilities.GetInstanceChoice<IX962Parameters>(AObj, AExplicitly,
+    function(AElement: IAsn1Encodable): IX962Parameters
+    begin
+      Result := GetInstance(AElement);
+    end);
+end;
+
+constructor TX962Parameters.Create(const AParameters: IX9ECParameters);
+begin
+  inherited Create();
+  FParameters := AParameters.ToAsn1Object();
+end;
+
+constructor TX962Parameters.Create(const AParameters: IDerObjectIdentifier);
+begin
+  inherited Create();
+  FParameters := AParameters;
+end;
+
+constructor TX962Parameters.Create(const AParameters: IAsn1Null);
+begin
+  inherited Create();
+  FParameters := AParameters;
+end;
+
+function TX962Parameters.GetParameters: IAsn1Object;
+begin
+  Result := FParameters;
+end;
+
+function TX962Parameters.IsImplicitlyCA: Boolean;
+var
+  LNull: IAsn1Null;
+begin
+  // IsImplicitlyCA => m_params is Asn1Null
+  // Check if FParameters is an Asn1Null instance (not nil check)
+  Result := Supports(FParameters, IAsn1Null, LNull);
+end;
+
+function TX962Parameters.GetNamedCurve: IDerObjectIdentifier;
+begin
+  if not Supports(FParameters, IDerObjectIdentifier, Result) then
+    Result := nil;
+end;
+
+function TX962Parameters.IsNamedCurve: Boolean;
+begin
+  Result := GetNamedCurve <> nil;
+end;
+
+function TX962Parameters.ToAsn1Object: IAsn1Object;
+begin
+  Result := FParameters;
+end;
+
 end.

CryptoLib/src/Crypto/Parameters/ClpECDomainParameters.pas

@@ -30,9 +30,7 @@ uses
   ClpIECDomainParameters,
   ClpIX9ECAsn1Objects,
   ClpIAsn1Objects,
-  ClpIX9Asn1Objects,
-  ClpX9ECAsn1Objects,
-  ClpX9Asn1Objects;
+  ClpX9ECAsn1Objects;
 
 resourcestring
   SCurveNil = 'Curve Cannot be Nil';

CryptoLib/src/Crypto/Parameters/ClpECNamedDomainParameters.pas

@@ -28,8 +28,7 @@ uses
   ClpIECDomainParameters,
   ClpIECNamedDomainParameters,
   ClpIX9ECAsn1Objects,
-  ClpX9Asn1Objects,
-  ClpIX9Asn1Objects,
+  ClpX9ECAsn1Objects,
   ClpECDomainParameters,
   ClpECUtilities,
   ClpCryptoLibTypes;

CryptoLib/src/Factories/ClpPrivateKeyFactory.pas

@@ -28,7 +28,6 @@ uses
   ClpAsn1Objects,
   ClpIAsn1Objects,
   ClpIPkcsAsn1Objects,
-  ClpIX9Asn1Objects,
   ClpIAsymmetricKeyParameter,
   ClpRsaPrivateCrtKeyParameters,
   ClpDsaPrivateKeyParameters,
@@ -38,8 +37,8 @@ uses
   ClpPkcsObjectIdentifiers,
   ClpX509ObjectIdentifiers,
   ClpX9ObjectIdentifiers,
-  ClpX9Asn1Objects,
   ClpIX9ECAsn1Objects,
+  ClpX9ECAsn1Objects,
   ClpPkcsAsn1Objects,
   ClpIECDomainParameters,
   ClpIDsaParameters,

CryptoLib/src/Factories/ClpPublicKeyFactory.pas

@@ -34,9 +34,8 @@ uses
   ClpX509ObjectIdentifiers,
   ClpX9ObjectIdentifiers,
   ClpOiwObjectIdentifiers,
-  ClpX9Asn1Objects,
-  ClpIX9Asn1Objects,
   ClpIX9ECAsn1Objects,
+  ClpX9ECAsn1Objects,
   ClpAsn1Objects,
   ClpIECC,
   ClpIECDomainParameters,

CryptoLib/src/Factories/ClpSubjectPublicKeyInfoFactory.pas

@@ -38,8 +38,6 @@ uses
   ClpIDsaParameters,
   ClpIX509Asn1Objects,
   ClpX509Asn1Objects,
-  ClpX9Asn1Objects,
-  ClpIX9Asn1Objects,
   ClpX9ECAsn1Objects,
   ClpIX9ECAsn1Objects,
   ClpCryptoLibTypes;

CryptoLib/src/Interfaces/Asn1/X9/ClpIX9Asn1Objects.pas

@@ -26,21 +26,6 @@ uses
   ClpIAsn1Objects;
 
 type
-  /// <summary>
-  /// Interface for X962Parameters.
-  /// </summary>
-  IX962Parameters = interface(IAsn1Encodable)
-    ['{D1E2F3A4-B5C6-7890-DEF1-23456789ABCD}']
-
-    function GetParameters: IAsn1Object;
-    function GetNamedCurve: IDerObjectIdentifier;
-    function IsImplicitlyCA: Boolean;
-    function IsNamedCurve: Boolean;
-
-    property Parameters: IAsn1Object read GetParameters;
-    property NamedCurve: IDerObjectIdentifier read GetNamedCurve;
-  end;
-
   /// <summary>
   /// Interface for DHValidationParms.
   /// </summary>

CryptoLib/src/Interfaces/Asn1/X9/ClpIX9ECAsn1Objects.pas

@@ -107,6 +107,21 @@ type
     property BaseEntry: IX9ECPoint read GetBaseEntry;
   end;
 
+  /// <summary>
+  /// Interface for X962Parameters.
+  /// </summary>
+  IX962Parameters = interface(IAsn1Encodable)
+    ['{D1E2F3A4-B5C6-7890-DEF1-23456789ABCD}']
+
+    function GetParameters: IAsn1Object;
+    function GetNamedCurve: IDerObjectIdentifier;
+    function IsImplicitlyCA: Boolean;
+    function IsNamedCurve: Boolean;
+
+    property Parameters: IAsn1Object read GetParameters;
+    property NamedCurve: IDerObjectIdentifier read GetNamedCurve;
+  end;
+
 implementation
 
 end.