summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorBen Laurie <ben@openssl.org>2010-07-28 10:06:55 +0000
committerBen Laurie <ben@openssl.org>2010-07-28 10:06:55 +0000
commitee2ffc279417f15fef3b1073c7dc81a908991516 (patch)
treee2af21f279101d5a8f8e841bf7f70b940496907f /CHANGES
parentb122e482f94f1dbda6a93b4c53ccdc92b4046deb (diff)
Add Next Protocol Negotiation.
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES6
1 files changed, 6 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 96bc626cbb..813a8bc235 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,12 @@
Changes between 1.0.0 and 1.1.0 [xx XXX xxxx]
+ *) Add Next Protocol Negotiation,
+ http://tools.ietf.org/html/draft-agl-tls-nextprotoneg-00. Can be
+ disabled with a no-npn flag to config or Configure. Code donated
+ by Google.
+ [Adam Langley <agl@google.com> and Ben Laurie]
+
*) Use type ossl_ssize_t instad of ssize_t which isn't available on
all platforms. Move ssize_t definition from e_os.h to the public
header file e_os2.h as it now appears in public header file cms.h