diff options
| author | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-06-17 19:58:10 -0600 |
|---|---|---|
| committer | Paul Kehrer <paul.l.kehrer@gmail.com> | 2015-10-21 22:40:37 -0500 |
| commit | 6f6cf005fbcc4ae8a45affd3baae4d0d701fe1e3 (patch) | |
| tree | 486740d48098782bfd458b63b66f5820b2f96b76 /docs | |
| parent | 128567a49a673287541bce4b8175170e8afbbd26 (diff) | |
| download | cryptography-6f6cf005fbcc4ae8a45affd3baae4d0d701fe1e3.tar.gz cryptography-6f6cf005fbcc4ae8a45affd3baae4d0d701fe1e3.tar.bz2 cryptography-6f6cf005fbcc4ae8a45affd3baae4d0d701fe1e3.zip | |
add version added info and doc exception
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/hazmat/primitives/keywrap.rst | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/keywrap.rst b/docs/hazmat/primitives/keywrap.rst index 2ef6b798..1b49a4c5 100644 --- a/docs/hazmat/primitives/keywrap.rst +++ b/docs/hazmat/primitives/keywrap.rst @@ -10,6 +10,8 @@ encapsulate key material. .. function:: aes_key_wrap(wrapping_key, key_to_wrap, backend) + .. versionadded:: 1.1 + :param bytes wrapping_key: The wrapping key. :param bytes key_to_wrap: The key to wrap. @@ -23,6 +25,8 @@ encapsulate key material. .. function:: aes_key_unwrap(wrapping_key, wrapped_key, backend) + .. versionadded:: 1.1 + :param bytes wrapping_key: The wrapping key. :param bytes wrapped_key: The wrapped key. @@ -34,6 +38,9 @@ encapsulate key material. :return bytes: The unwrapped key as bytes. + :raises cryptography.hazmat.primitives.keywrap.InvalidUnwrap: This is + raised if the key is not successfully unwrapped. + Exceptions ~~~~~~~~~~ |