uses cleanup

CryptoLib.Tests/src/Asn1/OctetStringTests.pas

@@ -31,8 +31,6 @@ uses
 {$ELSE}
   TestFramework,
 {$ENDIF FPC}
-  ClpAsn1Objects,
-  ClpIAsn1Objects,
   ClpIAsn1Parsers,
   ClpAsn1Parsers,
   ClpIAsn1Generators,

CryptoLib.Tests/src/Asn1/X509/X509AltTests.pas

@@ -24,7 +24,7 @@ interface
 {$ENDIF FPC}
 
 uses
-  SysUtils,
+
 {$IFDEF FPC}
   fpcunit,
   testregistry,

CryptoLib.Tests/src/Crypto/AESTests.pas

@@ -46,21 +46,15 @@ uses
   ClpNistObjectIdentifiers,
   ClpCbcBlockCipher,
   ClpCfbBlockCipher,
-  ClpCtsBlockCipher,
   ClpOfbBlockCipher,
   ClpSicBlockCipher,
   ClpICbcBlockCipher,
   ClpICfbBlockCipher,
-  ClpICtsBlockCipher,
   ClpIOfbBlockCipher,
   ClpISicBlockCipher,
   ClpIBlockCipher,
   ClpBufferedBlockCipher,
   ClpIBufferedBlockCipher,
-  // ClpPaddedBufferedBlockCipher,
-  // ClpIPaddedBufferedBlockCipher,
-  // ClpPaddingModes,
-  // ClpIPaddingModes,
   ClpCryptoLibTypes,
   CryptoLibTestBase;
 

CryptoLib.Tests/src/Crypto/CTSTests.pas

@@ -37,31 +37,15 @@ uses
   ClpKeyParameter,
   ClpParametersWithIV,
   ClpIParametersWithIV,
-  // ClpIBufferedCipher,
   ClpIBufferedBlockCipher,
-  // ClpICipherKeyGenerator,
   ClpICipherParameters,
-  // ClpGeneratorUtilities,
-  // ClpParameterUtilities,
-  // ClpCipherUtilities,
-  // ClpNistObjectIdentifiers,
   ClpCbcBlockCipher,
-  ClpCfbBlockCipher,
   ClpCtsBlockCipher,
-  ClpOfbBlockCipher,
   ClpSicBlockCipher,
   ClpICbcBlockCipher,
-  ClpICfbBlockCipher,
   ClpICtsBlockCipher,
-  ClpIOfbBlockCipher,
   ClpISicBlockCipher,
   ClpIBlockCipher,
-  // ClpBufferedBlockCipher,
-  // ClpIBufferedBlockCipher,
-  // ClpPaddedBufferedBlockCipher,
-  // ClpIPaddedBufferedBlockCipher,
-  // ClpPaddingModes,
-  // ClpIPaddingModes,
   ClpCryptoLibTypes,
   CryptoLibTestBase;
 

CryptoLib.Tests/src/Crypto/DSATests.pas

@@ -37,8 +37,6 @@ uses
   ClpIDsaParameters,
   ClpDsaParameters,
   ClpIECC,
-  ClpIX509Asn1Objects,
-  ClpX509Asn1Objects,
   ClpECC,
   ClpECDomainParameters,
   ClpIECDomainParameters,

CryptoLib.Tests/src/Crypto/SPECKTests.pas

@@ -41,14 +41,8 @@ uses
   ClpIBufferedCipher,
   ClpICipherParameters,
   ClpCbcBlockCipher,
-  ClpCfbBlockCipher,
-  ClpCtsBlockCipher,
-  ClpOfbBlockCipher,
   ClpSicBlockCipher,
   ClpICbcBlockCipher,
-  ClpICfbBlockCipher,
-  ClpICtsBlockCipher,
-  ClpIOfbBlockCipher,
   ClpISicBlockCipher,
   ClpIBlockCipher,
   ClpBufferedBlockCipher,

CryptoLib.Tests/src/Math/EC/Rfc7748/X25519Tests.pas

@@ -34,8 +34,6 @@ uses
   ClpSecureRandom,
   ClpISecureRandom,
   ClpX25519,
-  ClpArrayUtilities,
-  ClpCryptoLibTypes,
   CryptoLibTestBase;
 
 type

CryptoLib.Tests/src/Math/EC/Rfc8032/Ed25519Tests.pas

@@ -35,10 +35,7 @@ uses
   ClpEd25519,
   ClpSecureRandom,
   ClpISecureRandom,
-  ClpEncoders,
-  ClpArrayUtilities,
   ClpConverters,
-  ClpCryptoLibTypes,
   CryptoLibTestBase;
 
 type

CryptoLib.Tests/src/Math/ECIESTests.pas

@@ -67,15 +67,7 @@ uses
   ClpECIESPublicKeyParser,
   ClpIECIESPublicKeyParser,
   ClpCbcBlockCipher,
-  ClpCfbBlockCipher,
-  ClpCtsBlockCipher,
-  ClpOfbBlockCipher,
-  ClpSicBlockCipher,
   ClpICbcBlockCipher,
-  ClpICfbBlockCipher,
-  ClpICtsBlockCipher,
-  ClpIOfbBlockCipher,
-  ClpISicBlockCipher,
   ClpKeyEncoder,
   ClpIKeyEncoder,
   ClpAesEngine,

CryptoLib.Tests/src/Math/IESCipherTests.pas

@@ -39,44 +39,20 @@ uses
   ClpICipherParameters,
   ClpIIESParameters,
   ClpIIESWithCipherParameters,
-  ClpIESParameters,
+
   ClpIESWithCipherParameters,
   ClpParametersWithIV,
   ClpIParametersWithIV,
-  // ClpKeyParameter,
-  // ClpIKeyParameter,
-  // ClpParametersWithIV,
-  // ClpIParametersWithIV,
   ClpIBufferedBlockCipher,
-  // ClpParameterUtilities,
-  // ClpCipherUtilities,
   ClpCbcBlockCipher,
-  ClpCfbBlockCipher,
-  ClpCtsBlockCipher,
-  ClpOfbBlockCipher,
-  ClpSicBlockCipher,
   ClpICbcBlockCipher,
-  ClpICfbBlockCipher,
-  ClpICtsBlockCipher,
-  ClpIOfbBlockCipher,
-  ClpISicBlockCipher,
   ClpPaddedBufferedBlockCipher,
   ClpECDHBasicAgreement,
   ClpIECDHBasicAgreement,
   ClpIESEngine,
   ClpIIESEngine,
-  ClpISO10126d2Padding,
-  ClpISO7816d4Padding,
   ClpPkcs7Padding,
-  ClpTBCPadding,
-  ClpX923Padding,
-  ClpZeroBytePadding,
-  ClpIISO10126d2Padding,
-  ClpIISO7816d4Padding,
   ClpIPkcs7Padding,
-  ClpITBCPadding,
-  ClpIX923Padding,
-  ClpIZeroBytePadding,
   ClpKdf2BytesGenerator,
   ClpIKdf2BytesGenerator,
   ClpIX9ECAsn1Objects,
@@ -87,8 +63,6 @@ uses
   ClpSecureRandom,
   ClpISecureRandom,
   ClpIAsymmetricCipherKeyPair,
-  ClpIECPublicKeyParameters,
-  ClpIECPrivateKeyParameters,
   ClpIIesCipherParameters,
   ClpIesCipherParameters,
   ClpIBufferedCipher,

CryptoLib.Tests/src/Math/PascalCoinECIESTests.pas

@@ -19,14 +19,12 @@ uses
   ClpIESEngine,
   ClpIIESEngine,
   ClpIKeyParser,
-  ClpIECIESPublicKeyParser,
   ClpECIESPublicKeyParser,
   ClpIEphemeralKeyPairGenerator,
   ClpEphemeralKeyPairGenerator,
   ClpIECKeyPairGenerator,
   ClpECKeyPairGenerator,
   ClpECKeyGenerationParameters,
-  ClpIECKeyGenerationParameters,
   ClpIKeyEncoder,
   ClpKeyEncoder,
   ClpIECDHBasicAgreement,
@@ -42,42 +40,21 @@ uses
   ClpIBufferedBlockCipher,
   ClpPaddedBufferedBlockCipher,
   ClpCbcBlockCipher,
-  ClpCfbBlockCipher,
-  ClpCtsBlockCipher,
-  ClpOfbBlockCipher,
-  ClpSicBlockCipher,
   ClpICbcBlockCipher,
-  ClpICfbBlockCipher,
-  ClpICtsBlockCipher,
-  ClpIOfbBlockCipher,
-  ClpISicBlockCipher,
   ClpAesEngine,
   ClpIAesEngine,
   ClpBigInteger,
   ClpCustomNamedCurves,
   ClpDigestUtilities,
   ClpICipherParameters,
-  ClpIIESParameters,
   ClpIIESWithCipherParameters,
-  ClpIESParameters,
   ClpIESWithCipherParameters,
   ClpParametersWithIV,
-  ClpIParametersWithIV,
   ClpIPascalCoinIESEngine,
   ClpPascalCoinIESEngine,
   ClpPascalCoinECIESKdfBytesGenerator,
   ClpIPascalCoinECIESKdfBytesGenerator,
-  ClpISO10126d2Padding,
-  ClpISO7816d4Padding,
-  ClpPkcs7Padding,
-  ClpTBCPadding,
-  ClpX923Padding,
   ClpZeroBytePadding,
-  ClpIISO10126d2Padding,
-  ClpIISO7816d4Padding,
-  ClpIPkcs7Padding,
-  ClpITBCPadding,
-  ClpIX923Padding,
   ClpIZeroBytePadding,
   ClpIMac,
   ClpMacUtilities,

CryptoLib.Tests/src/Others/CertTests.pas

@@ -40,13 +40,11 @@ uses
   ClpX509Asn1Objects,
   ClpIX509Asn1Objects,
   ClpIX509Extension,
-  ClpX509Certificate,
   ClpIX509Certificate,
   ClpX509CertificateParser,
   ClpIX509CertificateParser,
   ClpX509CrlParser,
   ClpIX509CrlParser,
-  ClpX509Crl,
   ClpIX509Crl,
   ClpX509Generators,
   ClpIX509Generators,
@@ -56,18 +54,12 @@ uses
   ClpIRsaKeyParameters,
   ClpRsaPrivateCrtKeyParameters,
   ClpIRsaPrivateCrtKeyParameters,
-  ClpDsaParameters,
-  ClpIDsaParameters,
   ClpDsaParametersGenerator,
   ClpIDsaParametersGenerator,
   ClpDsaKeyGenerationParameters,
   ClpIDsaKeyGenerationParameters,
   ClpRsaKeyGenerationParameters,
   ClpIRsaKeyGenerationParameters,
-  ClpDsaPrivateKeyParameters,
-  ClpIDsaPrivateKeyParameters,
-  ClpDsaPublicKeyParameters,
-  ClpIDsaPublicKeyParameters,
   ClpIAsymmetricKeyParameter,
   ClpIAsymmetricCipherKeyPairGenerator,
   ClpIAsymmetricCipherKeyPair,

CryptoLib.Tests/src/Others/ECTests.pas

@@ -54,7 +54,6 @@ uses
   ClpIECKeyGenerationParameters,
   ClpECKeyGenerationParameters,
   ClpIAsymmetricCipherKeyPair,
-  ClpCustomNamedCurves,
   ClpECC,
   ClpIECC,
   ClpBigInteger,

CryptoLib.Tests/src/Others/Ed25519HigherLevelTests.pas

@@ -49,7 +49,6 @@ uses
   ClpISecureRandom,
   ClpICipherParameters,
   ClpArrayUtilities,
-  ClpEncoders,
   ClpStringUtilities,
   ClpCryptoLibTypes,
   CryptoLibTestBase;

CryptoLib.Tests/src/Others/X25519HigherLevelTests.pas

@@ -40,8 +40,6 @@ uses
   ClpIAsymmetricCipherKeyPair,
   ClpSecureRandom,
   ClpISecureRandom,
-  ClpArrayUtilities,
-  ClpCryptoLibTypes,
   CryptoLibTestBase;
 
 type

CryptoLib.Tests/src/X509/X509CertGenTests.pas

@@ -36,8 +36,6 @@ uses
   ClpBigInteger,
   ClpX509Asn1Objects,
   ClpIX509Asn1Objects,
-  ClpIX509Extension,
-  ClpX509Certificate,
   ClpIX509Certificate,
   ClpX509CertificateParser,
   ClpIX509CertificateParser,
@@ -55,14 +53,9 @@ uses
   ClpIDsaPrivateKeyParameters,
   ClpDsaPublicKeyParameters,
   ClpIDsaPublicKeyParameters,
-  ClpECDomainParameters,
   ClpIECDomainParameters,
-  ClpECPublicKeyParameters,
   ClpIECPublicKeyParameters,
-  ClpECPrivateKeyParameters,
   ClpIECPrivateKeyParameters,
-  ClpIAsymmetricKeyParameter,
-  ClpECNamedCurveTable,
   ClpIX9ECAsn1Objects,
   ClpRsaDigestSigner,
   ClpIRsaDigestSigner,

CryptoLib/src/Asn1/ClpAsn1Core.pas

@@ -28,7 +28,6 @@ uses
   ClpStreams,
   ClpCryptoLibTypes,
   ClpIAsn1Core,
-  ClpIAsn1Objects,
   ClpIAsn1Encodings,
   ClpBitOperations,
   ClpAsn1Tags,

CryptoLib/src/Asn1/ClpAsn1Streams.pas

@@ -29,7 +29,6 @@ uses
   ClpIAsn1Encodings,
   ClpIAsn1Objects,
   ClpIAsn1Parsers,
-  ClpAsn1Encodings,
   ClpAsn1Tags,
   ClpBitOperations,
   ClpPlatformUtilities,

CryptoLib/src/Asn1/Pkcs/ClpPkcsAsn1Objects.pas

@@ -23,7 +23,6 @@ interface
 
 uses
   SysUtils,
-  ClpBigInteger,
   ClpAsn1Objects,
   ClpIAsn1Objects,
   ClpAsn1Core,
@@ -33,7 +32,6 @@ uses
   ClpX509Asn1Objects,
   ClpIX509Asn1Objects,
   ClpPkcsObjectIdentifiers,
-  ClpOiwObjectIdentifiers,
   ClpCryptoLibTypes,
   ClpAsn1Utilities,
   ClpPlatformUtilities;

CryptoLib/src/Asn1/X509/ClpX509Asn1Generators.pas

@@ -32,10 +32,8 @@ uses
   ClpX509Asn1Objects,
   ClpIX509Extension,
   ClpX509Extension,
-  ClpRfc5280Asn1Utilities,
   ClpCryptoLibTypes,
   ClpAsn1Comparers,
-  ClpCryptoLibComparers,
   ClpIX509Asn1Generators;
 
 type

CryptoLib/src/Asn1/X509/ClpX509Asn1Objects.pas

@@ -24,7 +24,6 @@ interface
 uses
   SysUtils,
   DateUtils,
-  Classes,
   Generics.Collections,
   SyncObjs,
   ClpAsn1Tags,

CryptoLib/src/Asn1/X509/ClpX509SignatureUtilities.pas

@@ -30,9 +30,7 @@ uses
   ClpIX509Asn1Objects,
   ClpX509Asn1Objects,
   ClpPkcsObjectIdentifiers,
-  ClpIPkcsAsn1Objects,
   ClpIPkcsRsaAsn1Objects,
-  ClpPkcsAsn1Objects,
   ClpPkcsRsaAsn1Objects,
   ClpX9ObjectIdentifiers,
   ClpNistObjectIdentifiers,

CryptoLib/src/Asn1/X9/ClpX9DHAsn1Objects.pas

@@ -28,8 +28,6 @@ uses
   ClpAsn1Core,
   ClpIAsn1Core,
   ClpIX9DHAsn1Objects,
-  ClpIX9ECAsn1Objects,
-  ClpX9ECAsn1Objects,
   ClpCryptoLibTypes,
   ClpAsn1Utilities;
 

CryptoLib/src/Asn1/X9/ClpX9ECAsn1Objects.pas

@@ -316,9 +316,6 @@ type
 
 implementation
 
-uses
-  ClpFiniteFields;
-
 { TX9FieldID }
 
 class function TX9FieldID.GetInstance(AObj: TObject): IX9FieldID;

CryptoLib/src/Crypto/Ciphers/ClpBufferedIesCipher.pas

@@ -24,8 +24,6 @@ interface
 uses
   Math,
   SysUtils,
-  ClpIBufferedCipher,
-  ClpIBufferedCipherBase,
   ClpICipherParameters,
   ClpIIESEngine,
   ClpIIESParameters,

CryptoLib/src/Crypto/Ciphers/ClpCipherUtilities.pas

@@ -91,7 +91,6 @@ uses
   ClpIAsymmetricBlockCipher,
   ClpBufferedIesCipher,
   ClpIESEngine,
-  ClpIIESEngine,
   ClpECDHBasicAgreement,
   ClpIECDHBasicAgreement,
   ClpKdf2BytesGenerator,

CryptoLib/src/Crypto/Ciphers/ClpCtsBlockCipher.pas

@@ -24,7 +24,6 @@ interface
 uses
   SysUtils,
   ClpIBlockCipher,
-  ClpIBufferedBlockCipher,
   ClpICtsBlockCipher,
   ClpICbcBlockCipher,
   ClpICfbBlockCipher,

CryptoLib/src/Crypto/EC/ClpCustomNamedCurves.pas

@@ -30,7 +30,6 @@ uses
   ClpGlvTypeBParameters,
   ClpIGlvTypeBEndomorphism,
   ClpSecObjectIdentifiers,
-  ClpCryptLibObjectIdentifiers,
   ClpCryptoLibTypes,
   ClpBigInteger,
   ClpECC,

CryptoLib/src/Crypto/Paddings/ClpPaddedBufferedBlockCipher.pas

@@ -26,18 +26,8 @@ uses
   Math,
   ClpCheck,
   ClpIBlockCipher,
-  ClpISO10126d2Padding,
-  ClpIISO10126d2Padding,
-  ClpISO7816d4Padding,
-  ClpIISO7816d4Padding,
   ClpPkcs7Padding,
   ClpIPkcs7Padding,
-  ClpTBCPadding,
-  ClpITBCPadding,
-  ClpX923Padding,
-  ClpIX923Padding,
-  ClpZeroBytePadding,
-  ClpIZeroBytePadding,
   ClpBufferedBlockCipher,
   ClpIPaddedBufferedBlockCipher,
   ClpIBlockCipherPadding,

CryptoLib/src/Crypto/Parameters/ClpIesCipherParameters.pas

@@ -24,8 +24,7 @@ interface
 uses
   ClpICipherParameters,
   ClpIIESParameters,
-  ClpIIesCipherParameters,
-  ClpCryptoLibTypes;
+  ClpIIesCipherParameters;
 
 type
   TIesCipherParameters = class sealed(TInterfacedObject, IIesCipherParameters,

CryptoLib/src/Crypto/Signers/ClpDsaDigestSigner.pas

@@ -22,7 +22,6 @@ unit ClpDsaDigestSigner;
 interface
 
 uses
-
   SysUtils,
   ClpIDsa,
   ClpIDigest,
@@ -30,10 +29,8 @@ uses
   ClpCryptoLibTypes,
   ClpParameterUtilities,
   ClpStandardDsaEncoding,
-  ClpPlainDsaEncoding,
   ClpIDsaEncoding,
   ClpIStandardDsaEncoding,
-  ClpIPlainDsaEncoding,
   ClpIAsymmetricKeyParameter,
   ClpICipherParameters,
   ClpISigner,

CryptoLib/src/Crypto/Signers/ClpSignerUtilities.pas

@@ -60,10 +60,7 @@ uses
   ClpISigner,
   ClpISecureRandom,
   ClpIAsn1Objects,
-  ClpStandardDsaEncoding,
   ClpPlainDsaEncoding,
-  ClpIDsaEncoding,
-  ClpIStandardDsaEncoding,
   ClpIPlainDsaEncoding,
   ClpRsaDigestSigner,
   ClpPssSigner,
@@ -76,7 +73,6 @@ uses
   ClpPkcsObjectIdentifiers,
   ClpStringUtilities,
   ClpCryptoLibTypes,
-  ClpPkcsAsn1Objects,
   ClpPkcsRsaAsn1Objects,
   ClpX509Asn1Objects;
 

CryptoLib/src/Crypto/Signers/SignerEncodings/ClpPlainDsaEncoding.pas

@@ -26,7 +26,6 @@ uses
   ClpBigInteger,
   ClpIDsaEncoding,
   ClpIPlainDsaEncoding,
-  ClpIAsn1Objects,
   ClpArrayUtilities,
   ClpBigIntegers,
   ClpCryptoLibTypes;

CryptoLib/src/Factories/ClpPrivateKeyFactory.pas

@@ -46,7 +46,6 @@ uses
   ClpIDsaParameters,
   ClpIX509Asn1Objects,
   ClpIX509DsaAsn1Objects,
-  ClpX509Asn1Objects,
   ClpX509DsaAsn1Objects,
   ClpSecECAsn1Objects,
   ClpISecECAsn1Objects,

CryptoLib/src/Factories/ClpSubjectPublicKeyInfoFactory.pas

@@ -42,7 +42,6 @@ uses
   ClpX509Asn1Objects,
   ClpX509RsaAsn1Objects,
   ClpX509DsaAsn1Objects,
-  ClpX9ECAsn1Objects,
   ClpIX9ECAsn1Objects,
   ClpCryptoLibTypes;
 

CryptoLib/src/Interfaces/Asn1/ClpIAsn1Objects.pas

@@ -26,7 +26,6 @@ uses
   ClpCryptoLibTypes,
   ClpBigInteger,
   ClpIAsn1Core,
-  ClpIAsn1Encodings,
   ClpIAsn1Parsers;
 
 type

CryptoLib/src/Interfaces/Asn1/Pkcs/ClpIPkcsRsaAsn1Objects.pas

@@ -25,8 +25,7 @@ uses
   ClpIAsn1Objects,
   ClpIAsn1Core,
   ClpIX509Asn1Objects,
-  ClpBigInteger,
-  ClpCryptoLibTypes;
+  ClpBigInteger;
 
 type
   /// <summary>

CryptoLib/src/Interfaces/Asn1/X509/ClpIX509DsaAsn1Objects.pas

@@ -22,10 +22,8 @@ unit ClpIX509DsaAsn1Objects;
 interface
 
 uses
-  ClpIAsn1Objects,
   ClpIAsn1Core,
-  ClpBigInteger,
-  ClpCryptoLibTypes;
+  ClpBigInteger;
 
 type
   /// <summary>

CryptoLib/src/Interfaces/Asn1/X509/ClpIX509RsaAsn1Objects.pas

@@ -22,7 +22,6 @@ unit ClpIX509RsaAsn1Objects;
 interface
 
 uses
-  ClpIAsn1Objects,
   ClpIAsn1Core,
   ClpBigInteger,
   ClpCryptoLibTypes;

CryptoLib/src/Interfaces/Crypto/Parameters/ClpIIesWithCipherParameters.pas

@@ -22,8 +22,7 @@ unit ClpIIesWithCipherParameters;
 interface
 
 uses
-  ClpIIESParameters,
-  ClpCryptoLibTypes;
+  ClpIIESParameters;
 
 type
 

CryptoLib/src/Interfaces/Crypto/Signers/SignerEncodings/ClpIStandardDsaEncoding.pas

@@ -24,8 +24,7 @@ interface
 uses
   ClpBigInteger,
   ClpIDsaEncoding,
-  ClpIAsn1Objects,
-  ClpCryptoLibTypes;
+  ClpIAsn1Objects;
 
 type
   IStandardDsaEncoding = interface(IDsaEncoding)

CryptoLib/src/Interfaces/X509/ClpIAttributeCertificateHolder.pas

@@ -22,7 +22,6 @@ unit ClpIAttributeCertificateHolder;
 interface
 
 uses
-  ClpIAsn1Objects,
   ClpIX509Asn1Objects,
   ClpIX509Certificate,
   ClpBigInteger,

CryptoLib/src/Interfaces/X509/ClpIAttributeCertificateIssuer.pas

@@ -23,7 +23,6 @@ interface
 
 uses
   ClpIAsn1Core,
-  ClpIAsn1Objects,
   ClpIX509Asn1Objects,
   ClpIX509Certificate,
   ClpCryptoLibTypes;

CryptoLib/src/Interfaces/X509/ClpIX509Attribute.pas

@@ -23,7 +23,6 @@ interface
 
 uses
   ClpIAsn1Core,
-  ClpIAsn1Objects,
   ClpCryptoLibTypes;
 
 type

CryptoLib/src/Interfaces/X509/ClpIX509Crl.pas

@@ -22,7 +22,6 @@ unit ClpIX509Crl;
 interface
 
 uses
-  ClpIAsn1Objects,
   ClpIX509Asn1Objects,
   ClpIX509CrlEntry,
   ClpIX509Certificate,

CryptoLib/src/Interfaces/X509/ClpIX509Generators.pas

@@ -22,7 +22,6 @@ unit ClpIX509Generators;
 interface
 
 uses
-  SysUtils,
   ClpCryptoLibTypes,
   ClpBigInteger,
   ClpIAsn1Core,

CryptoLib/src/Interfaces/X509/ClpIX509V2AttributeCertificate.pas

@@ -22,8 +22,6 @@ unit ClpIX509V2AttributeCertificate;
 interface
 
 uses
-  SysUtils,
-  ClpIAsn1Core,
   ClpIX509Asn1Objects,
   ClpIX509Extension,
   ClpIAsymmetricKeyParameter,

CryptoLib/src/Math/EC/ClpECC.pas

@@ -26,8 +26,6 @@ uses
   SyncObjs,
   SysUtils,
   Generics.Collections,
-  ClpNat,
-  ClpMod,
   ClpArrayUtilities,
   ClpIPreCompCallback,
   ClpCryptoLibTypes,

CryptoLib/src/Math/Raw/ClpNat320.pas

@@ -23,10 +23,8 @@ interface
 
 uses
   SysUtils,
-  ClpNat,
   ClpPack,
   ClpBigInteger,
-  ClpBitOperations,
   ClpCryptoLibTypes;
 
 type

CryptoLib/src/Math/Raw/ClpNat384.pas

@@ -22,12 +22,8 @@ unit ClpNat384;
 interface
 
 uses
-  SysUtils,
   ClpNat,
   ClpNat192,
-  ClpPack,
-  ClpBigInteger,
-  ClpBitOperations,
   ClpCryptoLibTypes;
 
 type

CryptoLib/src/Math/Raw/ClpNat448.pas

@@ -27,7 +27,6 @@ uses
   ClpNat224,
   ClpPack,
   ClpBigInteger,
-  ClpBitOperations,
   ClpCryptoLibTypes;
 
 type

CryptoLib/src/Math/Raw/ClpNat512.pas

@@ -22,7 +22,6 @@ unit ClpNat512;
 interface
 
 uses
-  SysUtils,
   ClpNat,
   ClpNat256,
   ClpCryptoLibTypes;

CryptoLib/src/Misc/ClpBitOperations.pas

@@ -361,7 +361,6 @@ begin
 {$IFDEF FPC}
   Result := BsrDWord(AValue) xor ((System.SizeOf(UInt32) * 8) - 1);
   // this also works
-  //Result := ((SizeOf(UInt32) * 8) - 1) - BsrDWord(AValue);
   // Result := ((System.SizeOf(UInt32) * 8) - 1) - BsrDWord(AValue);
 {$ELSE}
   LN := 1;

CryptoLib/src/X509/ClpX509Crl.pas

@@ -42,7 +42,6 @@ uses
   ClpX509SignatureUtilities,
   ClpX509Utilities,
   ClpAsn1VerifierFactory,
-  ClpAsn1VerifierFactoryProvider,
   ClpAsn1Dumper,
   ClpAsn1Core,
   ClpAsn1Objects,

CryptoLib/src/X509/ClpX509V2AttributeCertificate.pas

@@ -28,7 +28,6 @@ uses
   ClpIAsn1Core,
   ClpIAsn1Objects,
   ClpIX509Asn1Objects,
-  ClpIX509Extension,
   ClpIX509Attribute,
   ClpIX509V2AttributeCertificate,
   ClpIAsymmetricKeyParameter,