Skip to content

Commit 47c33f6

Browse files
bwesterbghedo
authored andcommitted
pq patch: also enable P256Kyber768Draft00 by default
1 parent 410a967 commit 47c33f6

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

boring-sys/patches/boring-pq.patch

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
From 6f1b1e1f451e61cd2bda0922eecaa8387397ac5a Mon Sep 17 00:00:00 2001
1+
From 969fc4fb866c94b6585c323d6e27571e5286f845 Mon Sep 17 00:00:00 2001
22
From: Bas Westerbaan <bas@cloudflare.com>
33
Date: Thu, 2 Oct 2025 13:07:05 +0200
44
Subject: [PATCH] Add additional post-quantum key agreements
@@ -20,7 +20,7 @@ This patch adds:
2020
2. Supports for P256Kyber768Draft00 under 0xfe32, which we temporarily
2121
need for compliance reasons. (Note that this is not the codepoint
2222
allocated for that exchange in the IANA table.)
23-
It also enables it in FIPS mode.
23+
Enables by default and in FIPS mode.
2424

2525
3. Support for X25519Kyber768Draft00 under the old codepoint 0xfe31.
2626

@@ -46,12 +46,12 @@ Cf RTG-2076 RTG-2051 RTG-2508 RTG-2707 RTG-2607 RTG-3239
4646
include/openssl/nid.h | 12 +
4747
include/openssl/ssl.h | 4 +
4848
sources.cmake | 2 -
49-
ssl/extensions.cc | 5 +
49+
ssl/extensions.cc | 6 +
5050
ssl/ssl_key_share.cc | 525 ++++++-
5151
ssl/ssl_lib.cc | 2 +-
5252
ssl/ssl_test.cc | 29 +-
5353
tool/speed.cc | 162 +-
54-
18 files changed, 3082 insertions(+), 1158 deletions(-)
54+
18 files changed, 3083 insertions(+), 1158 deletions(-)
5555
delete mode 100644 crypto/kyber/internal.h
5656
create mode 100644 crypto/kyber/kyber512.c
5757
create mode 100644 crypto/kyber/kyber768.c
@@ -3866,7 +3866,7 @@ index ba2f5bc9e..d7ef5153a 100644
38663866
crypto/pkcs8/test/no_encryption.p12
38673867
crypto/pkcs8/test/nss.p12
38683868
diff --git a/ssl/extensions.cc b/ssl/extensions.cc
3869-
index b13400097..894396414 100644
3869+
index b13400097..44a2d0f5c 100644
38703870
--- a/ssl/extensions.cc
38713871
+++ b/ssl/extensions.cc
38723872
@@ -207,6 +207,10 @@ static bool tls1_check_duplicate_extensions(const CBS *cbs) {
@@ -3880,11 +3880,12 @@ index b13400097..894396414 100644
38803880
return true;
38813881
default:
38823882
return false;
3883-
@@ -307,6 +311,7 @@ bool ssl_client_hello_get_extension(const SSL_CLIENT_HELLO *client_hello,
3883+
@@ -307,6 +311,8 @@ bool ssl_client_hello_get_extension(const SSL_CLIENT_HELLO *client_hello,
38843884
}
38853885

38863886
static const uint16_t kDefaultGroups[] = {
38873887
+ SSL_GROUP_X25519_MLKEM768,
3888+
+ SSL_GROUP_P256_KYBER768_DRAFT00,
38883889
SSL_GROUP_X25519,
38893890
SSL_GROUP_SECP256R1,
38903891
SSL_GROUP_SECP384R1,

0 commit comments

Comments
 (0)