Prep 3.0.0 release

robrichards · May 25, 2017 · a29eb31 · a29eb31
1 parent c0e0e6f
commit a29eb31
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 xmlseclibs.php
 |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
+25, May 2017, 3.0.0
+Improvements:
+- Remove use of mcrypt
+
 08, Sep 2016, 2.0.1
 Bug Fixes:
 - Strip whitespace characters when parsing X509Certificate. fixes #84

diff --git a/README.md b/README.md
@@ -5,13 +5,14 @@ xmlseclibs is a library written in PHP for working with XML Encryption and Signa
 The author of xmlseclibs is Rob Richards.
 
 # Branches
-Both the master and the 1.4 branches are actively maintained. The 1.3 branch is only updated for security related issues.
-* master: Contains namespace support requiring 5.3+.
-* 1.4: Contains auto-loader support while also maintaining backwards compatiblity with the 1.3 version using the xmlseclibs.php file. Supports PHP 5.2+
+Both the master and the 2.0 branches are actively maintained. The 1.4 branch is only updated for security related issues.
+* master: Removes mcrypt usage requiring 5.6+ (5.6.24+ recommended for security reasons)
+* 2.0: Contains namespace support requiring 5.3+
+* 1.4: Contains auto-loader support while also maintaining backwards compatiblity with the older 1.3 version using the xmlseclibs.php file. Supports PHP 5.2+
 
 # Requirements
 
-xmlseclibs requires PHP version 5.3 or greater.
+xmlseclibs requires PHP version 5.6 or greater.
 
 
 ## How to Install