Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 8 additions & 2 deletions CryptoLib.Benchmark/Delphi/CryptoLib.BenchmarkConsole.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,9 @@ uses
ClpChaChaSimd in '..\..\CryptoLib\src\Simd\Facade\ClpChaChaSimd.pas',
ClpChaChaX86Backend in '..\..\CryptoLib\src\Simd\Backend\ClpChaChaX86Backend.pas',
ClpChaChaArmBackend in '..\..\CryptoLib\src\Simd\Backend\ClpChaChaArmBackend.pas',
ClpFpKernelSimd in '..\..\CryptoLib\src\Simd\Facade\ClpFpKernelSimd.pas',
ClpFpKernelX86Backend in '..\..\CryptoLib\src\Simd\Backend\ClpFpKernelX86Backend.pas',
ClpFpKernelArmBackend in '..\..\CryptoLib\src\Simd\Backend\ClpFpKernelArmBackend.pas',
ClpSalsaSimd in '..\..\CryptoLib\src\Simd\Facade\ClpSalsaSimd.pas',
ClpSalsaX86Backend in '..\..\CryptoLib\src\Simd\Backend\ClpSalsaX86Backend.pas',
ClpSalsaArmBackend in '..\..\CryptoLib\src\Simd\Backend\ClpSalsaArmBackend.pas',
Expand Down Expand Up @@ -393,8 +396,11 @@ uses
ClpMiscObjectIdentifiers in '..\..\CryptoLib\src\Asn1\Misc\ClpMiscObjectIdentifiers.pas',
ClpMultipliers in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpMultipliers.pas',
ClpIFpFieldOps in '..\..\CryptoLib\src\Interfaces\Math\EC\Multiplier\ClpIFpFieldOps.pas',
ClpHomogeneousPoint in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpHomogeneousPoint.pas',
ClpFixedWindowCTMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpFixedWindowCTMultiplier.pas',
ClpCTFieldValue in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpCTFieldValue.pas',
ClpCTFieldOps in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpCTFieldOps.pas',
ClpCTLadder in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpCTLadder.pas',
ClpFpCTMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpFpCTMultiplier.pas',
ClpFpCombMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpFpCombMultiplier.pas',
ClpIF2mFieldOps in '..\..\CryptoLib\src\Interfaces\Math\EC\Multiplier\ClpIF2mFieldOps.pas',
ClpLopezDahabLadder in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpLopezDahabLadder.pas',
ClpF2mMontgomeryLadderCTMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpF2mMontgomeryLadderCTMultiplier.pas',
Expand Down
98 changes: 95 additions & 3 deletions CryptoLib.ConstantTime/src/Core/CtSubjects.pas
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

# Subject (must stay clean) Control (must fire)
1 TX25519 ladder (none - clean baseline)
2 P-256 default (TFixedWindowCTMultiplier) TWNafL2RMultiplier, same curve
2 P-256 default (TFpCTMultiplier value-type) TWNafL2RMultiplier, same curve
3 sect283k1 default (F2m Montgomery ladder)TWTauNafMultiplier, same curve
4 TAesBitSlicedEngine block TAesEngine (T-table) block
5 TBasicGcmMultiplier (ImplMul64) GHASH TTables4kGcmMultiplier GHASH
Expand Down Expand Up @@ -589,6 +589,80 @@ function MakeSect283WTau(ASeed: UInt64): TDudectOp;
Result := BuildEcOp('sect283k1', TWTauNafMultiplier.Create as IECMultiplier, ASeed);
end;

function MakeSecp256k1CT(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp256k1');
Result := TECMulOp.Create(LX9.Curve.Multiplier, LX9.G, LX9.N, ASeed);
end;

function MakeSecp256k1WNaf(ASeed: UInt64): TDudectOp;
begin
Result := BuildEcOp('secp256k1', TWNafL2RMultiplier.Create as IECMultiplier, ASeed);
end;

function MakeSecp384r1CT(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp384r1');
Result := TECMulOp.Create(LX9.Curve.Multiplier, LX9.G, LX9.N, ASeed);
end;

function MakeSecp384r1WNaf(ASeed: UInt64): TDudectOp;
begin
Result := BuildEcOp('secp384r1', TWNafL2RMultiplier.Create as IECMultiplier, ASeed);
end;

function MakeSecp521r1CT(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp521r1');
Result := TECMulOp.Create(LX9.Curve.Multiplier, LX9.G, LX9.N, ASeed);
end;

function MakeSecp521r1WNaf(ASeed: UInt64): TDudectOp;
begin
Result := BuildEcOp('secp521r1', TWNafL2RMultiplier.Create as IECMultiplier, ASeed);
end;

{ Fixed-base comb subjects: the same TFpPointOps CT primitives as [d]Q, driven
through the fixed-base multiplier ([k]G on the reused generator). Paired with
the existing wNAF-on-G controls. }
function MakeSecp256r1Comb(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp256r1');
Result := TECMulOp.Create(LX9.Curve.BasePointMultiplier, LX9.G, LX9.N, ASeed);
end;

function MakeSecp256k1Comb(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp256k1');
Result := TECMulOp.Create(LX9.Curve.BasePointMultiplier, LX9.G, LX9.N, ASeed);
end;

function MakeSecp384r1Comb(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp384r1');
Result := TECMulOp.Create(LX9.Curve.BasePointMultiplier, LX9.G, LX9.N, ASeed);
end;

function MakeSecp521r1Comb(ASeed: UInt64): TDudectOp;
var
LX9: IX9ECParameters;
begin
LX9 := TCustomNamedCurves.GetByName('secp521r1');
Result := TECMulOp.Create(LX9.Curve.BasePointMultiplier, LX9.G, LX9.N, ASeed);
end;

function MakeAesBitsliced(ASeed: UInt64): TDudectOp;
begin
Result := TAesOp.Create(TAesBitSlicedEngine.Create as IBlockCipher, 16, ASeed);
Expand Down Expand Up @@ -679,10 +753,10 @@ function MakeRow(const AName, ASubjectLabel, AControlLabel: string;

function GetDudectRows: TCtRowArray;
begin
System.SetLength(Result, 7);
System.SetLength(Result, 14);
Result[0] := MakeRow('X25519', 'X25519 ladder', '',
@MakeX25519, nil, MediumCfg(UInt64($0000000000000001)));
Result[1] := MakeRow('P-256 [d]Q', 'FixedWindow CT', 'wNAF (var-time)',
Result[1] := MakeRow('P-256 [d]Q', 'value-type CT', 'wNAF (var-time)',
@MakeP256CT, @MakeP256WNaf, ExpensiveCfg(UInt64($0000000000000002)));
Result[2] := MakeRow('sect283k1 [d]Q', 'F2m Montgomery CT', 'WTauNAF (var-time)',
@MakeSect283CT, @MakeSect283WTau, ExpensiveCfg(UInt64($0000000000000003)));
Expand All @@ -705,6 +779,24 @@ function GetDudectRows: TCtRowArray;
@MakeModInvSafe, @MakeModInvVar, MediumCfg(UInt64($0000000000000006)));
Result[6] := MakeRow('mod-inv (wrapper)', 'safegcd wrapper (CT)', 'variable-time wrapper',
@MakeModInvWrapperSafe, @MakeModInvWrapperVar, MediumCfg(UInt64($0000000000000007)));
// The remaining prime curves also run the value-type CT multiplier; measure each
// explicitly against its wNAF (variable-time) control.
Result[7] := MakeRow('secp256k1 [d]Q', 'value-type CT', 'wNAF (var-time)',
@MakeSecp256k1CT, @MakeSecp256k1WNaf, ExpensiveCfg(UInt64($0000000000000008)));
Result[8] := MakeRow('secp384r1 [d]Q', 'value-type CT', 'wNAF (var-time)',
@MakeSecp384r1CT, @MakeSecp384r1WNaf, ExpensiveCfg(UInt64($0000000000000009)));
Result[9] := MakeRow('secp521r1 [d]Q', 'value-type CT', 'wNAF (var-time)',
@MakeSecp521r1CT, @MakeSecp521r1WNaf, ExpensiveCfg(UInt64($000000000000000A)));
// Fixed-base comb [k]G on the reused generator: same CT primitives as [d]Q,
// paired against wNAF-on-G (variable-time) controls.
Result[10] := MakeRow('secp256r1 [k]G comb', 'value-type comb (CT)', 'wNAF (var-time)',
@MakeSecp256r1Comb, @MakeP256WNaf, ExpensiveCfg(UInt64($000000000000000B)));
Result[11] := MakeRow('secp256k1 [k]G comb', 'value-type comb (CT)', 'wNAF (var-time)',
@MakeSecp256k1Comb, @MakeSecp256k1WNaf, ExpensiveCfg(UInt64($000000000000000C)));
Result[12] := MakeRow('secp384r1 [k]G comb', 'value-type comb (CT)', 'wNAF (var-time)',
@MakeSecp384r1Comb, @MakeSecp384r1WNaf, ExpensiveCfg(UInt64($000000000000000D)));
Result[13] := MakeRow('secp521r1 [k]G comb', 'value-type comb (CT)', 'wNAF (var-time)',
@MakeSecp521r1Comb, @MakeSecp521r1WNaf, ExpensiveCfg(UInt64($000000000000000E)));
end;

function MakeVg(const AName: string; AMake: TCtOpFactory;
Expand Down
10 changes: 8 additions & 2 deletions CryptoLib.Examples/Delphi.Examples/CryptoLib.Examples.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,9 @@ uses
ClpChaChaSimd in '..\..\CryptoLib\src\Simd\Facade\ClpChaChaSimd.pas',
ClpChaChaX86Backend in '..\..\CryptoLib\src\Simd\Backend\ClpChaChaX86Backend.pas',
ClpChaChaArmBackend in '..\..\CryptoLib\src\Simd\Backend\ClpChaChaArmBackend.pas',
ClpFpKernelSimd in '..\..\CryptoLib\src\Simd\Facade\ClpFpKernelSimd.pas',
ClpFpKernelX86Backend in '..\..\CryptoLib\src\Simd\Backend\ClpFpKernelX86Backend.pas',
ClpFpKernelArmBackend in '..\..\CryptoLib\src\Simd\Backend\ClpFpKernelArmBackend.pas',
ClpSalsaSimd in '..\..\CryptoLib\src\Simd\Facade\ClpSalsaSimd.pas',
ClpSalsaX86Backend in '..\..\CryptoLib\src\Simd\Backend\ClpSalsaX86Backend.pas',
ClpSalsaArmBackend in '..\..\CryptoLib\src\Simd\Backend\ClpSalsaArmBackend.pas',
Expand Down Expand Up @@ -410,8 +413,11 @@ uses
ClpMiscObjectIdentifiers in '..\..\CryptoLib\src\Asn1\Misc\ClpMiscObjectIdentifiers.pas',
ClpMultipliers in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpMultipliers.pas',
ClpIFpFieldOps in '..\..\CryptoLib\src\Interfaces\Math\EC\Multiplier\ClpIFpFieldOps.pas',
ClpHomogeneousPoint in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpHomogeneousPoint.pas',
ClpFixedWindowCTMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpFixedWindowCTMultiplier.pas',
ClpCTFieldValue in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpCTFieldValue.pas',
ClpCTFieldOps in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpCTFieldOps.pas',
ClpCTLadder in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpCTLadder.pas',
ClpFpCTMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpFpCTMultiplier.pas',
ClpFpCombMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpFpCombMultiplier.pas',
ClpIF2mFieldOps in '..\..\CryptoLib\src\Interfaces\Math\EC\Multiplier\ClpIF2mFieldOps.pas',
ClpLopezDahabLadder in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpLopezDahabLadder.pas',
ClpF2mMontgomeryLadderCTMultiplier in '..\..\CryptoLib\src\Math\EC\Multiplier\ClpF2mMontgomeryLadderCTMultiplier.pas',
Expand Down
Loading