From: Ben Laurie <ben@openssl.org>
Date: Mon, 14 Nov 2011 02:25:04 +0000 (+0000)
Subject: Next Protocol Negotiation.
X-Git-Tag: OpenSSL_1_0_1-beta1~94
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=e2809bfb425310ba9bc0ffde679218a4b335658c

Next Protocol Negotiation.
---

diff --git a/CHANGES b/CHANGES
index 25d0b81ea8..93a9022dad 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,12 @@
 
  Changes between 1.0.0f and 1.0.1  [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]
+
   *) Add optional 64-bit optimized implementations of elliptic curves NIST-P224,
      NIST-P256, NIST-P521, with constant-time single point multiplication on
      typical inputs. Compiler support for the nonstandard type __uint128_t is