summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmilia Kasper <emilia@openssl.org>2016-03-16 15:06:01 +0100
committerEmilia Kasper <emilia@openssl.org>2016-03-16 15:06:46 +0100
commit8a0333c979c5d122f7a8cef47b5292f5dca8c540 (patch)
tree5298495185245d20020c5f3992c78bba0e25da11
parentc1ea997aa84fde21d1fe3fbece3ba41436107e81 (diff)
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>
-rw-r--r--CHANGES6
-rw-r--r--NEWS1
2 files changed, 4 insertions, 3 deletions
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]