aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/log.txt4
-rw-r--r--src/ssl/info.txt8
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/log.txt b/doc/log.txt
index 38944227b..478b27a94 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -10,6 +10,10 @@ Series 1.10
Version 1.10.2, Not Yet Released
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+* The SSL/TLS code is disabled by default in this release. A new
+ version is being developed and the current iteration should not be
+ used unless needed for existing code.
+
* Add the Camellia block cipher
* An implementation of SRP-6a compatible with the specification in
diff --git a/src/ssl/info.txt b/src/ssl/info.txt
index f920a733d..169b76115 100644
--- a/src/ssl/info.txt
+++ b/src/ssl/info.txt
@@ -1,8 +1,12 @@
define SSL_TLS
+load_on request
+
<comment>
-The SSL/TLS code is complex, new, and not yet reviewed, there may be
-serious bugs or security issues.
+A new TLS API is being developed. This version has numerous
+performance and usability issues and will not be supported in the
+future. Only use it if you need it for compatability with code written
+against previous versions.
</comment>
uses_tr1 yes