Add additional PKCS12 features
diff --git a/ChangeLog b/ChangeLog
index d9d45f8..70cdb28 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
-2009-07-17 Rick Dean <rick@fdd.com>
- Jean-Paul Calderone <exarkun@twistedmatrix.com>
+2009-08-27 Rick Dean <rick@fdd.com>, Jean-Paul Calderone <exarkun@twistedmatrix.com>
+
+ * src/crypto/pkcs12.c: Add setters to the PKCS12 type for the
+ certificate, private key, ca certificate list, and friendly
+ name, and add a getter for the friendly name. Also add a method
+ for exporting a PKCS12 object as a string.
+
+ * test/test_crypto.py: Add lots of additional tests for the PKCS12
+ type.
+
+ * doc/pyOpenSSL.tex: Documentation for the new PKCS12 methods.
+
+2009-07-17 Rick Dean <rick@fdd.com>, Jean-Paul Calderone <exarkun@twistedmatrix.com>
* src/crypto/x509ext.c: Add subject and issuer parameters to
X509Extension, allowing creation of extensions which require that
@@ -89,7 +100,7 @@
* src/crypto/x509ext.c, test/test_crypto.py: Add the get_short_name
method to X509Extension based on patch from Alex Stapleton.
-
+
2008-12-31 Jean-Paul Calderone <exarkun@twistedmatrix.com>
* src/crypto/x509ext.c, test/test_crypto.py: Fix X509Extension so