aboutsummaryrefslogtreecommitdiffstats
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2015-02-23 14:44:22 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2015-02-23 14:44:22 -0800
commit15c7f6fea2315210036265ad95513d42e10dface (patch)
treea161a0c9b27db6eec0042b83a3742422f8ce6c51 /CHANGELOG.rst
parentca324456f050f3fa7346ca6032ec5b855d7fef8d (diff)
parentd8a1d0e624d44ef349cf51fda8559653a26fd460 (diff)
downloadcryptography-15c7f6fea2315210036265ad95513d42e10dface.tar.gz
cryptography-15c7f6fea2315210036265ad95513d42e10dface.tar.bz2
cryptography-15c7f6fea2315210036265ad95513d42e10dface.zip
Merge pull request #1610 from reaperhulk/load-der-keys
DER key loading support for the OpenSSL backend
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst5
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 6af5d1c8..da529f68 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -71,6 +71,11 @@ Changelog
:mod:`~cryptography.hazmat.primitives.asymmetric.rsa`.
* Added support for parsing X.509 names. See the
:doc:`X.509 documentation</x509>` for more information.
+* Added
+ :func:`~cryptography.hazmat.primitives.serialization.load_der_private_key` to
+ support loading of DER encoded private keys and
+ :func:`~cryptography.hazmat.primitives.serialization.load_der_public_key` to
+ support loading DER encoded public keys.
* Fixed building against LibreSSL, a compile-time substitute for OpenSSL.
* FreeBSD 9.2 was removed from the continuous integration system.