Split PBES2 into cipher and PBKDF2 versions. This tidies the code somewhat
and is a pre-requisite to adding password based CMS support.

CHANGES

diff --git a/CHANGES b/CHANGES
index 46803f3..3b5d9de 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,14 +2,12 @@
  OpenSSL CHANGES
  _______________
 
- Changes between 0.9.8l and 1.0  [xx XXX xxxx]
+ Changes between 1.0 and 1.1  [xx XXX xxxx]
 
-  *) Add load_crls() function to apps tidying load_certs() too. Add option
-     to verify utility to allow additional CRLs to be included.
-     [Steve Henson]
-
-  *) Update OCSP request code to permit adding custom headers to the request:
-     some responders need this.
+  *) Split password based encryption into PBES2 and PBKDF2 functions. This
+     neatly separates the code into cipher and PBE sections and is required
+     for some algorithms that split PBES2 into separate pieces (such as
+     password based CMS).
      [Steve Henson]
 
   *) Extensive audit of libcrypto with DEBUG_UNUSED. Fix many cases where
@@ -25,6 +23,16 @@
      whose return value is often ignored. 
      [Steve Henson]
 
+ Changes between 0.9.8l and 1.0  [xx XXX xxxx]
+
+  *) Add load_crls() function to apps tidying load_certs() too. Add option
+     to verify utility to allow additional CRLs to be included.
+     [Steve Henson]
+
+  *) Update OCSP request code to permit adding custom headers to the request:
+     some responders need this.
+     [Steve Henson]
+
   *) The function EVP_PKEY_sign() returns <=0 on error: check return code
      correctly.
      [Julia Lawall <julia@diku.dk>]