summaryrefslogtreecommitdiffstats
path: root/src/openvpn/ssl_backend.h
diff options
context:
space:
mode:
authorSteffan Karger <steffan.karger@fox-it.com>2014-08-26 00:03:23 +0200
committerGert Doering <gert@greenie.muc.de>2014-11-14 15:03:21 +0100
commit6cb15b908a64b69b715fa8b2d60c71c6d9d3f9fc (patch)
tree6bf20802933b4689afecfc5165bd0674e25dd5d6 /src/openvpn/ssl_backend.h
parent4e93e6dc88f4d904a4f2eb90140472a8d8fd68d0 (diff)
downloadopenvpn-6cb15b908a64b69b715fa8b2d60c71c6d9d3f9fc.tar.gz
openvpn-6cb15b908a64b69b715fa8b2d60c71c6d9d3f9fc.tar.xz
openvpn-6cb15b908a64b69b715fa8b2d60c71c6d9d3f9fc.zip
Add --tls-version-max
Because using TLS 1.2 breaks certain setups, a user might want to enforce a maximum TLS version to use. This patch adds that option. This patch removes a number of #ifdefs from ssl_polarssl.c, because the polarssl versions we currently support (polar 1.2 for openvpn 2.3, and polar 1.3 for openvpn-master) have all versions unconditionally enabled. Signed-off-by: Steffan Karger <steffan.karger@fox-it.com> Acked-by: Arne Schwabe <arne@rfc2549.org> Message-Id: <544EC052.3080809@fox-it.com> URL: http://article.gmane.org/gmane.network.openvpn.devel/9210 Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/ssl_backend.h')
-rw-r--r--src/openvpn/ssl_backend.h11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h
index bfd1549..b0777bf 100644
--- a/src/openvpn/ssl_backend.h
+++ b/src/openvpn/ssl_backend.h
@@ -109,11 +109,12 @@ void tls_clear_error();
* @return One of the TLS_VER_x constants or TLS_VER_BAD
* if a parse error should be flagged.
*/
-#define TLS_VER_BAD -1
-#define TLS_VER_1_0 0 /* default */
-#define TLS_VER_1_1 1
-#define TLS_VER_1_2 2
-int tls_version_min_parse(const char *vstr, const char *extra);
+#define TLS_VER_BAD -1
+#define TLS_VER_UNSPEC 0 /* default */
+#define TLS_VER_1_0 1
+#define TLS_VER_1_1 2
+#define TLS_VER_1_2 3
+int tls_version_parse(const char *vstr, const char *extra);
/**
* Return the maximum TLS version (as a TLS_VER_x constant)