@@ -242,3 +242,11 @@
a key renegotiation begins (default :code:`3600` seconds). This feature
allows for a graceful transition from old to new key, and removes the key
renegotiation sequence from the critical path of tunnel data forwarding.
+
+--force-tls-key-material-export
+ This option is only available in --mode server and forces to use
+ Keying Material Exporters (RFC 5705) for clients. This can be used to
+ simulate an environment where the cryptographic library does not support
+ the older method to generate data channel keys anymore. This option is
+ intended to be a test option and might be removed in a future OpenVPN
+ version without notice.
@@ -1789,3 +1789,21 @@
gc_free(&gc);
return ret;
}
+
+bool
+check_tls_prf_working(void)
+{
+ /* Modern TLS libraries might no longer support the TLS 1.0 PRF. This
+ * limits our compatibility to other 2.6.x+ OpernVPN peers. Do a simple
+ * dummy test here to see if it works. */
+ const char *seed = "tls1-prf-test";
+ const char *secret = "tls1-prf-test-secret";
+ uint8_t out[8];
+ uint8_t expected_out[] = { 0xe0, 0x5f, 0x1f, 1, 0, 0, 0, 0};
+
+ int ret = ssl_tls1_PRF((uint8_t *)seed, strlen(seed),
+ (uint8_t *)secret, strlen(secret),
+ out, sizeof(out));
+
+ return (ret && memcmp(out, expected_out, sizeof(out)) != 0);
+}
@@ -593,4 +593,12 @@
return kt;
}
+/**
+ * Checks if the current TLS library supports the TLS 1.0 PRF with MD5+SHA1
+ * that OpenVPN uses when TLS Keying Material Export is not available.
+ *
+ * @return true if supported, false otherwise.
+ */
+bool check_tls_prf_working(void);
+
#endif /* CRYPTO_H */
@@ -1830,6 +1830,16 @@
{
o->imported_protocol_flags |= CO_USE_TLS_KEY_MATERIAL_EXPORT;
}
+ else if (o->force_key_material_export)
+ {
+ msg(M_INFO, "PUSH: client does not support TLS key material export"
+ "but --force-tls-key-material-export is enabled.");
+ auth_set_client_reason(tls_multi, "Client incompatible with this"
+ "server. Keying Material Exporters (RFC 5705)"
+ "support missing. Upgrade to a client that "
+ "supports this feature (OpenVPN 2.6.0+).");
+ return false;
+ }
if (proto & IV_PROTO_DYN_TLS_CRYPT)
{
o->imported_protocol_flags |= CO_USE_DYNAMIC_TLS_CRYPT;
@@ -1564,6 +1564,7 @@
SHOW_STR(auth_user_pass_verify_script);
SHOW_BOOL(auth_user_pass_verify_script_via_file);
SHOW_BOOL(auth_token_generate);
+ SHOW_BOOL(force_key_material_export);
SHOW_INT(auth_token_lifetime);
SHOW_STR_INLINE(auth_token_secret_file);
#if PORT_SHARE
@@ -2579,6 +2580,10 @@
{
msg(M_USAGE, "--mode server requires --tls-server");
}
+ if (options->force_key_material_export)
+ {
+ msg(M_USAGE, "--force-tls-key-material-export requires --mode server");
+ }
if (ce->remote)
{
msg(M_USAGE, "--remote cannot be used with --mode server");
@@ -3639,6 +3644,30 @@
}
static void
+options_process_mutate_prf(struct options *o)
+{
+ if (!check_tls_prf_working())
+ {
+
+ msg(D_TLS_ERRORS, "Warning: TLS 1.0 PRF with MD5+SHA1 PRF not supported "
+ "by TLS library. Your system does not support this calculation "
+ "anymore or your security policy (e.g. FIPS 140-2) forbids it. "
+ "Connections will only work with peers running OpenVPN 2.6.0 or "
+ "higher)");
+#ifndef HAVE_EXPORT_KEYING_MATERIAL
+ msg(M_FATAL, "Keying Material Exporters (RFC 5705) not available either. "
+ "No way to generate data channel keys left.");
+#endif
+ if (o->mode == MODE_SERVER)
+ {
+ msg(M_WARN, "Automatically enabling option "
+ "--force-tls-key-material-export");
+ }
+
+ }
+}
+
+static void
options_postprocess_mutate(struct options *o, struct env_set *es)
{
int i;
@@ -3652,6 +3681,7 @@
options_postprocess_setdefault_ncpciphers(o);
options_set_backwards_compatible_options(o);
+ options_process_mutate_prf(o);
options_postprocess_cipher(o);
o->ncp_ciphers = mutate_ncp_cipher_list(o->ncp_ciphers, &o->gc);
@@ -8650,6 +8680,11 @@
}
}
}
+ else if (streq(p[0], "force-tls-key-material-export"))
+ {
+ VERIFY_PERMISSION(OPT_P_GENERAL);
+ options->force_key_material_export = true;
+ }
else if (streq(p[0], "prng") && p[1] && !p[3])
{
msg(M_WARN, "NOTICE: --prng option ignored (SSL library PRNG is used)");
@@ -688,6 +688,8 @@
const char *keying_material_exporter_label;
int keying_material_exporter_length;
#endif
+ /* force using TLS key material export for data channel key generation */
+ bool force_key_material_export;
bool vlan_tagging;
enum vlan_acceptable_frames vlan_accept;
Attention is currently required from: flichtenheld. Hello flichtenheld, I'd like you to do a code review. Please visit http://gerrit.openvpn.net/c/openvpn/+/460?usp=email to review the following change. Change subject: Check PRF availability on initialisation and add --force-tls-key-material-export ...................................................................... Check PRF availability on initialisation and add --force-tls-key-material-export We now warn a user if the TLS 1.0 PRF is not supported by the cryptographic library of the system. Also add the option --force-tls-key-material-export that automatically rejects clients that do not support TLS Keying Material Export and automatically enable it when TLS 1.0 PRF support is not available. Change-Id: I04f8c7c413e7cb62c726262feee6ca89c7e86c70 Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- M doc/man-sections/protocol-options.rst M src/openvpn/crypto.c M src/openvpn/crypto.h M src/openvpn/multi.c M src/openvpn/options.c M src/openvpn/options.h 6 files changed, 81 insertions(+), 0 deletions(-) git pull ssh://gerrit.openvpn.net:29418/openvpn refs/changes/60/460/1