diff options
| author | David Reid <dreid@dreid.org> | 2014-05-28 14:00:41 -0700 |
|---|---|---|
| committer | David Reid <dreid@dreid.org> | 2014-06-03 10:05:38 -0700 |
| commit | 576a15393fd3efb1512926c5ce1884b602104539 (patch) | |
| tree | 378a142c3113a823b08b38269815bf38e2886be6 /docs/hazmat | |
| parent | 68b509a399b5d24b6e6fe1b707096928a8483c9a (diff) | |
| download | cryptography-576a15393fd3efb1512926c5ce1884b602104539.tar.gz cryptography-576a15393fd3efb1512926c5ce1884b602104539.tar.bz2 cryptography-576a15393fd3efb1512926c5ce1884b602104539.zip | |
Resolve conflict.
Diffstat (limited to 'docs/hazmat')
| -rw-r--r-- | docs/hazmat/backends/interfaces.rst | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/docs/hazmat/backends/interfaces.rst b/docs/hazmat/backends/interfaces.rst index 341fdc34..c7d5667d 100644 --- a/docs/hazmat/backends/interfaces.rst +++ b/docs/hazmat/backends/interfaces.rst @@ -315,14 +315,13 @@ A specific ``backend`` may provide one or more of these interfaces. :class:`~cryptography.hazmat.primitives.interfaces.AsymmetricPadding` provider. -<<<<<<< HEAD :return bytes: The encrypted data. :raises cryptography.exceptions.UnsupportedAlgorithm: If an unsupported MGF, hash function, or padding is chosen. :raises ValueError: When plaintext is too long for the key size. -======= + .. method:: load_rsa_numbers(numbers): :param numbers: An instance of @@ -336,7 +335,6 @@ A specific ``backend`` may provide one or more of these interfaces. :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPrivateNumbers` or :class:`~cryptography.hazmat.primitives.asymmetric.rsa.RSAPublicNumbers`. ->>>>>>> 70cf9ba... Document the backend interface. .. class:: TraditionalOpenSSLSerializationBackend |