summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2014-12-08 01:04:25 +0100
committerMatt Caswell <matt@openssl.org>2014-12-08 11:29:11 +0100
commit0c1bd7f03fcd1cc8256f89f4962d91b78432c74a (patch)
treef4208ce008ae9e8246f45263e3d4561f0d73cb95 /CHANGES
parentAdded OPENSSL_NO_OCB guards (diff)
downloadopenssl-0c1bd7f03fcd1cc8256f89f4962d91b78432c74a.tar.xz
openssl-0c1bd7f03fcd1cc8256f89f4962d91b78432c74a.zip
Add CHANGES entry for OCB
Reviewed-by: Tim Hudson <tjh@openssl.org>
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index 389aab9b0c..a8b55bf0fb 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,11 @@
Changes between 1.0.2 and 1.1.0 [xx XXX xxxx]
+ *) Added support for OCB mode. OpenSSL has been granted a patent license
+ compatible with the OpenSSL license for use of OCB. Details are available
+ at https://www.openssl.org/docs/misc/OCB-patent-grant-OpenSSL.pdf. Support
+ for OCB can be removed by calling config with no-ocb.
+
*) SSLv2 support has been removed. It still supports receiving a SSLv2
compatible client hello.
[Kurt Roeckx]