some fpc compilation related fixes

CryptoLib/src/Asn1/ClpAsn1Objects.pas

@@ -1708,13 +1708,14 @@ type
     var
       FContents: TCryptoLibByteArray;
       FStart: Int32;
-    function GetValue(): TBigInteger;
-    function GetIntValueExact(): Int32;
+
     /// <summary>
     /// Class constructor to initialize static fields.
     /// </summary>
     class constructor Create;
   strict protected
+    function GetValue(): TBigInteger;
+    function GetIntValueExact(): Int32;
     function Asn1Equals(const AAsn1Object: IAsn1Object): Boolean; override;
     function Asn1GetHashCode(): Int32; override;
   public

CryptoLib/src/Asn1/ClpOidTokenizer.pas

@@ -22,7 +22,7 @@ unit ClpOidTokenizer;
 interface
 
 uses
-  StrUtils,
+  ClpStringUtilities,
   ClpIOidTokenizer;
 
 type
@@ -34,13 +34,13 @@ type
 
   strict private
   var
-    Foid: String;
-    Findex: Int32;
+    FOid: String;
+    FIndex: Int32;
 
     function GetHasMoreTokens: Boolean; inline;
 
   public
-    constructor Create(const oid: String);
+    constructor Create(const AOid: String);
 
     function NextToken(): String; inline;
 
@@ -52,41 +52,38 @@ implementation
 
 { TOidTokenizer }
 
-constructor TOidTokenizer.Create(const oid: String);
+constructor TOidTokenizer.Create(const AOid: String);
 begin
-  Foid := oid;
-  Findex := 1;
+  FOid := AOid;
+  FIndex := 1;
 end;
 
 function TOidTokenizer.GetHasMoreTokens: Boolean;
 begin
-  result := Findex <> 0;
+  Result := FIndex <> 0;
 end;
 
 function TOidTokenizer.NextToken: String;
 var
-  endPoint: Int32;
-  LNextToken, lastToken: string;
+  LEnd: Int32;
 begin
-  if (Findex = 0) then
+  if (FIndex = 0) then
   begin
-    result := '';
+    Result := '';
     Exit;
   end;
 
-  endPoint := PosEx('.', Foid, Findex);
+  LEnd := TStringUtilities.IndexOf(FOid, '.', FIndex);
 
-  if (endPoint = 0) then
+  if (LEnd = 0) then
   begin
-    lastToken := System.Copy(Foid, Findex, System.Length(Foid) - (Findex - 1));
-    Findex := 0;
-    result := lastToken;
+    Result := TStringUtilities.Substring(FOid, FIndex);
+    FIndex := 0;
     Exit;
   end;
 
-  LNextToken := System.Copy(Foid, Findex, endPoint - Findex);
-  Findex := endPoint + 1;
-  result := LNextToken;
+  Result := TStringUtilities.Substring(FOid, FIndex, LEnd - FIndex);
+  FIndex := LEnd + 1;
 end;
 
 end.

CryptoLib/src/Crypto/Ciphers/ClpCipherUtilities.pas

@@ -315,7 +315,7 @@ begin
     Exit;
 
   LAlgorithmName := UpperCase(TCollectionUtilities.GetValueOrKey<String>(FAlgorithmMap, LParts[0]));
-  if not TEnumUtilities.TryGetEnumValue<TCipherAlgorithm>(LAlgorithmName, LCipherAlgorithm) then
+  if not (TEnumUtilities.TryGetEnumValue<TCipherAlgorithm>(LAlgorithmName, LCipherAlgorithm)) then
     Exit;
 
   LBlockCipher := nil;
@@ -357,7 +357,7 @@ begin
       LCipherPadding := TCipherPadding.RAW
     else if LPaddingName = 'X9.23PADDING' then
       LCipherPadding := TCipherPadding.X923PADDING
-    else if not TEnumUtilities.TryGetEnumValue<TCipherPadding>(LPaddingName, LCipherPadding) then
+    else if not (TEnumUtilities.TryGetEnumValue<TCipherPadding>(LPaddingName, LCipherPadding)) then
       Exit;
 
     case LCipherPadding of
@@ -404,7 +404,7 @@ begin
 
     if LModeName = '' then
       LCipherMode := TCipherMode.NONE
-    else if not TEnumUtilities.TryGetEnumValue<TCipherMode>(LModeName, LCipherMode) then
+    else if not (TEnumUtilities.TryGetEnumValue<TCipherMode>(LModeName, LCipherMode)) then
       Exit;
 
     case LCipherMode of

CryptoLib/src/Crypto/Digests/ClpDigestUtilities.pas

@@ -191,7 +191,7 @@ var
   LDigestAlg: TDigestAlgorithm;
 begin
   Result := nil;
-  if not TEnumUtilities.TryGetEnumValue<TDigestAlgorithm>(AMechanism, LDigestAlg) then
+  if not (TEnumUtilities.TryGetEnumValue<TDigestAlgorithm>(AMechanism, LDigestAlg)) then
     Exit;
   case LDigestAlg of
     TDigestAlgorithm.BLAKE2B_160:

CryptoLib/src/Crypto/Generators/ClpRsaGenerators.pas

@@ -110,7 +110,7 @@ var
   LEIsKnownOddPrime: Boolean;
 begin
   LEIsKnownOddPrime := (AE.BitLength <= FSpecialEBits) and
-    TArrayUtilities.Contains<Int32>(FSpecialEValues, AE.Int32Value);
+    (TArrayUtilities.Contains<Int32>(FSpecialEValues, AE.Int32Value));
   while True do
   begin
     LP := TBigInteger.Create(ABitLength, 1, FParam.Random);

CryptoLib/src/Crypto/Parameters/ClpDHParameters.pas

@@ -252,8 +252,8 @@ begin
     Result := True;
     Exit;
   end;
-  Result := (Counter = AOther.Counter) and TArrayUtilities.AreEqual<Byte>(Seed,
-    AOther.Seed);
+  Result := (Counter = AOther.Counter) and (TArrayUtilities.AreEqual<Byte>(Seed,
+    AOther.Seed));
 end;
 
 function TDHValidationParameters.GetCounter: Int32;

CryptoLib/src/Crypto/Parameters/ClpECParameters.pas

@@ -65,6 +65,8 @@ type
     FG: IECPoint;
     Fn, FH, FHInv: TBigInteger;
 
+  strict protected
+
     function GetCurve: IECCurve; inline;
     function GetG: IECPoint; inline;
     function GetH: TBigInteger; inline;

CryptoLib/src/Packages/FPC/CryptoLib4PascalPackage.pas

@@ -10,139 +10,151 @@ interface
 uses
   ClpOidTokenizer, ClpCryptoProObjectIdentifiers, ClpECGost3410NamedCurves, 
   ClpNistObjectIdentifiers, ClpOiwObjectIdentifiers, ClpPkcsObjectIdentifiers, 
-  ClpRosstandartObjectIdentifiers, ClpSecNamedCurves, ClpSecObjectIdentifiers, 
-  ClpTeleTrusTObjectIdentifiers, ClpECNamedCurveTable, ClpX9ECParameters, 
-  ClpX9ECParametersHolder, ClpX9ObjectIdentifiers, ClpAsymmetricCipherKeyPair, 
-  ClpAsymmetricKeyParameter, ClpKeyGenerationParameters, 
-  ClpECKeyPairGenerator, ClpECDomainParameters, ClpECKeyGenerationParameters, 
-  ClpECKeyParameters, ClpECPrivateKeyParameters, ClpECPublicKeyParameters, 
-  ClpParametersWithRandom, ClpCryptoApiRandomGenerator, 
-  ClpDigestRandomGenerator, ClpDsaDigestSigner, ClpECDsaSigner, 
-  ClpRandomDsaKCalculator, ClpIAsymmetricCipherKeyPair, 
-  ClpIAsymmetricCipherKeyPairGenerator, ClpIAsymmetricKeyParameter, 
-  ClpICipherParameters, ClpICryptoApiRandomGenerator, 
-  ClpIDigestRandomGenerator, ClpIDsa, ClpIDsaDigestSigner, ClpIDsaKCalculator, 
-  ClpIECDomainParameters, ClpIECDsaSigner, ClpIECKeyGenerationParameters, 
-  ClpIECKeyPairGenerator, ClpIECKeyParameters, ClpIECPrivateKeyParameters, 
-  ClpIECPublicKeyParameters, ClpIExtensionField, ClpIFiniteField, 
-  ClpIFixedPointPreCompInfo, ClpIGenericPolynomialExtensionField, 
-  ClpIGF2Polynomial, ClpIGlvEndomorphism, ClpIGlvTypeBEndomorphism, 
-  ClpIGlvTypeBParameters, ClpIKeyGenerationParameters, ClpIOidTokenizer, 
-  ClpIParametersWithRandom, ClpIPolynomial, ClpIPolynomialExtensionField, 
-  ClpIPreCompInfo, ClpIPrimeField, ClpIRandom, ClpIRandomDsaKCalculator, 
-  ClpIRandomGenerator, ClpIRandomNumberGenerator, ClpIScaleXPointMap, 
-  ClpISecureRandom, ClpISigner, ClpIWNafPreCompInfo, ClpIWTauNafPreCompInfo, 
-  ClpIX9ECParameters, ClpIX9ECParametersHolder, ClpIZTauElement, 
-  ClpBigInteger, ClpECAlgorithms, ClpLongArray, ClpScaleXPointMap, 
+  ClpSecNamedCurves, ClpSecObjectIdentifiers, ClpTeleTrusTObjectIdentifiers, 
+  ClpECNamedCurveTable, ClpX9ECParametersHolder, ClpX9ObjectIdentifiers, 
+  ClpAsymmetricCipherKeyPair, ClpParametersWithRandom, ClpDsaDigestSigner, 
+  ClpECDsaSigner, ClpBigInteger, ClpECAlgorithms, ClpLongArray, 
   ClpSimpleBigDecimal, ClpTnaf, ClpZTauElement, ClpGlvTypeBEndomorphism, 
   ClpGlvTypeBParameters, ClpFixedPointPreCompInfo, ClpWNafPreCompInfo, 
   ClpWTauNafPreCompInfo, ClpFiniteFields, ClpGenericPolynomialExtensionField, 
-  ClpGF2Polynomial, ClpPrimeField, ClpMod, ClpNat, ClpDigestUtilities, 
-  ClpRandom, ClpSecureRandom, ClpSignerUtilities, ClpArrayUtils, 
-  ClpBigIntegers, ClpBitConverter, ClpBitUtilities, ClpConverters, ClpCryptoLibTypes, 
-  ClpTimes, ClpOSRandom, ClpRandomNumberGenerator, ClpSetWeakRef, 
-  ClpParameterUtilities, ClpGeneratorUtilities, ClpCipherUtilities, 
-  ClpIAesEngine, ClpIParametersWithIV, ClpIPaddedBufferedBlockCipher, 
-  ClpIKeyParameter, ClpIBufferedCipherBase, ClpIBufferedCipher, 
-  ClpIBufferedBlockCipher, ClpIBlockCipherPadding, ClpIBlockCipher, 
+  ClpGF2Polynomial, ClpPrimeField, ClpMod, ClpNat, 
   ClpPaddedBufferedBlockCipher, ClpParametersWithIV, ClpKeyParameter, 
-  ClpBufferedBlockCipher, ClpBufferedCipherBase, ClpCheck, ClpAesEngine, 
-  ClpPascalCoinECIESKdfBytesGenerator, ClpPascalCoinIESEngine, 
-  ClpBaseKdfBytesGenerator, ClpIESEngine, ClpECIESPublicKeyParser, 
-  ClpIESCipher, ClpECDHBasicAgreement, ClpEphemeralKeyPair, ClpKeyEncoder, 
-  ClpIESWithCipherParameters, ClpIESParameters, ClpEphemeralKeyPairGenerator, 
-  ClpKdf2BytesGenerator, ClpIso18033KdfParameters, ClpKdfParameters, 
-  ClpIIESWithCipherParameters, ClpIIESParameters, 
-  ClpIPascalCoinECIESKdfBytesGenerator, ClpIPascalCoinIESEngine, 
-  ClpIIESEngine, ClpIECIESPublicKeyParser, 
-  ClpIEphemeralKeyPairGenerator, ClpIEphemeralKeyPair, ClpIKeyParser, 
-  ClpIKdf2BytesGenerator, ClpIBaseKdfBytesGenerator, 
-  ClpIIso18033KdfParameters, ClpIKdfParameters, ClpIDerivationFunction, 
-  ClpIDerivationParameters, ClpIECDHBasicAgreement, ClpIBasicAgreement, 
-  ClpCipherKeyGenerator, ClpStringUtils, ClpICipherKeyGenerator, ClpIDigest, 
-  ClpIStreamCipher, ClpPkcs5S2ParametersGenerator, 
-  ClpIPkcs5S2ParametersGenerator, ClpIPbeParametersGenerator, 
+  ClpAesEngine, ClpPascalCoinECIESKdfBytesGenerator, ClpPascalCoinIesEngine, 
+  ClpBaseKdfBytesGenerator, ClpIesEngine, ClpECIESPublicKeyParser, 
+  ClpEphemeralKeyPair, ClpKeyEncoder, ClpIesParameters, 
+  ClpEphemeralKeyPairGenerator, ClpKdf2BytesGenerator, 
+  ClpIso18033KdfParameters, ClpKdfParameters, ClpIKeyParser, 
+  ClpCipherKeyGenerator, ClpPkcs5S2ParametersGenerator, 
   ClpPbeParametersGenerator, ClpHMac, ClpMiscObjectIdentifiers, 
-  ClpIanaObjectIdentifiers, ClpMacUtilities, ClpIMac, ClpIHMac, ClpDsaSigner, 
-  ClpDsaKeyPairGenerator, ClpECNRSigner, ClpDsaKeyGenerationParameters, 
-  ClpDsaPrivateKeyParameters, ClpDsaPublicKeyParameters, 
-  ClpDsaValidationParameters, ClpDsaParameters, ClpDsaKeyParameters, 
-  ClpIECNRSigner, ClpIDsaSigner, ClpIDsaKeyPairGenerator, 
-  ClpIDsaPrivateKeyParameters, ClpIDsaKeyGenerationParameters, 
-  ClpIDsaKeyParameters, ClpIDsaPublicKeyParameters, ClpIDsaParameters, 
-  ClpIDsaValidationParameters, ClpDigest, ClpECDHCBasicAgreement, 
-  ClpIECDHCBasicAgreement, ClpHMacDsaKCalculator, ClpIHMacDsaKCalculator, 
-  ClpHkdfBytesGenerator, ClpIHkdfBytesGenerator, ClpHkdfParameters, 
-  ClpIHkdfParameters, ClpDsaParameterGenerationParameters, 
-  ClpIDsaParameterGenerationParameters, ClpDsaParametersGenerator, 
-  ClpDsaParameter, ClpIDsaParameter, ClpIKeyEncoder, 
-  ClpIDsaParametersGenerator, ClpIPreCompCallBack, ClpNistNamedCurves, 
-  ClpNat256, ClpNat320, ClpAesLightEngine, ClpIAesLightEngine, 
-  ClpCustomNamedCurves, ClpNat384, ClpNat192, ClpNat512, ClpInterleave, 
-  ClpBsiObjectIdentifiers, ClpEacObjectIdentifiers, ClpIDsaExt, 
-  ClpISchnorrDigestSigner, ClpIECSchnorrSipaSigner, ClpECSchnorrSipaSigner, 
-  ClpSchnorrDigestSigner, ClpISchnorr, ClpISchnorrExt, ClpBlowfishEngine, 
-  ClpIBlowfishEngine, ClpECC, ClpAsn1Objects, ClpSignersEncodings, 
-  ClpISignersEncodings, ClpEncoders, ClpSecT283Custom, ClpSecP521R1Custom, 
-  ClpSecP384R1Custom, ClpSecP256R1Custom, ClpSecP256K1Custom, ClpIX9ECC, 
-  ClpX9ECC, ClpIAsn1Objects, ClpBlockCipherModes, ClpECCurveConstants, 
-  ClpIBlockCipherModes, ClpIPaddingModes, ClpISecP256K1Custom, 
-  ClpISecP256R1Custom, ClpISecP384R1Custom, ClpISecP521R1Custom, 
-  ClpISecT283Custom, ClpPaddingModes, ClpIECC, ClpISpeckEngine, 
-  ClpSpeckEngine, ClpIBufferedStreamCipher, ClpIChaChaEngine, 
-  ClpIXSalsa20Engine, ClpISalsa20Engine, ClpBufferedStreamCipher, 
-  ClpSalsa20Engine, ClpXSalsa20Engine, ClpChaChaEngine, ClpIRijndaelEngine, 
-  ClpRijndaelEngine, ClpCurve25519Custom, ClpICurve25519Custom, 
-  ClpSpeckLegacyEngine, ClpISpeckLegacyEngine, ClpIEd25519, ClpX25519Field, 
-  ClpEd25519, ClpX25519, ClpEdECObjectIdentifiers, ClpIEd25519PhSigner, 
-  ClpIEd25519CtxSigner, ClpIEd25519Signer, ClpIEd25519KeyGenerationParameters, 
-  ClpIX25519KeyGenerationParameters, ClpIEd25519KeyPairGenerator, 
-  ClpIX25519KeyPairGenerator, ClpIEd25519PrivateKeyParameters, 
-  ClpIEd25519PublicKeyParameters, ClpIX25519PublicKeyParameters, 
-  ClpIX25519PrivateKeyParameters, ClpIX25519Agreement, ClpIRawAgreement, 
-  ClpX25519Agreement, ClpEd25519KeyGenerationParameters, 
-  ClpX25519KeyGenerationParameters, ClpEd25519PublicKeyParameters, 
-  ClpEd25519PrivateKeyParameters, ClpX25519PublicKeyParameters, 
-  ClpX25519PrivateKeyParameters, ClpEd25519KeyPairGenerator, 
-  ClpX25519KeyPairGenerator, ClpEd25519PhSigner, ClpEd25519Signer, 
-  ClpEd25519CtxSigner, ClpTeleTrusTNamedCurves, ClpAgreementUtilities, 
-  ClpIKdf1BytesGenerator, ClpKdf1BytesGenerator, 
-  ClpIArgon2ParametersGenerator, ClpArgon2ParametersGenerator, 
-  ClpIScryptParametersGenerator, ClpScryptParametersGenerator, 
-  ClpIDHAgreement, ClpIDHBasicAgreement, ClpIDHBasicKeyPairGenerator, 
-  ClpIDHKeyPairGenerator, ClpIDHPrivateKeyParameters, 
-  ClpIDHPublicKeyParameters, ClpIDHParametersGenerator, 
-  ClpIDHKeyGenerationParameters, ClpIDHParameters, ClpIDHKeyGeneratorHelper, 
-  ClpIDHKeyParameters, ClpIDHValidationParameters, ClpIDHDomainParameters, 
-  ClpIDHValidationParams, ClpDHAgreement, ClpDHBasicAgreement, 
-  ClpDHBasicKeyPairGenerator, ClpDHKeyPairGenerator, ClpDHParametersGenerator, 
-  ClpDHKeyGeneratorHelper, ClpDHParametersHelper, ClpDHPrivateKeyParameters, 
-  ClpDHPublicKeyParameters, ClpDHKeyGenerationParameters, ClpDHKeyParameters, 
-  ClpDHValidationParameters, ClpDHParameters, ClpDHDomainParameters, 
-  ClpDHValidationParams, ClpAESPRNGRandom, ClpCryptLibObjectIdentifiers, 
-  ClpIEndoPreCompInfo, ClpEndoPreCompInfo, ClpScaleXNegateYPointMap, 
-  ClpScaleYNegateXPointMap, ClpGlvTypeAEndomorphism, ClpGlvTypeAParameters, 
-  ClpScalarSplitParameters, ClpIGlvTypeAParameters, ClpIGlvTypeAEndomorphism, 
-  ClpIScaleXNegateYPointMap, ClpIScaleYNegateXPointMap, 
-  ClpIScalarSplitParameters, ClpECCompUtilities, ClpValidityPreCompInfo, 
-  ClpIValidityPreCompInfo, ClpKMac, ClpIKMac, ClpMultipliers, ClpIPrehash, 
-  ClpIPssSigner, ClpIGenericSigner, ClpIAlgorithmIdentifier, 
-  ClpIAsymmetricBlockCipher, ClpIBufferedAsymmetricBlockCipher, 
-  ClpIDigestInfo, ClpIISO9796d1Encoding, ClpIOaepEncoding, ClpIPkcs1Encoding, 
-  ClpIRsa, ClpIRsaBlindedEngine, ClpIRsaBlindingEngine, 
-  ClpIRsaBlindingFactorGenerator, ClpIRsaBlindingParameters, 
-  ClpIRsaCoreEngine, ClpIRsaDigestSigner, ClpIRsaEngine, 
-  ClpIRsaKeyGenerationParameters, ClpIRsaKeyPairGenerator, 
-  ClpIRsaKeyParameters, ClpIRsaPrivateCrtKeyParameters, 
-  ClpRsaBlindingParameters, ClpRsaKeyGenerationParameters, 
-  ClpRsaKeyParameters, ClpRsaPrivateCrtKeyParameters, ClpISO9796d1Encoding, 
-  ClpOaepEncoding, ClpPkcs1Encoding, ClpRsaBlindedEngine, 
-  ClpRsaBlindingEngine, ClpRsaCoreEngine, ClpRsaEngine, ClpPssSigner, 
-  ClpGenericSigner, ClpRsaDigestSigner, ClpRsaBlindingFactorGenerator, 
-  ClpRsaKeyPairGenerator, ClpAlgorithmIdentifier, ClpDigestInfo, 
-  ClpX509ObjectIdentifiers, ClpPrehash, ClpDateTimeUtilities, 
-  ClpCollectionUtilities, ClpStreams, ClpPlatform, ClpAsn1Streams, 
-  ClpAsn1Utilities;
+  ClpIanaObjectIdentifiers, ClpDsaSigner, ClpECNRSigner, ClpDsaParameters, 
+  ClpDigest, ClpHkdfBytesGenerator, ClpHkdfParameters, ClpNistNamedCurves, 
+  ClpNat256, ClpNat320, ClpAesLightEngine, ClpCustomNamedCurves, ClpNat384, 
+  ClpNat192, ClpNat512, ClpInterleave, ClpBsiObjectIdentifiers, 
+  ClpEacObjectIdentifiers, ClpBlowfishEngine, ClpSecP521R1Custom, 
+  ClpSecP384R1Custom, ClpSecP256R1Custom, ClpSecP256K1Custom, 
+  ClpECCurveConstants, ClpSpeckEngine, ClpSalsa20Engine, ClpXSalsa20Engine, 
+  ClpChaChaEngine, ClpRijndaelEngine, ClpSpeckLegacyEngine, ClpX25519Field, 
+  ClpEd25519, ClpX25519, ClpEdECObjectIdentifiers, ClpEd25519PhSigner, 
+  ClpEd25519Signer, ClpEd25519CtxSigner, ClpTeleTrusTNamedCurves, 
+  ClpKdf1BytesGenerator, ClpArgon2ParametersGenerator, 
+  ClpScryptParametersGenerator, ClpDHKeyGeneratorHelper, 
+  ClpDHParametersHelper, ClpDHParameters, ClpCryptLibObjectIdentifiers, 
+  ClpEndoPreCompInfo, ClpScalarSplitParameters, ClpValidityPreCompInfo, 
+  ClpKMac, ClpMultipliers, ClpISO9796d1Encoding, ClpOaepEncoding, 
+  ClpPkcs1Encoding, ClpRsaBlindedEngine, ClpRsaBlindingEngine, 
+  ClpRsaCoreEngine, ClpRsaEngine, ClpPssSigner, ClpGenericSigner, 
+  ClpRsaDigestSigner, ClpX509ObjectIdentifiers, ClpPrehash, ClpAsn1Streams, 
+  ClpAsn1Utilities, ClpAsn1Objects, ClpX509Asn1Objects, ClpAsn1Encodings, 
+  ClpAsn1Dumper, ClpIetfUtilities, ClpX509NameEntryConverter, 
+  ClpX962NamedCurves, ClpX509Extension, ClpX9ECAsn1Objects, ClpAsn1Comparers, 
+  ClpX509SignatureUtilities, ClpX9IntegerConverter, ClpAsn1Core, 
+  ClpX9DHAsn1Objects, ClpX509Asn1Generators, ClpPkcsAsn1Objects, 
+  ClpAsn1Generators, ClpRfc5280Asn1Utilities, ClpX509RsaAsn1Objects, 
+  ClpX509DsaAsn1Objects, ClpPkcsRsaAsn1Objects, ClpSecECAsn1Objects, 
+  ClpX509DefaultEntryConverter, ClpAsn1Parsers, ClpAsn1Tags, 
+  ClpRosstandartObjectIdentifiers, ClpX509NameTokenizer, ClpSecureRandom, 
+  ClpDsaGenerators, ClpDigestUtilities, ClpSignerUtilities, 
+  ClpCipherUtilities, ClpECGenerators, ClpECParameters, 
+  ClpECDHCBasicAgreement, ClpECDHBasicAgreement, ClpECUtilities, 
+  ClpRsaGenerators, ClpDHGenerators, ClpGeneratorUtilities, 
+  ClpAsymmetricKeyParameter, ClpBufferedIesCipher, ClpDHAgreement, 
+  ClpEd25519Generators, ClpEd25519Parameters, ClpKeyGenerationParameters, 
+  ClpX25519Agreement, ClpX25519Generators, ClpX25519Parameters, 
+  ClpDHBasicAgreement, ClpRsaParameters, ClpX931Signer, ClpPlainDsaEncoding, 
+  ClpCtsBlockCipher, ClpBufferedStreamCipher, ClpBufferedBlockCipher, 
+  ClpISO7816d4Padding, ClpISO10126d2Padding, ClpTBCPadding, 
+  ClpZeroBytePadding, ClpX923Padding, ClpPkcs7Padding, ClpSicBlockCipher, 
+  ClpOfbBlockCipher, ClpCbcBlockCipher, ClpCfbBlockCipher, 
+  ClpStandardDsaEncoding, ClpAgreementUtilities, ClpMacUtilities, 
+  ClpBufferedCipherBase, ClpBufferedAsymmetricBlockCipher, 
+  ClpHMacDsaKCalculator, ClpParameterUtilities, 
+  ClpAsn1VerifierFactoryProvider, ClpAsn1VerifierFactory, 
+  ClpAsn1SignatureFactory, ClpAsn1DigestFactory, ClpDefaultVerifierResult, 
+  ClpRandomDsaKCalculator, ClpRandom, ClpIsoTrailers, ClpNoOpDigest, 
+  ClpDefaultSignatureResult, ClpDefaultSignatureCalculator, 
+  ClpDefaultDigestCalculator, ClpDigestSink, ClpDefaultDigestResult, 
+  ClpSignerSink, ClpDefaultVerifierCalculator, ClpCheck, ClpEncoders, 
+  ClpPrivateKeyFactory, ClpPublicKeyFactory, ClpSubjectPublicKeyInfoFactory, 
+  ClpArrayUtilities, ClpCollectionUtilities, ClpDateTimeUtilities, 
+  ClpEnumUtilities, ClpPlatformUtilities, ClpStringUtilities, 
+  ClpICfbBlockCipher, ClpIX509Asn1Objects, ClpIOfbBlockCipher, 
+  ClpIX509Asn1Generators, ClpIX509AttrCertParser, ClpISicBlockCipher, 
+  ClpICbcBlockCipher, ClpIX509CrlEntry, ClpICtsBlockCipher, 
+  ClpIX509Certificate, ClpIECCommon, ClpIX509NameBuilder, 
+  ClpIX509V2AttributeCertificate, ClpISecP521R1Custom, ClpISecP384R1Custom, 
+  ClpISecP256R1Custom, ClpISecP256K1Custom, ClpIFiniteField, 
+  ClpIFixedPointPreCompInfo, ClpIScalarSplitParameters, 
+  ClpIX509RsaAsn1Objects, ClpIX9ECAsn1Objects, ClpIWTauNafPreCompInfo, 
+  ClpIWNafPreCompInfo, ClpISecT283K1Custom, ClpIGlvTypeBEndomorphism, 
+  ClpIEndoPreCompInfo, ClpIECDsaSigner, ClpIECParameters, ClpIPrimeField, 
+  ClpIPolynomialExtensionField, ClpIPolynomial, ClpIGF2Polynomial, 
+  ClpIGenericPolynomialExtensionField, ClpIExtensionField, ClpIECFieldElement, 
+  ClpIValidityPreCompInfo, ClpIPreCompInfo, ClpIPreCompCallback, 
+  ClpIGlvTypeBParameters, ClpIZTauElement, ClpIPbeParametersGenerator, 
+  ClpIArgon2ParametersGenerator, ClpIPkcs5S2ParametersGenerator, 
+  ClpIAsymmetricKeyParameter, ClpIDHGenerators, ClpIDsaGenerators, 
+  ClpIECGenerators, ClpIEd25519Generators, ClpIEd25519Parameters, 
+  ClpIRsaGenerators, ClpIX25519Generators, ClpIX25519Parameters, 
+  ClpIDHAgreement, ClpIDHParameters, ClpIDsaParameters, ClpIIesParameters, 
+  ClpIRsaParameters, ClpIX509DsaAsn1Objects, ClpIX509Crl, ClpIX509Attribute, 
+  ClpIAttributeCertificateIssuer, ClpIAttributeCertificateHolder, 
+  ClpIX509Generators, ClpIAsn1Objects, ClpIPkcsRsaAsn1Objects, 
+  ClpIStandardDsaEncoding, ClpIParametersWithRandom, 
+  ClpIAsymmetricBlockCipher, ClpIBlockCipher, ClpIStreamCipher, 
+  ClpIBlockCipherPadding, ClpIX923Padding, ClpIPkcs7Padding, 
+  ClpIZeroBytePadding, ClpIDsaEncoding, ClpIPlainDsaEncoding, 
+  ClpIISO7816d4Padding, ClpIISO10126d2Padding, ClpITBCPadding, 
+  ClpIX509CrlParser, ClpIIesEngine, ClpIBufferedCipher, 
+  ClpIX9ECParametersHolder, ClpIAsn1Encodings, ClpIPascalCoinIesEngine, 
+  ClpIPkcsAsn1Objects, ClpISecECAsn1Objects, ClpIX9DHAsn1Objects, 
+  ClpIPkcs10CertificationRequest, ClpIAsn1Generators, 
+  ClpIX509NameEntryConverter, ClpIX509Extension, ClpIAsn1Parsers, 
+  ClpIX509NameTokenizer, ClpIRandomDsaKCalculator, ClpIECIESPublicKeyParser, 
+  ClpIPascalCoinECIESKdfBytesGenerator, ClpIAsn1Core, ClpIDsa, 
+  ClpIDsaKCalculator, ClpIDsaSigner, ClpISigner, ClpIECNRSigner, ClpIRandom, 
+  ClpISecureRandom, ClpIRandomNumberGenerator, ClpIRandomSourceProvider, 
+  ClpIX509CertificateParser, ClpIRandomGenerator, ClpIDigestRandomGenerator, 
+  ClpICryptoApiRandomGenerator, ClpIPemObjects, ClpIHMacDsaKCalculator, 
+  ClpIRsaDigestSigner, ClpIRsa, ClpIPssSigner, ClpIGenericSigner, 
+  ClpIEd25519Signer, ClpIEd25519PhSigner, ClpIEd25519CtxSigner, 
+  ClpIDsaDigestSigner, ClpIParametersWithIV, ClpIKeyParameter, 
+  ClpIKeyGenerationParameters, ClpIKdfParameters, ClpIIso18033KdfParameters, 
+  ClpIHkdfParameters, ClpIDerivationParameters, ClpICipherParameters, 
+  ClpIPaddedBufferedBlockCipher, ClpIVerifierFactoryProvider, 
+  ClpIVerifierFactory, ClpIVerifier, ClpIStreamCalculator, 
+  ClpISignatureFactory, ClpIDigestFactory, ClpIBlockResult, ClpIMac, ClpIKMac, 
+  ClpIHMac, ClpIScryptParametersGenerator, ClpIKdf2BytesGenerator, 
+  ClpIKdf1BytesGenerator, ClpIHkdfBytesGenerator, 
+  ClpIEphemeralKeyPairGenerator, ClpICipherKeyGenerator, 
+  ClpIBaseKdfBytesGenerator, ClpIAsymmetricCipherKeyPairGenerator, 
+  ClpIXSalsa20Engine, ClpISpeckLegacyEngine, ClpISpeckEngine, 
+  ClpISalsa20Engine, ClpIRsaEngine, ClpIRsaCoreEngine, ClpIRsaBlindingEngine, 
+  ClpIRsaBlindedEngine, ClpIRijndaelEngine, ClpIChaChaEngine, 
+  ClpIBlowfishEngine, ClpIAesLightEngine, ClpIAesEngine, ClpIPkcs1Encoding, 
+  ClpIOaepEncoding, ClpIISO9796d1Encoding, ClpIPrehash, ClpIDigest, 
+  ClpIBufferedStreamCipher, ClpIBufferedCipherBase, ClpIBufferedBlockCipher, 
+  ClpIBufferedAsymmetricBlockCipher, ClpIX25519Agreement, ClpIRawAgreement, 
+  ClpIECDHCBasicAgreement, ClpIECDHBasicAgreement, ClpIDHBasicAgreement, 
+  ClpIBasicAgreement, ClpIMacFactory, ClpIKeyEncoder, ClpIEphemeralKeyPair, 
+  ClpIDerivationFunction, ClpIAsymmetricCipherKeyPair, ClpIOidTokenizer, 
+  ClpStreams, ClpStreamUtilities, ClpPrimes, ClpECPoint, ClpSecT283K1Custom, 
+  ClpWNafUtilities, ClpEndoUtilities, ClpECFieldElement, ClpECCurve, 
+  ClpNat576, ClpFixedPointUtilities, ClpECLookupTables, ClpECPointMaps, 
+  ClpBigIntegers, ClpNat448, ClpNat224, ClpNat160, ClpNat128, ClpWnaf, 
+  ClpScalarUtilities, ClpScalar25519, ClpBits, ClpCodec, ClpBinaryPrimitives, 
+  ClpBitConverter, ClpBitOperations, ClpConverters, ClpCryptoLibComparers, 
+  ClpCryptoLibTypes, ClpNullable, ClpPack, ClpWeakRef, ClpIPAddressUtilities, 
+  ClpPemObjects, ClpPkcs10CertificationRequest, ClpDigestRandomGenerator, 
+  ClpRandomNumberGenerator, ClpAppleRandomProvider, 
+  ClpGenericBSDRandomProvider, ClpLinuxRandomProvider, 
+  ClpWindowsRandomProvider, ClpUnixRandomProvider, ClpSolarisRandomProvider, 
+  ClpAesRandomProvider, ClpCryptoApiRandomGenerator, ClpOSRandomProvider, 
+  ClpX509CrlParser, ClpX509V2AttributeCertificate, ClpX509CertificateParser, 
+  ClpX509Certificate, ClpX509Crl, ClpX509NameBuilder, ClpX509CrlEntry, 
+  ClpX509AttrCertParser, ClpAttributeCertificateIssuer, 
+  ClpAttributeCertificateHolder, ClpX509Utilities, ClpX509Generators, 
+  ClpDeltaCertificateTool, ClpX509Attribute, ClpX509ExtensionBase, 
+  ClpX509ExtensionUtilities;
 
 implementation
 

CryptoLib/src/X509/ClpX509Certificate.pas

@@ -144,7 +144,7 @@ type
     function GetEncoded: TCryptoLibByteArray;
 
     function Equals(AObj: TObject): Boolean; reintroduce;
-    function GetHashCode: Int32; override;
+    function GetHashCode: {$IFDEF DELPHI}Int32; {$ELSE}PtrInt; {$ENDIF DELPHI} override;
     function ToString: String; override;
 
     function IsSignatureValid(const AKey: IAsymmetricKeyParameter): Boolean; overload;
@@ -700,7 +700,7 @@ begin
     Result := False;
 end;
 
-function TX509Certificate.GetHashCode: Int32;
+function TX509Certificate.GetHashCode: {$IFDEF DELPHI}Int32; {$ELSE}PtrInt; {$ENDIF DELPHI}
 var
   LEncoding: TCryptoLibByteArray;
 begin

CryptoLib/src/X509/ClpX509Crl.pas

@@ -508,7 +508,7 @@ begin
 
   LThisEncoding := GetCachedEncoding().GetEncoding();
   LThatEncoding := LThatObj.GetCachedEncoding().GetEncoding();
-  Result := (LThisEncoding <> nil) and (LThatEncoding <> nil) and TArrayUtilities.AreEqual<Byte>(LThisEncoding, LThatEncoding);
+  Result := (LThisEncoding <> nil) and (LThatEncoding <> nil) and (TArrayUtilities.AreEqual<Byte>(LThisEncoding, LThatEncoding));
 end;
 
 function TX509Crl.GetHashCode: Int32;