Skip to content

Commit 38d7614

Browse files
author
Roland Mesde
committed
8379515: draft-ietf-lamps-kyber-certificates is now RFC 9935
Backport-of: 375f821
1 parent b5d705e commit 38d7614

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/java.base/share/classes/sun/security/util/KeyChoices.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2025, 2026, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
4545
* </pre>
4646
* This class supports reading, writing, and converting between them.
4747
* <p>
48-
* Current code follows draft-ietf-lamps-kyber-certificates-11 and RFC 9881.
48+
* Current code follows RFC 9935 and RFC 9881.
4949
*/
5050
public final class KeyChoices {
5151

src/java.base/share/conf/security/java.security

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1675,7 +1675,7 @@ com.sun.security.allowedAIALocations=
16751675
#
16761676
# PKCS #8 encoding format for newly created ML-KEM and ML-DSA private keys
16771677
#
1678-
# draft-ietf-lamps-kyber-certificates-11 and RFC 9881 define three possible formats for a private key:
1678+
# RFC 9935 and RFC 9881 define three possible formats for a private key:
16791679
# a seed (64 bytes for ML-KEM, 32 bytes for ML-DSA), an expanded private key,
16801680
# or a sequence containing both.
16811681
#

test/jdk/sun/security/provider/pqc/PrivateKeyEncodings.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
* @bug 8347938
2727
* @library /test/lib
2828
* @summary ensure ML-KEM and ML-DSA encodings consistent with
29-
* draft-ietf-lamps-kyber-certificates-11 and RFC 9881
29+
* RFC 9935 and RFC 9881
3030
* @modules java.base/com.sun.crypto.provider
3131
* java.base/sun.security.pkcs
3232
* java.base/sun.security.provider
@@ -62,17 +62,17 @@
6262
public class PrivateKeyEncodings {
6363

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

0 commit comments

Comments
 (0)