Compare commits
33 Commits
| Author | SHA1 | Date |
|---|---|---|
Frank Lichtenheld
|
867f08ccda | 5 months ago |
|
Frank Lichtenheld
|
1b8e79eb8d | 5 months ago |
David Sommerseth
|
b76e8a4c9d | 1 year ago |
David Sommerseth
|
5bfc18d059 | 2 years ago |
|
David Sommerseth
|
7a351506fd | 2 years ago |
|
David Sommerseth
|
eae8a65248 | 3 years ago |
|
David Sommerseth
|
3751b7ae1f | 3 years ago |
|
David Sommerseth
|
9c2a62d8fb | 3 years ago |
|
David Sommerseth
|
c66021082f | 3 years ago |
|
David Sommerseth
|
319722d474 | 3 years ago |
Fedora Release Engineering
|
17755bc969 | 3 years ago |
|
David Sommerseth
|
115523d4da | 3 years ago |
|
David Sommerseth
|
0babf7defa | 3 years ago |
|
David Sommerseth
|
b0362d8141 | 3 years ago |
Sahana Prasad
|
f277725e6b | 3 years ago |
|
Fedora Release Engineering
|
41c090a5f6 | 3 years ago |
|
David Sommerseth
|
7da2216c08 | 4 years ago |
|
David Sommerseth
|
4214b7e799 | 4 years ago |
Zbigniew Jędrzejewski-Szmek
|
81b76b938b | 4 years ago |
|
David Sommerseth
|
ddc4a6440e | 4 years ago |
|
Fedora Release Engineering
|
1210c40ec2 | 4 years ago |
Tom Stellard
|
6f1ad806d4 | 4 years ago |
|
David Sommerseth
|
1abef035ab | 4 years ago |
|
David Sommerseth
|
fbbe525207 | 4 years ago |
Orion Poplawski
|
533cc03efe | 4 years ago |
|
Fedora Release Engineering
|
6321a99faf | 4 years ago |
|
David Sommerseth
|
60c2c0a774 | 5 years ago |
|
David Sommerseth
|
bfb1ec1f13 | 5 years ago |
|
David Sommerseth
|
80a500f528 | 5 years ago |
|
Fedora Release Engineering
|
3ac946d388 | 5 years ago |
|
David Sommerseth
|
8899cb7ced | 5 years ago |
Vladimír Beneš
|
77fe21e2ae | 5 years ago |
|
Fedora Release Engineering
|
a01f0fd1bb | 6 years ago |
@ -0,0 +1,225 @@
|
||||
From cf5864f5922e4f40357d9f75a35cd448e671dddf Mon Sep 17 00:00:00 2001
|
||||
From: Arne Schwabe <arne@rfc2549.org>
|
||||
Date: Fri, 3 Jun 2022 11:52:19 +0200
|
||||
Subject: [PATCH] Allow running a default configuration with TLS libraries
|
||||
without BF-CBC
|
||||
|
||||
Modern TLS libraries might drop Blowfish by default or distributions
|
||||
might disable Blowfish in OpenSSL/mbed TLS. We still signal OCC
|
||||
options with BF-CBC compatible strings. To avoid requiring BF-CBC
|
||||
for this, special this one usage of BF-CBC enough to avoid a hard
|
||||
requirement on Blowfish in the default configuration.
|
||||
|
||||
This patch is cherry-picked from 79ff3f79 and the missing
|
||||
ciphername = "none"; has been added in the OCC code.
|
||||
|
||||
Due to uncrustify complains, a few extra whitespace fixes had to be
|
||||
done to options.c.
|
||||
|
||||
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
|
||||
Acked-by: Gert Doering <gert@greenie.muc.de>
|
||||
Message-Id: <20220603095219.637361-1-arne@rfc2549.org>
|
||||
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24456.html
|
||||
Signed-off-by: Gert Doering <gert@greenie.muc.de>
|
||||
---
|
||||
src/openvpn/crypto_backend.h | 2 ++
|
||||
src/openvpn/init.c | 37 ++++++++++++++++-----
|
||||
src/openvpn/options.c | 62 ++++++++++++++++++++++++++++--------
|
||||
3 files changed, 80 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/src/openvpn/crypto_backend.h b/src/openvpn/crypto_backend.h
|
||||
index a9bb38ed..aebda3d6 100644
|
||||
--- a/src/openvpn/crypto_backend.h
|
||||
+++ b/src/openvpn/crypto_backend.h
|
||||
@@ -256,6 +256,8 @@ const cipher_kt_t *cipher_kt_get(const char *ciphername);
|
||||
* The returned name is normalised to the OpenVPN config name in case the
|
||||
* name differs from the name used by the crypto library.
|
||||
*
|
||||
+ * Returns [null-cipher] in case the cipher_kt is NULL.
|
||||
+ *
|
||||
* @param cipher_kt Static cipher parameters
|
||||
*
|
||||
* @return a statically allocated string describing the cipher.
|
||||
diff --git a/src/openvpn/init.c b/src/openvpn/init.c
|
||||
index da4d60af..b1b7b350 100644
|
||||
--- a/src/openvpn/init.c
|
||||
+++ b/src/openvpn/init.c
|
||||
@@ -2764,14 +2764,35 @@ do_init_crypto_tls_c1(struct context *c)
|
||||
#endif /* if P2MP */
|
||||
}
|
||||
|
||||
- /* Do not warn if we only have BF-CBC in options->ciphername
|
||||
- * because it is still the default cipher */
|
||||
- bool warn = !streq(options->ciphername, "BF-CBC")
|
||||
- || options->enable_ncp_fallback;
|
||||
- /* Get cipher & hash algorithms */
|
||||
- init_key_type(&c->c1.ks.key_type, options->ciphername, options->authname,
|
||||
- options->keysize, true, warn);
|
||||
-
|
||||
+ /*
|
||||
+ * BF-CBC is allowed to be used only when explicitly configured
|
||||
+ * as NCP-fallback or when NCP has been disabled or explicitly
|
||||
+ * allowed in the in ncp_ciphers list.
|
||||
+ * In all other cases do not attempt to initialize BF-CBC as it
|
||||
+ * may not even be supported by the underlying SSL library.
|
||||
+ *
|
||||
+ * Therefore, the key structure has to be initialized when:
|
||||
+ * - any non-BF-CBC cipher was selected; or
|
||||
+ * - BF-CBC is selected and NCP is disabled (explicit request to
|
||||
+ * use the BF-CBC cipher); or
|
||||
+ * - BF-CBC is selected, NCP is enabled and fallback is enabled
|
||||
+ * (BF-CBC will be the fallback).
|
||||
+ * - BF-CBC is in data-ciphers and we negotiate to use BF-CBC:
|
||||
+ * If the negotiated cipher and options->ciphername are the
|
||||
+ * same we do not reinit the cipher
|
||||
+ *
|
||||
+ * Note that BF-CBC will still be part of the OCC string to retain
|
||||
+ * backwards compatibility with older clients.
|
||||
+ */
|
||||
+ if (!streq(options->ciphername, "BF-CBC") || !options->ncp_enabled
|
||||
+ || (options->ncp_enabled && tls_item_in_cipher_list("BF-CBC", options->ncp_ciphers))
|
||||
+ || options->enable_ncp_fallback)
|
||||
+ {
|
||||
+ /* Do not warn if the if the cipher is used only in OCC */
|
||||
+ bool warn = !options->ncp_enabled || options->enable_ncp_fallback;
|
||||
+ init_key_type(&c->c1.ks.key_type, options->ciphername, options->authname,
|
||||
+ options->keysize, true, warn);
|
||||
+ }
|
||||
/* Initialize PRNG with config-specified digest */
|
||||
prng_init(options->prng_hash, options->prng_nonce_secret_len);
|
||||
|
||||
diff --git a/src/openvpn/options.c b/src/openvpn/options.c
|
||||
index f6ef02ae..2206d9f4 100644
|
||||
--- a/src/openvpn/options.c
|
||||
+++ b/src/openvpn/options.c
|
||||
@@ -1135,7 +1135,7 @@ parse_hash_fingerprint(const char *str, int nbytes, int msglevel, struct gc_aren
|
||||
#ifndef ENABLE_SMALL
|
||||
|
||||
static void
|
||||
-show_dhcp_option_list(const char *name, const char * const*array, int len)
|
||||
+show_dhcp_option_list(const char *name, const char *const *array, int len)
|
||||
{
|
||||
int i;
|
||||
for (i = 0; i < len; ++i)
|
||||
@@ -2288,7 +2288,7 @@ options_postprocess_verify_ce(const struct options *options,
|
||||
if (options->mode == MODE_SERVER)
|
||||
{
|
||||
#define USAGE_VALID_SERVER_PROTOS "--mode server currently only supports " \
|
||||
- "--proto values of udp, tcp-server, tcp4-server, or tcp6-server"
|
||||
+ "--proto values of udp, tcp-server, tcp4-server, or tcp6-server"
|
||||
#ifdef TARGET_ANDROID
|
||||
msg(M_FATAL, "--mode server not supported on Android");
|
||||
#endif
|
||||
@@ -3103,7 +3103,7 @@ options_postprocess_cipher(struct options *o)
|
||||
if (!o->ncp_enabled)
|
||||
{
|
||||
msg(M_USAGE, "--ncp-disable needs an explicit --cipher or "
|
||||
- "--data-ciphers-fallback config option");
|
||||
+ "--data-ciphers-fallback config option");
|
||||
}
|
||||
|
||||
msg(M_WARN, "--cipher is not set. Previous OpenVPN version defaulted to "
|
||||
@@ -3681,9 +3681,30 @@ calc_options_string_link_mtu(const struct options *o, const struct frame *frame)
|
||||
{
|
||||
struct frame fake_frame = *frame;
|
||||
struct key_type fake_kt;
|
||||
- init_key_type(&fake_kt, o->ciphername, o->authname, o->keysize, true,
|
||||
- false);
|
||||
+
|
||||
frame_remove_from_extra_frame(&fake_frame, crypto_max_overhead());
|
||||
+
|
||||
+
|
||||
+ /* o->ciphername might be BF-CBC even though the underlying SSL library
|
||||
+ * does not support it. For this reason we workaround this corner case
|
||||
+ * by pretending to have no encryption enabled and by manually adding
|
||||
+ * the required packet overhead to the MTU computation.
|
||||
+ */
|
||||
+ const char *ciphername = o->ciphername;
|
||||
+
|
||||
+ if (strcmp(o->ciphername, "BF-CBC") == 0)
|
||||
+ {
|
||||
+ /* none has no overhead, so use this to later add only --auth
|
||||
+ * overhead */
|
||||
+
|
||||
+ /* overhead of BF-CBC: 64 bit block size, 64 bit IV size */
|
||||
+ frame_add_to_extra_frame(&fake_frame, 64/8 + 64/8);
|
||||
+ ciphername = "none";
|
||||
+ }
|
||||
+
|
||||
+ init_key_type(&fake_kt, ciphername, o->authname, o->keysize, true,
|
||||
+ false);
|
||||
+
|
||||
crypto_adjust_frame_parameters(&fake_frame, &fake_kt, o->replay,
|
||||
cipher_kt_mode_ofb_cfb(fake_kt.cipher));
|
||||
frame_finalize(&fake_frame, o->ce.link_mtu_defined, o->ce.link_mtu,
|
||||
@@ -3853,18 +3874,33 @@ options_string(const struct options *o,
|
||||
+ (TLS_SERVER == true)
|
||||
<= 1);
|
||||
|
||||
- init_key_type(&kt, o->ciphername, o->authname, o->keysize, true,
|
||||
- false);
|
||||
+ /* Skip resolving BF-CBC to allow SSL libraries without BF-CBC
|
||||
+ * to work here in the default configuration */
|
||||
+ const char *ciphername = o->ciphername;
|
||||
+ int keysize;
|
||||
+
|
||||
+ if (strcmp(o->ciphername, "BF-CBC") == 0)
|
||||
+ {
|
||||
+ init_key_type(&kt, "none", o->authname, o->keysize, true,
|
||||
+ false);
|
||||
+ keysize = 128;
|
||||
+ }
|
||||
+ else
|
||||
+ {
|
||||
+ init_key_type(&kt, o->ciphername, o->authname, o->keysize, true,
|
||||
+ false);
|
||||
+ ciphername = cipher_kt_name(kt.cipher);
|
||||
+ keysize = kt.cipher_length * 8;
|
||||
+ }
|
||||
/* Only announce the cipher to our peer if we are willing to
|
||||
* support it */
|
||||
- const char *ciphername = cipher_kt_name(kt.cipher);
|
||||
if (p2p_nopull || !o->ncp_enabled
|
||||
|| tls_item_in_cipher_list(ciphername, o->ncp_ciphers))
|
||||
{
|
||||
buf_printf(&out, ",cipher %s", ciphername);
|
||||
}
|
||||
buf_printf(&out, ",auth %s", md_kt_name(kt.digest));
|
||||
- buf_printf(&out, ",keysize %d", kt.cipher_length * 8);
|
||||
+ buf_printf(&out, ",keysize %d", keysize);
|
||||
if (o->shared_secret_file)
|
||||
{
|
||||
buf_printf(&out, ",secret");
|
||||
@@ -6168,9 +6204,9 @@ add_option(struct options *options,
|
||||
}
|
||||
}
|
||||
#ifdef TARGET_LINUX
|
||||
- else if (streq (p[0], "bind-dev") && p[1])
|
||||
+ else if (streq(p[0], "bind-dev") && p[1])
|
||||
{
|
||||
- VERIFY_PERMISSION (OPT_P_SOCKFLAGS);
|
||||
+ VERIFY_PERMISSION(OPT_P_SOCKFLAGS);
|
||||
options->bind_dev = p[1];
|
||||
}
|
||||
#endif
|
||||
@@ -6248,7 +6284,7 @@ add_option(struct options *options,
|
||||
{
|
||||
int64_t val = atoll(p[2]);
|
||||
options->inactivity_minimum_bytes = (val < 0) ? 0 : val;
|
||||
- if ( options->inactivity_minimum_bytes > INT_MAX )
|
||||
+ if (options->inactivity_minimum_bytes > INT_MAX)
|
||||
{
|
||||
msg(M_WARN, "WARNING: '--inactive' with a 'bytes' value"
|
||||
" >2 Gbyte was silently ignored in older versions. If "
|
||||
@@ -8132,7 +8168,7 @@ add_option(struct options *options,
|
||||
#endif
|
||||
else if (streq(p[0], "providers") && p[1])
|
||||
{
|
||||
- for (size_t j = 1; j < MAX_PARMS && p[j] != NULL;j++)
|
||||
+ for (size_t j = 1; j < MAX_PARMS && p[j] != NULL; j++)
|
||||
{
|
||||
options->providers.names[j] = p[j];
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
Binary file not shown.
@ -1,2 +1,2 @@
|
||||
SHA512 (openvpn-2.4.7.tar.xz) = 5398084ad0002b3ed34871375888a1ec5d4d0f0dbc7c979ab12fc16b00559613c0654f1760e84bea77d4fe7284bce25e2e9d3d309fe85ffd1060ced10978ff95
|
||||
SHA512 (openvpn-2.4.7.tar.xz.asc) = 4d2097291b46bd521f8a8bfcd3bf94fb334cccb13ee1391b434004068a4754d7e55afff99562487b296c02a24d18c495b69854c9e7d4042e04ba0a079c34cc4c
|
||||
SHA512 (openvpn-2.5.11.tar.gz) = 5ef80681e71aa84629d48b067b540c0e8169ee3ff4b1129fc0030a55f0f7e2bb9a9cd568aa627828d8adb1366f5b0cfdd37242fb5cb6cec4a50fea9ffe8805bc
|
||||
SHA512 (openvpn-2.5.11.tar.gz.asc) = f8796504341539db4a79ccf26706d2cc7e13b9fc511e0e38a0676b5eb94c0c43174b1cc29b07a51eb0e6c8dc7715a9728cc367166bdafae705381338cca3aead
|
||||
|
||||
@ -0,0 +1,14 @@
|
||||
# Tests for openvpn using NM's tests
|
||||
- hosts: localhost
|
||||
roles:
|
||||
- role: standard-test-basic
|
||||
tags:
|
||||
- classic
|
||||
repositories:
|
||||
- repo: "https://gitlab.freedesktop.org/NetworkManager/NetworkManager-ci"
|
||||
dest: "NetworkManager-ci"
|
||||
tests:
|
||||
- sanity-tests:
|
||||
dir: NetworkManager-ci
|
||||
run: run/osci/run-tests openvpn
|
||||
|
||||
Loading…
Reference in new issue