[Openvpn-devel,2.5] config-msvc.h: indicate key material export support

Message ID 20211213135814.265-1-lstipakov@gmail.com
State Accepted
Headers show
Series
  • [Openvpn-devel,2.5] config-msvc.h: indicate key material export support
Related show

Commit Message

Lev Stipakov Dec. 13, 2021, 1:58 p.m.
From: Lev Stipakov <lev@openvpn.net>

MSVC build uses OpenSSL from vcpkg, which at the moment
is 1.1.1l. Key material export was added to 1.1.1, so it is safe
to indicate its support unconditionally.

This enables Windows releases to benefit from tls-ekm
data channel keys derivation.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
---
 config-msvc.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Lev Stipakov Dec. 13, 2021, 2:03 p.m. | #1
Hi,

I just realized that tls-ekm is a 2.6 feature, which means that
while patch is still valid for 2.5, the last sentence in the commit message
is not.
Gert Doering Dec. 13, 2021, 2:51 p.m. | #2
Acked-by: Gert Doering <gert@greenie.muc.de>

Applied to 2.5 even if 2.5 does not have tls-ekm, but it has the
generic "keying material export" which works in 2.5.0-2.5.3 and got
broken due to the change to MSVC in 2.5.4 -> regression, bugfix.

Your patch has been applied to the release/2.5 branch.

commit 0cad4ec29ad303bf1ec64035f0345e3dacf5a932
Author: Lev Stipakov
Date:   Mon Dec 13 15:58:14 2021 +0200

     config-msvc.h: indicate key material export support

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20211213135814.265-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23395.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/config-msvc.h b/config-msvc.h
index a624f97d..e7479c86 100644
--- a/config-msvc.h
+++ b/config-msvc.h
@@ -113,6 +113,8 @@ 
 #define HAVE_EC_GROUP_ORDER_BITS 1
 #define HAVE_EVP_CIPHER_CTX_RESET 1
 
+#define HAVE_EXPORT_KEYING_MATERIAL 1
+
 #define HAVE_DIINSTALLDEVICE 1
 
 #define PATH_SEPARATOR     '\\'