Pss/Rsa Signer cleanup

Author: Xor-el

CryptoLib/src/Crypto/Signers/ClpPssSigner.pas

@@ -25,6 +25,7 @@ interface
   ClpIXof,
   ClpICipherParameters,
   ClpIAsymmetricBlockCipher,
+  ClpPrehash,
   ClpIDigest,
   ClpISigner,
   ClpIPssSigner,
@@ -142,9 +143,6 @@   TPssSigner = class(TInterfacedObject, ISigner, IPssSigner)
 
 implementation
 
-uses
-  ClpPrehash;
-
 { TPssSigner }
 
 class function TPssSigner.CreateRawSigner(const ACipher: IAsymmetricBlockCipher;
@@ -193,7 +191,6 @@ constructor TPssSigner.Create(const ACipher: IAsymmetricBlockCipher;
   const ADigest: IDigest; const ASalt: TCryptoLibByteArray);
 begin
   Create(ACipher, ADigest, ADigest, ADigest, System.Length(ASalt), ASalt, TrailerImplicit);
-  //Create(ACipher, ADigest.Clone, ADigest.Clone, ADigest.Clone, System.Length(ASalt), ASalt, TrailerImplicit);
 end;
 
 constructor TPssSigner.Create(const ACipher: IAsymmetricBlockCipher;

CryptoLib/src/Crypto/Signers/ClpRsaDigestSigner.pas

@@ -44,6 +44,7 @@ interface
   ClpPkcsObjectIdentifiers,
   ClpTeleTrusTObjectIdentifiers,
   ClpArrayUtilities,
+  ClpCollectionUtilities,
   ClpCryptoLibTypes;
 
 resourcestring
@@ -143,16 +144,10 @@ implementation
 end;
 
 constructor TRsaDigestSigner.Create(const ADigest: IDigest);
-var
-  LOid: IDerObjectIdentifier;
 begin
-  if FOidMap.TryGetValue(ADigest.AlgorithmName, LOid) then
-    Create(ADigest, LOid)
-  else
-  begin
-    LOid := nil;
-    Create(ADigest, LOid);
-  end;
+  Create(ADigest,
+    TCollectionUtilities.GetValueOrNull<String, IDerObjectIdentifier>(
+      FOidMap, ADigest.AlgorithmName));
 end;
 
 constructor TRsaDigestSigner.Create(const ADigest: IDigest;
@@ -350,7 +345,7 @@ function TRsaDigestSigner.DerEncode(const ADigestAlgID: IAlgorithmIdentifier;
 var
   LDigestInfo: IDigestInfo;
 begin
-  LDigestInfo := TDigestInfo.Create(ADigestAlgID, TDerOctetString.WithContents(AHash) as IAsn1OctetString);
+  LDigestInfo := TDigestInfo.Create(ADigestAlgID, TDerOctetString.WithContents(AHash));
   Result := LDigestInfo.GetDerEncoded();
 end;