diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-27 12:27:32 -0500 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-09-27 12:27:32 -0500 |
| commit | e0f12bc6b1e3a26f0b55844d5fb84738340cc129 (patch) | |
| tree | a28c3d2b0643996647a2017b8b823c67ead6aafb | |
| parent | e9022fee01112d00d97ebc499a48f5d71fb83af7 (diff) | |
| parent | ef82334979061f94e825f385b3ae5f3a50a5791c (diff) | |
| download | cryptography-e0f12bc6b1e3a26f0b55844d5fb84738340cc129.tar.gz cryptography-e0f12bc6b1e3a26f0b55844d5fb84738340cc129.tar.bz2 cryptography-e0f12bc6b1e3a26f0b55844d5fb84738340cc129.zip | |
Merge pull request #1360 from alex/missing-from-changelog
Added changelog entry for serialization stuff
| -rw-r--r-- | CHANGELOG.rst | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst index eb9b4f4e..06a72aca 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -6,6 +6,11 @@ Changelog .. note:: This version is not yet released and is under active development. +* Added + :func:`~cryptography.hazmat.primitives.serialization.load_pem_private_key` to + ease loading private keys, and + :func:`~cryptography.hazmat.primitives.serialization.load_pem_public_key` to + support loading public keys. * Removed the, deprecated in 0.4, support for the ``salt_length`` argument to the :class:`~cryptography.hazmat.primitives.asymmetric.padding.MGF1` constructor. The ``salt_length`` should be passed to |