From: Emilia Kasper <emilia@openssl.org>
Date: Wed, 16 Mar 2016 14:06:01 +0000 (+0100)
Subject: Fix up CHANGES
X-Git-Tag: OpenSSL_1_1_0-pre4~5
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=8a0333c979c5d122f7a8cef47b5292f5dca8c540;p=oweals%2Fopenssl.git

Fix up CHANGES

- Remove duplicate entry
- Add author for SSL_CIPHER query functions
- Note HKDF support in CHANGES and NEWS

[ci skip]

Reviewed-by: Richard Levitte <levitte@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index da3cb796ad..f23f99266c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@
 
  Changes between 1.0.2g and 1.1.0  [xx XXX xxxx]
 
+  *) Add support for HKDF.
+     [Alessandro Ghedini]
+
   *) Add support for blake2b and blake2s
      [Bill Cox]
 
@@ -34,9 +37,6 @@
      [Todd Short]
 
   *) Add SSL_CIPHER queries for authentication and key-exchange.
-
-  *) Modify behavior of ALPN to invoke callback after SNI/servername
-     callback, such that updates to the SSL_CTX affect ALPN.
      [Todd Short]
 
   *) Changes to the DEFAULT cipherlist:
diff --git a/NEWS b/NEWS
index 3a20deb07c..42557a6622 100644
--- a/NEWS
+++ b/NEWS
@@ -43,6 +43,7 @@
       o Extended SSL_CONF support using configuration files
       o KDF algorithm support. Implement TLS PRF as a KDF.
       o Support for Certificate Transparency
+      o HKDF support.
 
   Major changes between OpenSSL 1.0.2f and OpenSSL 1.0.2g [1 Mar 2016]