Skip to content

Add HPKE (RFC 9180) hybrid public key encryption #198

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
Sep 5, 2026
Merged

Add HPKE (RFC 9180) hybrid public key encryption #198

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
11 changes: 11 additions & 0 deletions CryptoLib.Benchmark/Delphi/CryptoLib.BenchmarkConsole.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,17 @@ uses
ClpGlvTypeBEndomorphism in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBEndomorphism.pas',
ClpGlvTypeBParameters in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBParameters.pas',
ClpHkdfBytesGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpHkdfBytesGenerator.pas',
ClpHpkeTypes in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeTypes.pas',
ClpHpkeKdf in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeKdf.pas',
ClpHpkeAead in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeAead.pas',
ClpHpkeContext in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeContext.pas',
ClpDhKem in '..\..\CryptoLib\src\Crypto\Hpke\ClpDhKem.pas',
ClpHpke in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpke.pas',
ClpIHpkeKdf in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKdf.pas',
ClpIHpkeAead in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeAead.pas',
ClpIHpkeContext in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeContext.pas',
ClpIHpkeKem in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKem.pas',
ClpIHpke in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpke.pas',
ClpHkdfParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpHkdfParameters.pas',
ClpHMac in '..\..\CryptoLib\src\Crypto\Macs\ClpHMac.pas',
ClpHMacDsaKCalculator in '..\..\CryptoLib\src\Crypto\Signers\SignerCalculators\ClpHMacDsaKCalculator.pas',
Expand Down
11 changes: 11 additions & 0 deletions CryptoLib.Examples/Delphi.Examples/CryptoLib.Examples.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,17 @@ uses
ClpGlvTypeBEndomorphism in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBEndomorphism.pas',
ClpGlvTypeBParameters in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBParameters.pas',
ClpHkdfBytesGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpHkdfBytesGenerator.pas',
ClpHpkeTypes in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeTypes.pas',
ClpHpkeKdf in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeKdf.pas',
ClpHpkeAead in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeAead.pas',
ClpHpkeContext in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeContext.pas',
ClpDhKem in '..\..\CryptoLib\src\Crypto\Hpke\ClpDhKem.pas',
ClpHpke in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpke.pas',
ClpIHpkeKdf in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKdf.pas',
ClpIHpkeAead in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeAead.pas',
ClpIHpkeContext in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeContext.pas',
ClpIHpkeKem in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKem.pas',
ClpIHpke in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpke.pas',
ClpHkdfParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpHkdfParameters.pas',
ClpHMac in '..\..\CryptoLib\src\Crypto\Macs\ClpHMac.pas',
ClpHMacDsaKCalculator in '..\..\CryptoLib\src\Crypto\Signers\SignerCalculators\ClpHMacDsaKCalculator.pas',
Expand Down
128,288 changes: 128,288 additions & 0 deletions CryptoLib.Tests/Data/Crypto/Hpke/hpke.txt
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 13 additions & 0 deletions CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.Mobile.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,17 @@ uses
ClpGlvTypeBEndomorphism in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBEndomorphism.pas',
ClpGlvTypeBParameters in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBParameters.pas',
ClpHkdfBytesGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpHkdfBytesGenerator.pas',
ClpHpkeTypes in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeTypes.pas',
ClpHpkeKdf in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeKdf.pas',
ClpHpkeAead in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeAead.pas',
ClpHpkeContext in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeContext.pas',
ClpDhKem in '..\..\CryptoLib\src\Crypto\Hpke\ClpDhKem.pas',
ClpHpke in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpke.pas',
ClpIHpkeKdf in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKdf.pas',
ClpIHpkeAead in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeAead.pas',
ClpIHpkeContext in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeContext.pas',
ClpIHpkeKem in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKem.pas',
ClpIHpke in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpke.pas',
ClpHkdfParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpHkdfParameters.pas',
ClpHMac in '..\..\CryptoLib\src\Crypto\Macs\ClpHMac.pas',
ClpHMacDsaKCalculator in '..\..\CryptoLib\src\Crypto\Signers\SignerCalculators\ClpHMacDsaKCalculator.pas',
Expand Down Expand Up @@ -1094,6 +1105,7 @@ uses
Poly1305Tests in '..\src\Crypto\Poly1305Tests.pas',
NistSecureRandom in '..\src\Utils\NistSecureRandom.pas',
MlKemTests in '..\src\Crypto\MlKemTests.pas',
HpkeTests in '..\src\Crypto\HpkeTests.pas',
Lib25519Tests in '..\src\Crypto\Lib25519Tests.pas',
MlDsaTests in '..\src\Crypto\MlDsaTests.pas',
SlhDsaTests in '..\src\Crypto\SlhDsaTests.pas',
Expand Down Expand Up @@ -1148,6 +1160,7 @@ uses
PemReaderVectors in '..\src\Utils\Vectors\PemReaderVectors.pas',
PkcsVectors in '..\src\Utils\Vectors\PkcsVectors.pas',
PqcTestVectors in '..\src\Utils\Vectors\PqcTestVectors.pas',
HpkeVectors in '..\src\Utils\Vectors\HpkeVectors.pas',
CsvVectorLoaderBase in '..\src\Utils\Vectors\CsvVectorLoaderBase.pas',
TestKeyBuilders in '..\src\Utils\Vectors\TestKeyBuilders.pas',
PemDerCodec in '..\src\Utils\Vectors\PemDerCodec.pas',
Expand Down
13 changes: 13 additions & 0 deletions CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.Mobile.dproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,6 +510,17 @@
<DCCReference Include="..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBEndomorphism.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBParameters.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Generators\ClpHkdfBytesGenerator.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeTypes.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeKdf.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeAead.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeContext.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Hpke\ClpDhKem.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Hpke\ClpHpke.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKdf.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeAead.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeContext.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKem.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpke.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Parameters\ClpHkdfParameters.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Macs\ClpHMac.pas"/>
<DCCReference Include="..\..\CryptoLib\src\Crypto\Signers\SignerCalculators\ClpHMacDsaKCalculator.pas"/>
Expand Down Expand Up @@ -1431,6 +1442,7 @@
<DCCReference Include="..\src\Crypto\Poly1305Tests.pas"/>
<DCCReference Include="..\src\Utils\NistSecureRandom.pas"/>
<DCCReference Include="..\src\Crypto\MlKemTests.pas"/>
<DCCReference Include="..\src\Crypto\HpkeTests.pas"/>
<DCCReference Include="..\src\Crypto\Lib25519Tests.pas"/>
<DCCReference Include="..\src\Crypto\MlDsaTests.pas"/>
<DCCReference Include="..\src\Crypto\SlhDsaTests.pas"/>
Expand Down Expand Up @@ -1484,6 +1496,7 @@
<DCCReference Include="..\src\Utils\Vectors\PemReaderVectors.pas"/>
<DCCReference Include="..\src\Utils\Vectors\PkcsVectors.pas"/>
<DCCReference Include="..\src\Utils\Vectors\PqcTestVectors.pas"/>
<DCCReference Include="..\src\Utils\Vectors\HpkeVectors.pas"/>
<DCCReference Include="..\src\Utils\Vectors\CsvVectorLoaderBase.pas"/>
<DCCReference Include="..\src\Utils\Vectors\TestKeyBuilders.pas"/>
<DCCReference Include="..\src\Utils\Vectors\PemDerCodec.pas"/>
Expand Down
13 changes: 13 additions & 0 deletions CryptoLib.Tests/Delphi.Tests/CryptoLib.Tests.dpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,17 @@ uses
ClpGlvTypeBEndomorphism in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBEndomorphism.pas',
ClpGlvTypeBParameters in '..\..\CryptoLib\src\Math\EC\Endo\ClpGlvTypeBParameters.pas',
ClpHkdfBytesGenerator in '..\..\CryptoLib\src\Crypto\Generators\ClpHkdfBytesGenerator.pas',
ClpHpkeTypes in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeTypes.pas',
ClpHpkeKdf in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeKdf.pas',
ClpHpkeAead in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeAead.pas',
ClpHpkeContext in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpkeContext.pas',
ClpDhKem in '..\..\CryptoLib\src\Crypto\Hpke\ClpDhKem.pas',
ClpHpke in '..\..\CryptoLib\src\Crypto\Hpke\ClpHpke.pas',
ClpIHpkeKdf in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKdf.pas',
ClpIHpkeAead in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeAead.pas',
ClpIHpkeContext in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeContext.pas',
ClpIHpkeKem in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpkeKem.pas',
ClpIHpke in '..\..\CryptoLib\src\Interfaces\Crypto\Hpke\ClpIHpke.pas',
ClpHkdfParameters in '..\..\CryptoLib\src\Crypto\Parameters\ClpHkdfParameters.pas',
ClpHMac in '..\..\CryptoLib\src\Crypto\Macs\ClpHMac.pas',
ClpHMacDsaKCalculator in '..\..\CryptoLib\src\Crypto\Signers\SignerCalculators\ClpHMacDsaKCalculator.pas',
Expand Down Expand Up @@ -1115,6 +1126,7 @@ uses
Poly1305Tests in '..\src\Crypto\Poly1305Tests.pas',
NistSecureRandom in '..\src\Utils\NistSecureRandom.pas',
MlKemTests in '..\src\Crypto\MlKemTests.pas',
HpkeTests in '..\src\Crypto\HpkeTests.pas',
Lib25519Tests in '..\src\Crypto\Lib25519Tests.pas',
MlDsaTests in '..\src\Crypto\MlDsaTests.pas',
SlhDsaTests in '..\src\Crypto\SlhDsaTests.pas',
Expand Down Expand Up @@ -1169,6 +1181,7 @@ uses
PemReaderVectors in '..\src\Utils\Vectors\PemReaderVectors.pas',
PkcsVectors in '..\src\Utils\Vectors\PkcsVectors.pas',
PqcTestVectors in '..\src\Utils\Vectors\PqcTestVectors.pas',
HpkeVectors in '..\src\Utils\Vectors\HpkeVectors.pas',
CsvVectorLoaderBase in '..\src\Utils\Vectors\CsvVectorLoaderBase.pas',
TestKeyBuilders in '..\src\Utils\Vectors\TestKeyBuilders.pas',
PemDerCodec in '..\src\Utils\Vectors\PemDerCodec.pas',
Expand Down
10 changes: 9 additions & 1 deletion CryptoLib.Tests/FreePascal.Tests/CryptoLib.Tests.lpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<PackageName Value="FCL"/>
</Item4>
</RequiredPackages>
<Units Count="218">
<Units Count="220">
<Unit0>
<Filename Value="CryptoLib.lpr"/>
<IsPartOfProject Value="True"/>
Expand Down Expand Up @@ -953,6 +953,14 @@
<Filename Value="..\src\Crypto\CTAffineCombMultiplierTests.pas"/>
<IsPartOfProject Value="True"/>
</Unit217>
<Unit218>
<Filename Value="..\src\Crypto\HpkeTests.pas"/>
<IsPartOfProject Value="True"/>
</Unit218>
<Unit219>
<Filename Value="..\src\Utils\Vectors\HpkeVectors.pas"/>
<IsPartOfProject Value="True"/>
</Unit219>
</Units>
</ProjectOptions>
<CompilerOptions>
Expand Down
4 changes: 2 additions & 2 deletions CryptoLib.Tests/FreePascal.Tests/CryptoLib.lpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
CcmTests, EaxTests, CMacTests,
AeadModeTestBase, AeadTestUtilities, AeadEmptyInputTests, GcmReorderTests, GCMTests, GcmSivTests, GMacTests,
Pkcs12Tests, Bip327MuSig2Tests, Bip340SchnorrTests, AlgorithmFinderTests,
MlKemTests, MlDsaTests, PqcPkcsTests, SlhDsaTests, Lib25519Tests,
MlKemTests, HpkeTests, MlDsaTests, PqcPkcsTests, SlhDsaTests, Lib25519Tests,
Asn1CipherBuilderWithKeyTests, AesBitSlicedTests, ECDHPrimeConstantTimeTests,
ECDHBinaryConstantTimeTests, CryptoLibTestBase, PkixFoundationTests,
PkixNameConstraintTests, PkixComparerTests, CertPathTests, CertPathBuilderTests,
Expand All @@ -62,7 +62,7 @@
Argon2Vectors, AsymmetricTestVectors, SymmetricBlockVectors,
ChaChaPoly1305Vectors, OpenSslVectors, PemReaderVectors, PkcsVectors,
CertVectors, PkitsVectors, PqcSampleCredentials, TestKeyBuilders, PemDerCodec,
PqcTestVectors, DrbgTestVectors, Int32Tests, Int64Tests, ByteUtilitiesTests,
PqcTestVectors, HpkeVectors, DrbgTestVectors, Int32Tests, Int64Tests, ByteUtilitiesTests,
IPAddressUtilitiesTests, PemReaderTests;

{$R *.res}
Expand Down
10 changes: 9 additions & 1 deletion CryptoLib.Tests/FreePascal.Tests/CryptoLibConsole.lpi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
<PackageName Value="FCL"/>
</Item2>
</RequiredPackages>
<Units Count="218">
<Units Count="220">
<Unit0>
<Filename Value="CryptoLibConsole.lpr"/>
<IsPartOfProject Value="True"/>
Expand Down Expand Up @@ -912,6 +912,14 @@
<Filename Value="..\src\Crypto\CTAffineCombMultiplierTests.pas"/>
<IsPartOfProject Value="True"/>
</Unit217>
<Unit218>
<Filename Value="..\src\Crypto\HpkeTests.pas"/>
<IsPartOfProject Value="True"/>
</Unit218>
<Unit219>
<Filename Value="..\src\Utils\Vectors\HpkeVectors.pas"/>
<IsPartOfProject Value="True"/>
</Unit219>
</Units>
</ProjectOptions>
<CompilerOptions>
Expand Down
3 changes: 2 additions & 1 deletion CryptoLib.Tests/FreePascal.Tests/CryptoLibConsole.lpr
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
AeadModeTestBase, AeadTestUtilities, AeadEmptyInputTests, GcmReorderTests, GCMTests, GcmSivTests, GMacTests,
Pkcs12Tests, Bip327MuSig2Tests, Bip340SchnorrTests, AlgorithmFinderTests,
MlKemTests, MlDsaTests, SlhDsaTests, PqcTestSampler, PqcPkcsTests,
HpkeTests,
Lib25519Tests, Asn1CipherBuilderWithKeyTests, AesBitSlicedTests,
CryptoLibTestBase, PkixFoundationTests, PkixNameConstraintTests,
PkixComparerTests, CertPathTests, CertPathBuilderTests, CertPathValidatorTests,
Expand All @@ -61,7 +62,7 @@
AsymmetricTestVectors, SymmetricBlockVectors, ChaChaPoly1305Vectors,
OpenSslVectors, PkcsVectors, CertVectors, PkitsVectors, PqcSampleCredentials,
CsvVectorLoaderBase, TestKeyBuilders, PemDerCodec, PemReaderVectors,
Argon2Vectors, PqcTestVectors, DrbgTestVectors, Int32Tests, Int64Tests,
Argon2Vectors, PqcTestVectors, HpkeVectors, DrbgTestVectors, Int32Tests, Int64Tests,
ByteUtilitiesTests, IPAddressUtilitiesTests, PemReaderTests,
ECDHPrimeConstantTimeTests, ECDHBinaryConstantTimeTests;

Expand Down
Loading