summaryrefslogtreecommitdiff
path: root/CHANGELOG.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2016-07-29 15:31:04 +0800
committerCory Benfield <lukasaoz@gmail.com>2016-07-29 08:31:04 +0100
commit72d968b2dea6937c2e2b1fe62bf404b667a98a80 (patch)
treec6b5209a5036d8eb55d6c7db9996147ab1cbef0e /CHANGELOG.rst
parentdb8ec13b1ebec5ec3d5f2ff185adf0c961841163 (diff)
downloadpyopenssl-72d968b2dea6937c2e2b1fe62bf404b667a98a80.tar.gz
Convert between pyOpenSSL and cryptography objects (#439)
* convert pkey to cryptography keys and vice versa * pep8 and such * Add documentation and changelog * add a type check and verify that it rejects ECDSA keys from cryptography
Diffstat (limited to 'CHANGELOG.rst')
-rw-r--r--CHANGELOG.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index fc81dec..9f867c4 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -27,6 +27,8 @@ Changes:
`#496 <https://github.com/pyca/pyopenssl/pull/496>`_
- Enable use of CRL (and more) in verify context.
`#483 <https://github.com/pyca/pyopenssl/pull/483>`_
+- ``OpenSSL.crypto.PKey`` can now be constructed from ``cryptography`` objects and also exported as such.
+ `#439 <https://github.com/pyca/pyopenssl/pull/439>`_
----