Skip to content

inc files refactoring #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Xor-el merged 1 commit into from
Dec 15, 2025
Merged

inc files refactoring #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions CryptoLib/src/Crypto/Digests/ClpDigest.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,13 +122,10 @@ function TDigest.GetAlgorithmName: string;
LowPoint, HighPoint: Int32;
begin
LName := FHash.Name;
{$IFDEF DELPHIXE3_UP}
LowPoint := System.Low(LName);
HighPoint := System.High(LName);
{$ELSE}

LowPoint := 1;
HighPoint := System.Length(LName);
{$ENDIF DELPHIXE3_UP}

result := Copy(LName, LowPoint + 1, HighPoint - 1);
end;

Expand Down
7 changes: 2 additions & 5 deletions CryptoLib/src/Crypto/Macs/ClpKMac.pas
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,13 +149,10 @@ function TKMac.GetAlgorithmName: string;
LowPoint, HighPoint: Int32;
begin
LName := Self.ClassName;
{$IFDEF DELPHIXE3_UP}
LowPoint := System.Low(LName);
HighPoint := System.High(LName);
{$ELSE}

LowPoint := 1;
HighPoint := System.Length(LName);
{$ENDIF DELPHIXE3_UP}

result := Copy(LName, LowPoint + 1, HighPoint - 1);
end;

Expand Down
217 changes: 7 additions & 210 deletions CryptoLib/src/Include/CryptoLib.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,224 +15,21 @@

(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)

{$DEFINE DELPHI}

(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
{---------------------------- Compiler Family Switch --------------------------}
{$IFDEF FPC}
{$I CryptoLibHelper.inc} // Had to Include this Since Delphi Does not allow "FPC_FULLVERSION" to Compile.
{$UNDEF DELPHI}
{$MODE delphi}

{$IFDEF CPU386}
{$DEFINE CRYPTOLIB_X86}
{$ENDIF}

{$IFDEF CPUX64}
{$DEFINE CRYPTOLIB_X86_64}
{$ENDIF}

{$IFDEF CPUARM}
{$DEFINE CRYPTOLIB_ARM}
{$ENDIF}

{$IFDEF CPUAARCH64}
{$DEFINE CRYPTOLIB_AARCH64}
{$ENDIF}

{$IFDEF IPHONESIM}
{$DEFINE CRYPTOLIB_IOSSIM}
{$ENDIF}

{$IF DEFINED(MSWINDOWS)}
{$DEFINE CRYPTOLIB_MSWINDOWS}
{$ELSEIF DEFINED(UNIX)}
{$DEFINE CRYPTOLIB_UNIX}
{$IF DEFINED(BSD)}
{$IF DEFINED(DARWIN)}
{$DEFINE CRYPTOLIB_APPLE}
{$IF DEFINED(CRYPTOLIB_ARM) OR DEFINED(CRYPTOLIB_AARCH64)}
{$DEFINE CRYPTOLIB_IOS}
{$ELSE}
{$DEFINE CRYPTOLIB_MACOS}
{$IFEND}
{$ELSEIF DEFINED(FREEBSD) OR DEFINED(NETBSD) OR DEFINED(OPENBSD) OR DEFINED(DRAGONFLY)}
{$DEFINE CRYPTOLIB_GENERIC_BSD}
{$IFEND}
{$ELSEIF DEFINED(ANDROID)}
{$DEFINE CRYPTOLIB_ANDROID}
{$ELSEIF DEFINED(LINUX)}
{$DEFINE CRYPTOLIB_LINUX}
{$ELSEIF DEFINED(SOLARIS)}
{$DEFINE CRYPTOLIB_SOLARIS}
{$ELSE}
{$DEFINE CRYPTOLIB_UNDEFINED_UNIX_VARIANTS}
{$IFEND}
{$I CryptoLibFPC.inc} // FPC-specific settings
{$ELSE}
{$MESSAGE ERROR 'UNSUPPORTED TARGET.'}
{$IFEND}

{$IFDEF CRYPTOLIB_ANDROID}
{$DEFINE CRYPTOLIB_LINUX}
{$DEFINE DELPHI}
{$I ../../CryptoLib/src/Include/CryptoLibDelphi.inc} // Delphi-specific settings
{$ENDIF}

{$IF DEFINED(CRYPTOLIB_LINUX) OR DEFINED(CRYPTOLIB_SOLARIS)}
{$DEFINE CRYPTOLIB_HAS_GETRANDOM}
{$IFEND}

{$DEFINE USE_UNROLLED_VARIANT}

// Disable Overflow and RangeChecks.
{-------------------------- Common Compiler Settings --------------------------}
{$SCOPEDENUMS ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}

// Enable Pointer Math
{$POINTERMATH ON}

// Disable Warnings and Hints.
{$WARNINGS OFF}
{$HINTS OFF}
{$NOTES OFF}

// Optimizations
{$OPTIMIZATION LEVEL3}
// disable "USELOADMODIFYSTORE" because it produces incorrect result
// when used in combination with -CpCOREAVX2 and -OpCOREAVX2 in FPC 3.2.0 beta
{$IFDEF FPC_GREATER_THAN_3.0.4}
{$OPTIMIZATION NOUSELOADMODIFYSTORE}
{$ENDIF}
// level 4 optimizations
{$OPTIMIZATION ORDERFIELDS}
{$OPTIMIZATION DEADVALUES}

{$IFDEF CPUI386}
{$OPTIMIZATION USEEBP}
{$ENDIF}

{$IFDEF CPUX86_64}
{$OPTIMIZATION USERBP}
{$ENDIF}

{$ENDIF FPC}

(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)

{$IFDEF DELPHI}

// XE3 and Above
{$IF CompilerVersion >= 24.0}
{$DEFINE DELPHIXE3_UP}
{$DEFINE SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD}
{$DEFINE SUPPORT_TSTREAM_WRITE_BYTEARRAY_OVERLOAD}
{$LEGACYIFEND ON}
{$ZEROBASEDSTRINGS OFF}
{$IFEND}

// XE and Above
{$IF CompilerVersion >= 22.0}
{$DEFINE DELPHIXE_UP}
{$IFEND}

// XE4 and Above
{$IF CompilerVersion >= 25.0}
{$DEFINE DELPHIXE4_UP}
{$DEFINE SHIFT_OVERFLOW_BUG_FIXED}
{$IFEND}

// 10.1 Berlin and Above
{$IF CompilerVersion >= 31.0}
{$DEFINE DELPHI10.1_BERLIN_UP}
{$DEFINE HAS_VOLATILE}
{$IFEND}

// 10.2 Tokyo and Above
{$IF CompilerVersion >= 32.0}
{$DEFINE DELPHI10.2_TOKYO_UP}
{$IFEND}

// 10.2 Tokyo and Above
{$IFNDEF DELPHI10.2_TOKYO_UP}
{$MESSAGE ERROR 'This Library requires Delphi Tokyo or higher.'}
{$ENDIF}

{$IFDEF CPU386}
{$DEFINE CRYPTOLIB_X86}
{$ENDIF}

{$IFDEF CPUX64}
{$DEFINE CRYPTOLIB_X86_64}
{$ENDIF}

{$IFDEF CPUARM32}
{$DEFINE CRYPTOLIB_ARM}
{$ENDIF}

{$IFDEF CPUARM64}
{$DEFINE CRYPTOLIB_AARCH64}
{$ENDIF}

{$IFDEF IOS}
{$IFNDEF CPUARM}
{$DEFINE CRYPTOLIB_IOSSIM}
{$ENDIF}
{$ENDIF}

{$IFDEF IOS}
{$DEFINE CRYPTOLIB_IOS}
{$ENDIF}

{$IFDEF MSWINDOWS}
{$DEFINE CRYPTOLIB_MSWINDOWS}
{$ENDIF}

{$IFDEF MACOS}
{$IFNDEF IOS}
{$DEFINE CRYPTOLIB_MACOS}
{$ENDIF}
{$ENDIF}

{$IFDEF ANDROID}
{$DEFINE CRYPTOLIB_ANDROID}
{$ENDIF}

{$IF DEFINED(CRYPTOLIB_IOS) OR DEFINED(CRYPTOLIB_MACOS)}
{$DEFINE CRYPTOLIB_APPLE}
{$IFEND}

{$IF DEFINED(LINUX) OR DEFINED(CRYPTOLIB_ANDROID)}
{$DEFINE CRYPTOLIB_LINUX}
{$IFEND}

{$IFDEF CRYPTOLIB_LINUX}
{$DEFINE CRYPTOLIB_HAS_GETRANDOM}
{$ENDIF}

{$IF DEFINED(CRYPTOLIB_APPLE) OR DEFINED(CRYPTOLIB_LINUX)}
{$DEFINE CRYPTOLIB_UNIX}
{$IFEND}

{$DEFINE USE_UNROLLED_VARIANT}

// This option is needed to enable code browsing (aka Ctrl+Click)
// It does not affect the binary size or generated code
{$DEFINITIONINFO ON}

// Disable Overflow and RangeChecks.
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}

// Enable Pointer Math
{$POINTERMATH ON}

// Disable String Checks
{$STRINGCHECKS OFF}

// Disable Duplicate Constructor Warnings
{$WARN DUPLICATE_CTOR_DTOR OFF}

// Disable Deprecated Warnings
{$WARN SYMBOL_DEPRECATED OFF}

{$ENDIF DELPHI}

(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)

(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)
105 changes: 105 additions & 0 deletions CryptoLib/src/Include/CryptoLibDelphi.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
{ *********************************************************************************** }
{ * 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 * }

{ * ******************************************************************************* * }

(* &&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&& *)

{$IFDEF DELPHI}
{$DEFINITIONINFO ON} // IDE navigation; no binary impact
{$STRINGCHECKS OFF}
{$WARN DUPLICATE_CTOR_DTOR OFF}

{$IF CompilerVersion < 32.0}
{$MESSAGE ERROR 'This Library requires Delphi Tokyo or higher.'}
{$IFEND}

// XE and Above
{$IF CompilerVersion >= 22.0}
{$DEFINE DELPHIXE_UP}
{$IFEND}

// XE3 and Above
{$IF CompilerVersion >= 24.0}
{$DEFINE SUPPORT_TSTREAM_READ_BYTEARRAY_OVERLOAD}
{$DEFINE SUPPORT_TSTREAM_WRITE_BYTEARRAY_OVERLOAD}
{$IFEND}

// XE4 and Above
{$IF CompilerVersion >= 25.0}
{$DEFINE SHIFT_OVERFLOW_BUG_FIXED}
{$IFEND}

// 10.1 Berlin and Above
{$IF CompilerVersion >= 31.0}
{$DEFINE HAS_VOLATILE}
{$IFEND}

{$IFDEF CPU386}
{$DEFINE CRYPTOLIB_X86}
{$ENDIF}

{$IFDEF CPUX64}
{$DEFINE CRYPTOLIB_X86_64}
{$ENDIF}

{$IFDEF CPUARM32}
{$DEFINE CRYPTOLIB_ARM}
{$ENDIF}

{$IFDEF CPUARM64}
{$DEFINE CRYPTOLIB_AARCH64}
{$ENDIF}

{$IFDEF IOS}
{$IFNDEF CPUARM}
{$DEFINE CRYPTOLIB_IOSSIM}
{$ENDIF}
{$ENDIF}

{$IFDEF IOS}
{$DEFINE CRYPTOLIB_IOS}
{$ENDIF}

{$IFDEF MSWINDOWS}
{$DEFINE CRYPTOLIB_MSWINDOWS}
{$ENDIF}

{$IFDEF MACOS}
{$IFNDEF IOS}
{$DEFINE CRYPTOLIB_MACOS}
{$ENDIF}
{$ENDIF}

{$IFDEF ANDROID}
{$DEFINE CRYPTOLIB_ANDROID}
{$ENDIF}

{$IF DEFINED(CRYPTOLIB_IOS) OR DEFINED(CRYPTOLIB_MACOS)}
{$DEFINE CRYPTOLIB_APPLE}
{$IFEND}

{$IF DEFINED(LINUX) OR DEFINED(CRYPTOLIB_ANDROID)}
{$DEFINE CRYPTOLIB_LINUX}
{$IFEND}

{$IFDEF CRYPTOLIB_LINUX}
{$DEFINE CRYPTOLIB_HAS_GETRANDOM}
{$ENDIF}

{$IF DEFINED(CRYPTOLIB_APPLE) OR DEFINED(CRYPTOLIB_LINUX)}
{$DEFINE CRYPTOLIB_UNIX}
{$IFEND}

{$ENDIF}

Loading