Skip to content

8379515: draft-ietf-lamps-kyber-certificates is now RFC 9935 #447

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

Closed
rm-gh-8 wants to merge 3 commits into from
Closed

8379515: draft-ietf-lamps-kyber-certificates is now RFC 9935 #447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddf4fae
Backport e51ccef9cb415ed31db70971bb439ca3d96c5bce
rm-gh-8 Apr 2, 2026
3222186
Backport 375f8216271b370740658c40e826ae47e13a07fb
rm-gh-8 Apr 2, 2026
016aaad
Merge master
rm-gh-8 Apr 8, 2026
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
4 changes: 2 additions & 2 deletions src/java.base/share/classes/sun/security/util/KeyChoices.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -45,7 +45,7 @@
* </pre>
* This class supports reading, writing, and converting between them.
* <p>
* Current code follows draft-ietf-lamps-kyber-certificates-11 and RFC 9881.
* Current code follows RFC 9935 and RFC 9881.
*/
public final class KeyChoices {

Expand Down
2 changes: 1 addition & 1 deletion src/java.base/share/conf/security/java.security
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1675,7 +1675,7 @@ com.sun.security.allowedAIALocations=
#
# PKCS #8 encoding format for newly created ML-KEM and ML-DSA private keys
#
# draft-ietf-lamps-kyber-certificates-11 and RFC 9881 define three possible formats for a private key:
# RFC 9935 and RFC 9881 define three possible formats for a private key:
# a seed (64 bytes for ML-KEM, 32 bytes for ML-DSA), an expanded private key,
# or a sequence containing both.
#
Expand Down
12 changes: 6 additions & 6 deletions test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
* @bug 8347938
* @library /test/lib
* @summary ensure ML-KEM and ML-DSA encodings consistent with
* draft-ietf-lamps-kyber-certificates-11 and RFC 9881
* RFC 9935 and RFC 9881
* @modules java.base/com.sun.crypto.provider
* java.base/sun.security.pkcs
* java.base/sun.security.provider
Expand Down Expand Up @@ -62,17 +62,17 @@
public class PrivateKeyEncodings {

public static void main(String[] args) throws Exception {
// Example keys and certificates draft-ietf-lamps-kyber-certificates-11, Appendix B
// (https://datatracker.ietf.org/doc/html/draft-ietf-lamps-kyber-certificates-11#autoid-17)
// and RFC 9881, Appendix C.3
// (https://datatracker.ietf.org/doc/html/rfc9881#name-example-certificates)
// Example keys and certificates in RFC 9935, Appendix C
// (https://datatracker.ietf.org/doc/html/rfc9935#name-examples)
// and RFC 9881, Appendix C
// (https://datatracker.ietf.org/doc/html/rfc9881#name-examples)
//
// These data can be retrieved from the following GitHub releases:
// https://github.com/lamps-wg/kyber-certificates/releases/tag/draft-ietf-lamps-kyber-certificates-11
// https://github.com/lamps-wg/dilithium-certificates/releases/tag/draft-ietf-lamps-dilithium-certificates-13
//
// Although the release tags include "draft", these values are the
// same as those in the final RFC 9881.
// same as those in the final RFCs.
try (var kemReader = RepositoryFileReader.of(RepositoryFileReader.KYBER_CERTIFICATES.class,
"kyber-certificates-draft-ietf-lamps-kyber-certificates-11/");
var dsaReader = RepositoryFileReader.of(RepositoryFileReader.DILITHIUM_CERTIFICATES.class,
Expand Down