summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArne Schwabe <arne@rfc2549.org>2015-03-16 10:32:17 +0100
committerArne Schwabe <arne@rfc2549.org>2015-03-16 10:32:17 +0100
commit901675f5975c5e1032e871e904e9005e86603523 (patch)
tree05dd7817118a4949a71361fdf40a352b48507e6e
parent0f88c9b6b67b3ab547d81ac15b029a4208f09944 (diff)
Update OpenVPN version
-rw-r--r--main/openvpn/config-version.h5
-rw-r--r--main/openvpn/doc/openvpn.83
2 files changed, 5 insertions, 3 deletions
diff --git a/main/openvpn/config-version.h b/main/openvpn/config-version.h
index dbfd472a..41024b53 100644
--- a/main/openvpn/config-version.h
+++ b/main/openvpn/config-version.h
@@ -1,3 +1,2 @@
-#define CONFIGURE_GIT_REVISION "icsopenvpn_627-cff5e3e9c3ac08df"
-#define CONFIGURE_GIT_FLAGS "+"
-
+#define CONFIGURE_GIT_REVISION "icsopenvpn_629-09e2cd726861dc61"
+#define CONFIGURE_GIT_FLAGS ""
diff --git a/main/openvpn/doc/openvpn.8 b/main/openvpn/doc/openvpn.8
index a8c189c9..32cdcb9b 100644
--- a/main/openvpn/doc/openvpn.8
+++ b/main/openvpn/doc/openvpn.8
@@ -4514,6 +4514,9 @@ of security they both support.
Use
.B \-\-show-tls
to see a list of supported TLS ciphers.
+
+The default for --tls-cipher is to use PolarSSL's default cipher list
+when using PolarSSL or "DEFAULT:!EXP:!PSK:!SRP:!kRSA" when using OpenSSL.
.\"*********************************************************
.TP
.B \-\-tls-timeout n