From: Dr. Stephen Henson <steve@openssl.org>
Date: Mon, 29 Jun 2015 11:17:21 +0000 (+0100)
Subject: Update CHANGES
X-Git-Tag: OpenSSL_1_1_0-pre1~880
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=23237159f76933a898d4da1ee67de704350e1ca9;p=oweals%2Fopenssl.git

Update CHANGES

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/CHANGES b/CHANGES
index 1526aec922..c5be241165 100644
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,14 @@
  _______________
 
  Changes between 1.0.2 and 1.1.0  [xx XXX xxxx]
+
+  *) Rewrite PSK to support ECDHE_PSK, DHE_PSK and RSA_PSK. Add ciphersuites
+     from RFC4279, RFC4785, RFC5487, RFC5489.
+
+     Thanks to Christian J. Dietrich and Giuseppe D'Angelo for the
+     original RSA_PSK patch.
+     [Steve Henson]
+
   *) Dropped support for the SSL3_FLAGS_DELAY_CLIENT_FINISHED flag. This SSLeay
      era flag was never set throughout the codebase (only read). Also removed
      SSL3_FLAGS_POP_BUFFER which was only used if