From: "comododragon (Code Review)"
Date: Mon, 7 Jul 2025 09:23:48 +0000
In-Reply-To:
References:
Reply-To: rein.vanbaaren@...1435..., arne-openvpn@...1227...,
openvpn-devel@lists.sourceforge.net, frank@...2641...,
gert@...1296...
Message-ID: <6b016645c6a09b35e07af68a569f7ebcb1c44c00-EmailReplacePatchSet-HTML@...2715...>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Content-Disposition: inline
Content-Type: multipart/alternative; boundary="CvwXbQMauf8="; charset=UTF-8
Subject: [Openvpn-devel] [S] Change in openvpn[master]: Added PQE to WolfSSL
List-Id:
List-Unsubscribe: ,
List-Archive:
List-Post:
List-Help:
List-Subscribe: ,
To: plaisthos , flichtenheld
Cc: openvpn-devel
--CvwXbQMauf8=
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: comododragon, cron2, flichtenheld, pl=
aisthos.
Hello cron2, flichtenheld, plaisthos,
I'd like you to reexamine a change. Please visit
http://gerrit.openvpn.net/c/openvpn/+/1046?usp=3Demail
to look at the new patch set (#6).
The following approvals got outdated and were removed:
Code-Review+1 by cron2, Code-Review+1 by plaisthos
Change subject: Added PQE to WolfSSL
......................................................................
Added PQE to WolfSSL
Change-Id: Ie0529c2074964b3be034f01e0ef53090a6edbd35
---
M README.wolfssl
M src/openvpn/ssl_openssl.c
2 files changed, 31 insertions(+), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/46/1046/6
diff --git a/README.wolfssl b/README.wolfssl
index a5dfe31..7475164 100644
--- a/README.wolfssl
+++ b/README.wolfssl
@@ -28,3 +28,33 @@
* blowfish support (BF-CBC), you must use something like
cipher AES-128-CBC to avoid trying to use BF-CBC
* Windows CryptoAPI support
+
+*************************************************************************
+To build WolfSSL with post-quantum KEMs built in, the following command is=
used:
+
+./configure --enable-openvpn --enable-kyber=3Dall --enable-curve25519
+
+WolfSSL supports the following post-quantum KEMs and post-quantum hybrid K=
EMs which must be specified
+using the tls-groups option in an OpenVPN config. Unlike OpenSSL, which in=
cludes X25519MLKEM768
+in the default config, WolfSSL requires explicit configuration of tls-grou=
ps to include
+at least one post-quantum KEM.
+
+ML_KEM_512
+ML_KEM_768
+ML_KEM_1024
+
+P256_ML_KEM_512
+X25519_ML_KEM_512
+
+P384_ML_KEM_768
+P256_ML_KEM_768
+X448_ML_KEM_768
+X25519_ML_KEM_768
+
+P384_ML_KEM_1024
+P521_ML_KEM_1024
+
+The naming conventions of algorithms differ between WolfSSL and OpenSSL. A=
n example is that
+OpenSSL omits underscores for their naming notation whereas WolfSSL expect=
s them. Additionally,
+OpenSSL does not accept the P curve notation and instead uses the equivale=
nt secp notation.
+A specific example is that WolfSSL expects P384_ML_KEM_1024, while OpenSSL=
expects secp384r1MLKEM1024.
diff --git a/src/openvpn/ssl_openssl.c b/src/openvpn/ssl_openssl.c
index 2fc77d8..4c11cd4 100644
--- a/src/openvpn/ssl_openssl.c
+++ b/src/openvpn/ssl_openssl.c
@@ -560,7 +560,7 @@
tls_ctx_set_tls_groups(struct tls_root_ctx *ctx, const char *groups)
{
ASSERT(ctx);
-#if OPENSSL_VERSION_NUMBER < 0x30000000L
+#if OPENSSL_VERSION_NUMBER < 0x30000000L && !defined(ENABLE_CRYPTO_WOLFSSL)
struct gc_arena gc =3D gc_new();
/* This method could be as easy as
* SSL_CTX_set1_groups_list(ctx->ctx, groups)
--
To view, visit http://gerrit.openvpn.net/c/openvpn/+/1046?usp=3Demail
To unsubscribe, or for help writing mail filters, visit http://gerrit.openv=
pn.net/settings
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie0529c2074964b3be034f01e0ef53090a6edbd35
Gerrit-Change-Number: 1046
Gerrit-PatchSet: 6
Gerrit-Owner: comododragon
Gerrit-Reviewer: cron2
Gerrit-Reviewer: flichtenheld
Gerrit-Reviewer: plaisthos
Gerrit-CC: openvpn-devel
Gerrit-Attention: plaisthos
Gerrit-Attention: cron2
Gerrit-Attention: flichtenheld
Gerrit-Attention: comododragon
Gerrit-MessageType: newpatchset
--CvwXbQMauf8=
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Attention is currently required from: comododragon, cron2, flichtenheld=
, plaisthos.
comododragon uploaded patch set #6 to this change.
<=
p>View C=
hange
The following approvals got outdated and were removed:
Code-Review+1 by cron2, Code-Review+1 by plaisthos
Added PQE to WolfSSL
=
Change-Id: Ie0529c2074964b3be034f01e0ef53090a6edbd35
---
M README=
.wolfssl
M src/openvpn/ssl_openssl.c
2 files changed, 31 insertions(+=
), 1 deletion(-)
git pull ssh://gerrit.openvpn.net:29418/openvpn =
refs/changes/46/1046/6
diff --git a/README.wolfssl b/README.wolfssl=
index a5dfe31..7475164 100644
--- a/README=
.wolfssl
+++ b/README.wolfssl
@@ -28,3 +28,=
33 @@
* blowfish support (BF-CBC), you must use something=
like
cipher AES-128-CBC to avoid trying to use BF-CBC<=
/span>
* Windows CryptoAPI support
+
+********************************************************************=
*****
+To build WolfS=
SL with post-quantum KEMs built in, the following command is used:+
+./configure --enable-openvpn --enable-kyber=3Da=
ll --enable-curve25519
+
+WolfSSL supports=
the following post-quantum KEMs and post-quantum hybrid KEMs which must be=
specified
+using th=
e tls-groups option in an OpenVPN config. Unlike OpenSSL, which includes X2=
5519MLKEM768
+in the=
default config, WolfSSL requires explicit configuration of tls-groups to i=
nclude
+at least one=
post-quantum KEM.
+<=
/span>
+ML_KEM_512
+ML_KEM_768
+ML_KEM_1024
+
+P256_ML_KEM_512
+X25519_ML_KEM_512
+
+P384_ML_KEM_768=
+P256_ML_KEM_768
+X448_ML_KEM_768<=
br>+X25519_ML_KEM_768
+
+P384_ML_KEM_1024
+P521_ML_KEM_1024
+
+The naming conventions of algorithms differ between WolfSSL and OpenSSL. =
An example is that
+O=
penSSL omits underscores for their naming notation whereas WolfSSL expects =
them. Additionally,
=
+OpenSSL does not accept the P curve notation and instead uses the equivale=
nt secp notation.
+A=
specific example is that WolfSSL expects P384_ML_KEM_1024, while OpenSSL e=
xpects secp384r1MLKEM1024.
diff --git a/src/openvpn/ssl_ope=
nssl.c b/src/openvpn/ssl_openssl.c
index 2fc77d8..4c11cd4 1=
00644
--- a/src/openvpn/ssl_openssl.c
+++ b=
/src/openvpn/ssl_openssl.c
@@ -560,7 +560,7 @@
tls_ctx_set_tls_groups(struct tls_root_ctx *ctx, const char *groups)=
span>
{
ASSERT(ctx);
-#if OPENSSL_VERSION_NUMBER < 0x30000000L=
+#if OPENSSL_VERSION=
_NUMBER < 0x30000000L && !defined(ENABLE_CRYPTO_WOLFSSL)<=
br> struct gc_arena gc =3D gc_new();
/* This=
method could be as easy as
* SSL_CTX_set1_groups_li=
st(ctx->ctx, groups)
To view, visit =
change 1=
046. To unsubscribe, or for help writing mail filters, visit settings.
Gerrit-Project: openvpn
Gerrit-Branch: master
Gerrit-Change-Id: Ie0529c2074964b3be034f01e0ef=
53090a6edbd35
Gerrit-Change-Number: 1046
Gerrit-PatchSet: 6
Gerrit-Owner: comododragon <rein.vanbaaren@=
...1435...>
Gerrit-Reviewer: cron2 <gert@...1296...>=
Gerrit-Reviewer: flichtenheld <frank@...2716...=
1...>
Gerrit-Reviewer: plaisthos <arne-openvpn@...1186...=
.1227...>
Gerrit-CC: openvpn-devel <openvpn-devel@...1484...=
ts.sourceforge.net>
Gerrit-Attention: plaisthos <arne-openvpn@...220...=
..1227...>
Gerrit-Attention: cron2 <gert@...1296...>=
;
Gerrit-Attention: flichtenheld <frank@...2375...=
41...>
Gerrit-Attention: comododragon <rein.vanbaa=
ren@...1435...>
Gerrit-MessageType: newpatchset
--CvwXbQMauf8=--