diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-21 11:21:28 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2014-02-21 11:21:28 -0600 |
| commit | c85157b5fb468c2def7bbec97927d258bf099c3a (patch) | |
| tree | 553d3eda1933afee1e67a0a4510ce219dd45da11 | |
| parent | 26084d8c15fe631febf5d58691eb2b7f1533460f (diff) | |
| parent | 2fb76a3d39ae3ab189bb08336fc4eb42950771a6 (diff) | |
| download | cryptography-c85157b5fb468c2def7bbec97927d258bf099c3a.tar.gz cryptography-c85157b5fb468c2def7bbec97927d258bf099c3a.tar.bz2 cryptography-c85157b5fb468c2def7bbec97927d258bf099c3a.zip | |
Merge pull request #619 from public/openssl-key-loading-interfaces
Interfaces for loading OpenSSL "traditional" format private keys.
| -rw-r--r-- | cryptography/hazmat/backends/interfaces.py | 9 | ||||
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 23 | ||||
| -rw-r--r-- | docs/spelling_wordlist.txt | 2 |
3 files changed, 34 insertions, 0 deletions
diff --git a/cryptography/hazmat/backends/interfaces.py b/cryptography/hazmat/backends/interfaces.py index a543ba1f..0a26526b 100644 --- a/cryptography/hazmat/backends/interfaces.py +++ b/cryptography/hazmat/backends/interfaces.py @@ -105,3 +105,12 @@ class RSABackend(six.with_metaclass(abc.ABCMeta)): Returns an object conforming to the AsymmetricVerificationContext interface. """ + + +class OpenSSLSerializationBackend(six.with_metaclass(abc.ABCMeta)): + @abc.abstractmethod + def load_openssl_pem_private_key(data, password, backend): + """ + Load a private key from PEM encoded data, using password if the data + is encrypted. + """ diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index bd38ed50..af19fbc6 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -248,3 +248,26 @@ A specific ``backend`` may provide one or more of these interfaces. :returns: :class:`~cryptography.hazmat.primitives.interfaces.AsymmetricVerificationContext` + + +.. class:: OpenSSLSerializationBackend + + .. versionadded:: 0.3 + + A backend with methods for working with OpenSSL's "traditional" PKCS #1 + style key serialization. + + .. method:: load_openssl_pem_private_key(data, password) + + :param bytes data: PEM data to deserialize. + + :param bytes password: The password to use if this data is encrypted. + Should be None if the data is not encrypted. + + :return: A new instance of + :class:`~cryptography.hazmat.primitives.serialization.OpenSSLPrivateKey` + + :raises ValueError: If the data could not be deserialized correctly. + + :raises cryptography.exceptions.UnsupportedAlgorithm: If the data is + encrypted with an unsupported algorithm. diff --git a/docs/spelling_wordlist.txt b/docs/spelling_wordlist.txt index 9bc84e50..7200855d 100644 --- a/docs/spelling_wordlist.txt +++ b/docs/spelling_wordlist.txt @@ -13,6 +13,8 @@ cryptographically decrypt decrypted decrypting +deserialize +deserialized Docstrings fernet Fernet |