8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism #21478

blperez01 · 2024-10-11T20:12:52Z

Java implementation of ML-KEM, the FIPS 203 post-quantum KEM scheme. Depends on #21167

Progress

Change must be properly reviewed (1 review required, with at least 1 Reviewer)
Change must not contain extraneous whitespace
Commit message must refer to an issue
Change requires CSR request JDK-8342630 to be approved

Issues

JDK-8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism (Enhancement - P3)
JDK-8342630: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism (CSR)

Reviewers

Valerie Peng (@valeriepeng - Reviewer)

Contributors

Ferenc Rakoczi <ferenc.r.rakoczi@oracle.com>

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/21478/head:pull/21478
$ git checkout pull/21478

Update a local copy of the PR:
$ git checkout pull/21478
$ git pull https://git.openjdk.org/jdk.git pull/21478/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21478

View PR using the GUI difftool:
$ git pr show -t 21478

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21478.diff

Using Webrev

Link to Webrev Comment

bridgekeeper · 2024-10-11T20:13:50Z

👋 Welcome back bperez! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2024-10-11T20:14:20Z

@blperez01 This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism

Co-authored-by: Ferenc Rakoczi <ferenc.r.rakoczi@oracle.com>
Reviewed-by: valeriep

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 225 new commits pushed to the master branch:

6d3becb: 8344861: Disable CheckJNICalls in tests until JDK-8344802 is fixed
15dbb6a: 8344219: Remove calls to SecurityManager and doPrivileged in java.net.SocksSocketImpl after JEP 486 integration
9769ee8: 8344652: Remove access control context text from SSLEngine and SSLSession APIs
82c3612: 8344830: [BACKOUT] JDK-8341334: CDS: Parallel relocation
64e4aa2: 8339916: AIOOBE due to Math.abs(Integer.MIN_VALUE) in tests
bf374c3: 8343453: Modernize FloatingDecimal tests
847f65c: 8344844: ciReplay tests fail with -XX:+UseCompactObjectHeaders because CDS is disabled since JDK-8341553
8903854: 8344718: Test runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java fails on Linuxppc64le after JDK-8344239
a07b72b: 8344346: java/net/httpclient/ShutdownNow.java fails with java.lang.AssertionError: client was still running, but exited after further delay: timeout should be adjusted
2ea0364: 8343893: Test jdk/jfr/event/runtime/TestNativeMemoryUsageEvents.java failed: heap should have grown and NMT should show that: expected 0 > 0
... and 215 more: https://git.openjdk.org/jdk/compare/5e01c40b19a5bf4d0266747ca73aca4193799d97...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

openjdk · 2024-10-11T20:15:05Z

@blperez01 The following label will be automatically applied to this pull request:

security

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

mlbridge · 2024-10-11T20:18:23Z

Webrevs

YouliangGuo · 2024-10-15T14:53:42Z

this PR shall link to JDK-8298390 Implementing ML-KEM key encapsulation mechanism. Not JEP task [JDK-8339009]

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Provider.java

wangweij · 2024-11-04T18:43:30Z

Please implement the key checks at the beginnings of sections 7.2 and 7.3 of FIPS 203 in implCheckPublicKey and implCheckPrivateKey so it can detected earlier in newEcapsulator and newDecapsulator.

The current isValidDecapsulationKey does not include the hash check.

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Provider.java

blperez01 · 2024-11-15T17:08:04Z

Please implement the key checks at the beginnings of sections 7.2 and 7.3 of FIPS 203 in implCheckPublicKey and implCheckPrivateKey so it can detected earlier in newEcapsulator and newDecapsulator.

The current isValidDecapsulationKey does not include the hash check.

This has been fixed and now the checks happen in checkPublicKey and checkPrivateKey

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java

valeriepeng · 2024-11-20T22:42:26Z

Note the bot warning about "extraneous white spaces"...

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java

openjdk · 2024-11-22T15:37:50Z

@blperez01 ferakocz was not found in the census.

Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

/contributor add @openjdk-bot
/contributor add duke
/contributor add J. Duke <duke@openjdk.org>

User names can only be used for users in the census associated with this repository. For other contributors you need to supply the full name and email address.

blperez01 · 2024-11-22T15:39:44Z

/contributor add ferenc.r.rakoczi@oracle.com

openjdk · 2024-11-22T15:40:25Z

@blperez01 ferenc.r.rakoczi@oracle.com is not a valid name and email string.

Syntax: /contributor (add|remove) [@user | openjdk-user | Full Name <email@address>]. For example:

/contributor add @openjdk-bot
/contributor add duke
/contributor add J. Duke <duke@openjdk.org>

User names can only be used for users in the census associated with this repository. For other contributors you need to supply the full name and email address.

blperez01 · 2024-11-22T15:42:16Z

/contributor add Ferenc Rakoczi ferenc.r.rakoczi@oracle.com

openjdk · 2024-11-22T15:43:01Z

@blperez01
Contributor Ferenc Rakoczi <ferenc.r.rakoczi@oracle.com> successfully added.

blperez01 · 2024-11-22T16:35:56Z

/integrate

openjdk · 2024-11-22T16:36:57Z

Going to push as commit 13987b4.
Since your change was applied there have been 225 commits pushed to the master branch:

6d3becb: 8344861: Disable CheckJNICalls in tests until JDK-8344802 is fixed
15dbb6a: 8344219: Remove calls to SecurityManager and doPrivileged in java.net.SocksSocketImpl after JEP 486 integration
9769ee8: 8344652: Remove access control context text from SSLEngine and SSLSession APIs
82c3612: 8344830: [BACKOUT] JDK-8341334: CDS: Parallel relocation
64e4aa2: 8339916: AIOOBE due to Math.abs(Integer.MIN_VALUE) in tests
bf374c3: 8343453: Modernize FloatingDecimal tests
847f65c: 8344844: ciReplay tests fail with -XX:+UseCompactObjectHeaders because CDS is disabled since JDK-8341553
8903854: 8344718: Test runtime/cds/appcds/jigsaw/addmods/AddmodsOption.java fails on Linuxppc64le after JDK-8344239
a07b72b: 8344346: java/net/httpclient/ShutdownNow.java fails with java.lang.AssertionError: client was still running, but exited after further delay: timeout should be adjusted
2ea0364: 8343893: Test jdk/jfr/event/runtime/TestNativeMemoryUsageEvents.java failed: heap should have grown and NMT should show that: expected 0 > 0
... and 215 more: https://git.openjdk.org/jdk/compare/5e01c40b19a5bf4d0266747ca73aca4193799d97...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-11-22T16:37:05Z

@blperez01 Pushed as commit 13987b4.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

wangweij and others added 9 commits September 24, 2024 12:32

the fix

458f848

renames

ba68b30

ensure key is intact after being used

4a97423

add support for private class RawKeySpec

5dd08ef

more test, more RAW support, fix a bug on cleaning up getRawBytes output

1516c96

Merge branch 'master' into 8340327

c11e4ef

Refactored ML_KEM to separate core protocol from ML_KEM_Provider

09a73c7

Added SHA3Parallel

03cfcca

Added ML_KEM_Provider

b557a6a

openjdk bot added the rfr Pull request is ready for review label Oct 11, 2024

openjdk bot added the security security-dev@openjdk.org label Oct 11, 2024

wangweij added 2 commits October 11, 2024 17:26

remove PR21167 changes

5992b55

Merge branch 'master' into ml-kem

3b3e782

wangweij added 3 commits October 15, 2024 12:42

add a newline and remove one

18e8f9a

cleanup

94eab17

NamedParameterSpec constants

e595643

blperez01 changed the title ~~8339009: ML-KEM Quantum-Resistant Key Encapsulation Mechanism~~ 8298390: Implementing ML-KEM key encapsulation mechanism Oct 22, 2024

openjdk bot added the csr Pull request needs approved CSR before integration label Oct 22, 2024

mcpowers reviewed Nov 1, 2024

View reviewed changes

wangweij reviewed Nov 4, 2024

View reviewed changes

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Provider.java Outdated Show resolved Hide resolved

wangweij and others added 3 commits November 4, 2024 14:12

randomMessage belongs to its caller

f80e8d7

Removed several unused variables and unnecessy allocations

d1f42ef

Added benchmark

505f2e2

openjdk bot removed the rfr Pull request is ready for review label Nov 5, 2024

openjdk bot removed the csr Pull request needs approved CSR before integration label Nov 15, 2024

valeriepeng reviewed Nov 19, 2024

View reviewed changes

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM_Impls.java Outdated Show resolved Hide resolved

Fixed errors and removed intrinsics functionality

62abd47

openjdk bot removed the rfr Pull request is ready for review label Nov 19, 2024

blperez01 and others added 2 commits November 20, 2024 13:19

Added ML-KEM to the Deterministic.java test

587aa40

ML_KEM no longer initialized with int

b9eb0a1

jnimeh reviewed Nov 21, 2024

View reviewed changes

src/java.base/share/classes/com/sun/crypto/provider/ML_KEM.java Outdated Show resolved Hide resolved

Removed trailing whitespace, shortened lines

33238ce

openjdk bot added the rfr Pull request is ready for review label Nov 21, 2024

valeriepeng approved these changes Nov 21, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 21, 2024

removed unnecessary allocations in mlKemVectorScalarMult

89b0212

openjdk bot removed the ready Pull request is ready to be integrated label Nov 21, 2024

valeriepeng approved these changes Nov 22, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Nov 22, 2024

openjdk bot added the integrated Pull request has been integrated label Nov 22, 2024

openjdk bot closed this Nov 22, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 22, 2024

sendaoYan mentioned this pull request Nov 23, 2024

4 tests fails by jdk main-line repo rh-openjdk/CryptoTest#74

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism #21478

8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism #21478

blperez01 commented Oct 11, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Oct 11, 2024

openjdk bot commented Oct 11, 2024 •

edited

Loading

openjdk bot commented Oct 11, 2024

mlbridge bot commented Oct 11, 2024 •

edited

Loading

YouliangGuo commented Oct 15, 2024

wangweij commented Nov 4, 2024 •

edited

Loading

blperez01 commented Nov 15, 2024

valeriepeng commented Nov 20, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism #21478

8298390: Implement JEP 496: Quantum-Resistant Module-Lattice-Based Key Encapsulation Mechanism #21478

Conversation

blperez01 commented Oct 11, 2024 • edited by openjdk bot Loading

Progress

Issues

Reviewers

Contributors

Reviewing

bridgekeeper bot commented Oct 11, 2024

openjdk bot commented Oct 11, 2024 • edited Loading

openjdk bot commented Oct 11, 2024

mlbridge bot commented Oct 11, 2024 • edited Loading

Webrevs

YouliangGuo commented Oct 15, 2024

wangweij commented Nov 4, 2024 • edited Loading

blperez01 commented Nov 15, 2024

valeriepeng commented Nov 20, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

openjdk bot commented Nov 22, 2024

blperez01 commented Oct 11, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Oct 11, 2024 •

edited

Loading

mlbridge bot commented Oct 11, 2024 •

edited

Loading

wangweij commented Nov 4, 2024 •

edited

Loading