fixed unaligned memory access on Delphi ARM devices

delete stale test unit

CryptoLib.Tests/src/Crypto/IESCipherTests.pas

@@ -1,277 +0,0 @@
-{ *********************************************************************************** }
-{ *                              CryptoLib Library                                  * }
-{ *                Copyright (c) 2018 - 20XX Ugochukwu Mmaduekwe                    * }
-{ *                 Github Repository <https://github.com/Xor-el>                   * }
-
-{ *  Distributed under the MIT software license, see the accompanying file LICENSE  * }
-{ *          or visit http://www.opensource.org/licenses/mit-license.php.           * }
-
-{ *                              Acknowledgements:                                  * }
-{ *                                                                                 * }
-{ *      Thanks to Sphere 10 Software (http://www.sphere10.com/) for sponsoring     * }
-{ *                           development of this library                           * }
-
-{ * ******************************************************************************* * }
-
-(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
-
-unit IESCipherTests;
-
-interface
-
-{$IFDEF FPC}
-{$MODE DELPHI}
-{$ENDIF FPC}
-{$HINTS OFF}
-
-uses
-  SysUtils,
-{$IFDEF FPC}
-  fpcunit,
-  testregistry,
-{$ELSE}
-  TestFramework,
-{$ENDIF FPC}
-  ClpIDigest,
-  ClpIMac,
-  ClpAesEngine,
-  ClpIAesEngine,
-  ClpIAsymmetricCipherKeyPairGenerator,
-  ClpGeneratorUtilities,
-  ClpIESWithCipherParameters,
-  ClpIIESWithCipherParameters,
-  // ClpKeyParameter,
-  // ClpIKeyParameter,
-  // ClpParametersWithIV,
-  // ClpIParametersWithIV,
-  ClpIBufferedBlockCipher,
-  // ClpParameterUtilities,
-  // ClpCipherUtilities,
-  ClpCbcBlockCipher,
-  ClpICbcBlockCipher,
-  ClpPaddedBufferedBlockCipher,
-  ClpIPaddedBufferedBlockCipher,
-  ClpECDHBasicAgreement,
-  ClpIECDHBasicAgreement,
-  ClpIESEngine,
-  ClpIIESEngine,
-  ClpPkcs7Padding,
-  ClpIPkcs7Padding,
-  // ClpZeroBytePadding,
-  // ClpIZeroBytePadding,
-  ClpKdf2BytesGenerator,
-  ClpIKdf2BytesGenerator,
-  ClpIX9ECParameters,
-  ClpSecNamedCurves,
-  ClpIECDomainParameters,
-  ClpECDomainParameters,
-  ClpECKeyGenerationParameters,
-  ClpSecureRandom,
-  ClpISecureRandom,
-  ClpIAsymmetricCipherKeyPair,
-  ClpIECPublicKeyParameters,
-  ClpIECPrivateKeyParameters,
-  ClpIIESCipher,
-  ClpIESCipher,
-  ClpHex,
-  ClpDigestUtilities,
-  ClpMacUtilities,
-  ClpArrayUtils;
-
-type
-
-  TCryptoLibTestCase = class abstract(TTestCase)
-
-  end;
-
-type
-
-  TTestIESCipher = class(TCryptoLibTestCase)
-  private
-
-    function GetECIESAES256CBCEngine: IIESEngine;
-    function GetECKeyPair: IAsymmetricCipherKeyPair;
-    function GetIESCipherParameters: IIESWithCipherParameters;
-
-    procedure doIESCipher_Encryption_Decryption_TestWithIV
-      (const KeyPair: IAsymmetricCipherKeyPair;
-      const param: IIESWithCipherParameters; const Random: ISecureRandom;
-      const PlainText: String);
-
-  protected
-    procedure SetUp; override;
-    procedure TearDown; override;
-  published
-
-    procedure TestIESCipher_Random_Values_Encryption_Decryption_AES256_CBC_PKCS7PADDING;
-
-  end;
-
-implementation
-
-{ TTestIESCipher }
-
-procedure TTestIESCipher.doIESCipher_Encryption_Decryption_TestWithIV
-  (const KeyPair: IAsymmetricCipherKeyPair;
-  const param: IIESWithCipherParameters; const Random: ISecureRandom;
-  const PlainText: String);
-var
-  PlainTextBytes, CipherTextBytes, DecryptionResultBytes: TBytes;
-  CipherEncrypt, CipherDecrypt: IIESCipher;
-begin
-  PlainTextBytes := TEncoding.UTF8.GetBytes(PlainText);
-  // Encryption
-  CipherEncrypt := TIESCipher.Create(GetECIESAES256CBCEngine);
-  CipherEncrypt.Init(True, KeyPair.Public as IECPublicKeyParameters,
-    param, Random);
-  CipherTextBytes := CipherEncrypt.DoFinal(PlainTextBytes);
-
-  // Decryption
-  CipherDecrypt := TIESCipher.Create(GetECIESAES256CBCEngine);
-  CipherDecrypt.Init(False, KeyPair.Private as IECPrivateKeyParameters,
-    param, Random);
-  DecryptionResultBytes := CipherDecrypt.DoFinal(CipherTextBytes);
-
-  if (not TArrayUtils.AreEqual(PlainTextBytes, DecryptionResultBytes)) then
-  begin
-    Fail(Format('Decryption Failed - Expected %s but got %s',
-      [THex.Encode(PlainTextBytes), THex.Encode(DecryptionResultBytes)]));
-  end;
-end;
-
-function TTestIESCipher.GetECIESAES256CBCEngine: IIESEngine;
-var
-  Cipher: IBufferedBlockCipher;
-  AesEngine: IAesEngine;
-  blockCipher: ICbcBlockCipher;
-  ECDHBasicAgreementInstance: IECDHBasicAgreement;
-  KDFInstance: IKdf2BytesGenerator;
-  DigestMACInstance: IMac;
-
-begin
-  // // Set up IES Cipher Engine
-
-  ECDHBasicAgreementInstance := TECDHBasicAgreement.Create();
-
-  KDFInstance := TKdf2BytesGenerator.Create
-    (TDigestUtilities.GetDigest('SHA-256'));
-
-  DigestMACInstance := TMacUtilities.GetMac('HMAC-SHA-256');
-
-  // Method 1: Set Up Block Cipher
-  // Cipher := TCipherUtilities.GetCipher('AES/CBC/PKCS7PADDING') as IBufferedBlockCipher;
-
-  // Method 2: Set Up Block Cipher
-  AesEngine := TAesEngine.Create(); // AES Engine
-
-  blockCipher := TCbcBlockCipher.Create(AesEngine); // CBC
-
-  Cipher := TPaddedBufferedBlockCipher.Create(blockCipher,
-    TPkcs7Padding.Create() as IPkcs7Padding); // Pkcs7Padding
-
-  // Cipher := TPaddedBufferedBlockCipher.Create(blockCipher,
-  // TZeroBytePadding.Create() as IZeroBytePadding); // ZeroBytePadding
-
-  result := TIESEngine.Create(ECDHBasicAgreementInstance, KDFInstance,
-    DigestMACInstance, Cipher);
-end;
-
-function TTestIESCipher.GetECKeyPair: IAsymmetricCipherKeyPair;
-var
-  CurveName: string;
-  KeyPairGeneratorInstance: IAsymmetricCipherKeyPairGenerator;
-  RandomInstance: ISecureRandom;
-  Lcurve: IX9ECParameters;
-  ecSpec: IECDomainParameters;
-begin
-  // Set Up EC Key Pair
-
-  CurveName := 'secp256k1';
-  Lcurve := TSecNamedCurves.GetByName(CurveName);
-  KeyPairGeneratorInstance := TGeneratorUtilities.GetKeyPairGenerator('ECDSA');
-  ecSpec := TECDomainParameters.Create(Lcurve.Curve, Lcurve.G, Lcurve.N,
-    Lcurve.H, Lcurve.GetSeed);
-  RandomInstance := TSecureRandom.Create();
-  KeyPairGeneratorInstance.Init(TECKeyGenerationParameters.Create(ecSpec,
-    RandomInstance));
-  result := KeyPairGeneratorInstance.GenerateKeyPair();
-end;
-
-function TTestIESCipher.GetIESCipherParameters: IIESWithCipherParameters;
-var
-  Derivation, Encoding, IVBytes: TBytes;
-  MacKeySizeInBits, CipherKeySizeInBits: Int32;
-  UsePointCompression: Boolean;
-begin
-  // Set up  IES Cipher Parameters
-
-  // The derivation and encoding vectors are used when initialising the KDF and MAC.
-  // They're optional but if used then they need to be known by the other user so that
-  // they can decrypt the ciphertext and verify the MAC correctly. The security is based
-  // on the shared secret coming from the (static-ephemeral) ECDH key agreement.
-  Derivation := Nil;
-
-  Encoding := Nil;
-
-  System.SetLength(IVBytes, 16); // using Zero Initialized IV for ease
-
-  MacKeySizeInBits := 32 * 8; // Since we are using SHA2_256 for MAC
-
-  CipherKeySizeInBits := 32 * 8; // Since we are using AES256 for Cipher
-
-  // whether to use point compression when deriving the octets string
-  // from a point or not in the EphemeralKeyPairGenerator
-  UsePointCompression := False;
-
-  result := TIESWithCipherParameters.Create(Derivation, Encoding, IVBytes,
-    MacKeySizeInBits, CipherKeySizeInBits, UsePointCompression);
-end;
-
-procedure TTestIESCipher.SetUp;
-begin
-  inherited;
-end;
-
-procedure TTestIESCipher.TearDown;
-begin
-  inherited;
-
-end;
-
-procedure TTestIESCipher.
-  TestIESCipher_Random_Values_Encryption_Decryption_AES256_CBC_PKCS7PADDING;
-var
-  RandomInstance: ISecureRandom;
-  PlainText: string;
-  I: Int32;
-  RandomBytes: TBytes;
-begin
-  RandomInstance := TSecureRandom.Create();
-  I := 0;
-  while I <= 10 do
-  begin
-    System.SetLength(RandomBytes, Byte(RandomInstance.NextInt32));
-    RandomInstance.NextBytes(RandomBytes);
-    PlainText := THex.Encode(RandomBytes);
-
-    // Call IESCipher Encryption and Decryption Method
-
-    doIESCipher_Encryption_Decryption_TestWithIV(GetECKeyPair,
-      GetIESCipherParameters, RandomInstance, PlainText);
-
-    System.Inc(I);
-  end;
-
-end;
-
-initialization
-
-// Register any test cases with the test runner
-
-{$IFDEF FPC}
-  RegisterTest(TTestIESCipher);
-{$ELSE}
-  RegisterTest(TTestIESCipher.Suite);
-{$ENDIF FPC}
-
-end.

CryptoLib/src/Utils/ClpConverters.pas

@@ -292,44 +292,64 @@ end;
 class function TConverters.ReadBytesAsUInt32LE(a_in: PByte;
   a_index: Int32): UInt32;
 begin
+{$IFDEF FPC}
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   System.Move(a_in[a_index], result, System.SizeOf(UInt32));
 {$ELSE}
   result := PCardinal(a_in + a_index)^;
 {$ENDIF FPC_REQUIRES_PROPER_ALIGNMENT}
+{$ELSE}
+  // Delphi does not handle unaligned memory access on ARM Devices properly.
+  System.Move(a_in[a_index], result, System.SizeOf(UInt32));
+{$ENDIF FPC}
   result := le2me_32(result);
 end;
 
 class function TConverters.ReadBytesAsUInt32BE(a_in: PByte;
   a_index: Int32): UInt32;
 begin
+{$IFDEF FPC}
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   System.Move(a_in[a_index], result, System.SizeOf(UInt32));
 {$ELSE}
   result := PCardinal(a_in + a_index)^;
 {$ENDIF FPC_REQUIRES_PROPER_ALIGNMENT}
+{$ELSE}
+  // Delphi does not handle unaligned memory access on ARM Devices properly.
+  System.Move(a_in[a_index], result, System.SizeOf(UInt32));
+{$ENDIF FPC}
   result := be2me_32(result);
 end;
 
 class function TConverters.ReadBytesAsUInt64LE(a_in: PByte;
   a_index: Int32): UInt64;
 begin
+{$IFDEF FPC}
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   System.Move(a_in[a_index], result, System.SizeOf(UInt64));
 {$ELSE}
   result := PUInt64(a_in + a_index)^;
 {$ENDIF FPC_REQUIRES_PROPER_ALIGNMENT}
+{$ELSE}
+  // Delphi does not handle unaligned memory access on ARM Devices properly.
+  System.Move(a_in[a_index], result, System.SizeOf(UInt64));
+{$ENDIF FPC}
   result := le2me_64(result);
 end;
 
 class function TConverters.ReadBytesAsUInt64BE(a_in: PByte;
   a_index: Int32): UInt64;
 begin
+{$IFDEF FPC}
 {$IFDEF FPC_REQUIRES_PROPER_ALIGNMENT}
   System.Move(a_in[a_index], result, System.SizeOf(UInt64));
 {$ELSE}
   result := PUInt64(a_in + a_index)^;
 {$ENDIF FPC_REQUIRES_PROPER_ALIGNMENT}
+{$ELSE}
+  // Delphi does not handle unaligned memory access on ARM Devices properly.
+  System.Move(a_in[a_index], result, System.SizeOf(UInt64));
+{$ENDIF FPC}
   result := be2me_64(result);
 end;