summaryrefslogtreecommitdiffstats
path: root/CHANGES
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-12-06 12:52:18 +0100
committerRichard Levitte <levitte@openssl.org>2018-12-06 13:27:18 +0100
commit151333164ece49fdba3fe5c4bbdc3333cd9ae66d (patch)
tree1ce94451303f000cae49706f861fc004f328bf3b /CHANGES
parentLicense: change any non-boilerplate comment referring to "OpenSSL license" (diff)
downloadopenssl-151333164ece49fdba3fe5c4bbdc3333cd9ae66d.tar.xz
openssl-151333164ece49fdba3fe5c4bbdc3333cd9ae66d.zip
Change license to the Apache License v2.0
This applies to the 'master' git branch and OpenSSL version 3.0.0 and up. Pre-3.0.0 versions retain the previous license. The boilerplate will change in increments after this change. Reviewed-by: Matt Caswell <matt@openssl.org> (Merged from https://github.com/openssl/openssl/pull/7764)
Diffstat (limited to 'CHANGES')
-rw-r--r--CHANGES3
1 files changed, 3 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index ab56f9be1b..49e2597e9e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -9,6 +9,9 @@
Changes between 1.1.1 and 3.0.0 [xx XXX xxxx]
+ *) Change the license to the Apache License v2.0.
+ [Richard Levitte]
+
*) Change the possible version information given with OPENSSL_API_COMPAT.
It may be a pre-3.0.0 style numerical version number as it was defined
in 1.1.0, and it may also simply take the major version number.