diff options
author | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-04 14:44:59 -0800 |
---|---|---|
committer | Alex Gaynor <alex.gaynor@gmail.com> | 2013-11-04 14:44:59 -0800 |
commit | 4bdb6b54f56618a2d2cf73903b3b117436fe9fb8 (patch) | |
tree | 1564feaf49472df7014f8c9484aa72e8486846b3 /docs/hazmat | |
parent | 7e262a6d730f45d40645323c8462b4c480fe7319 (diff) | |
parent | 79eaa7efa2aaafd62ffeee7385526f14647e5a7e (diff) | |
download | cryptography-4bdb6b54f56618a2d2cf73903b3b117436fe9fb8.tar.gz cryptography-4bdb6b54f56618a2d2cf73903b3b117436fe9fb8.tar.bz2 cryptography-4bdb6b54f56618a2d2cf73903b3b117436fe9fb8.zip |
Merge branch 'master' into more-error-condition
Conflicts:
tests/hazmat/bindings/test_openssl.py
Diffstat (limited to 'docs/hazmat')
-rw-r--r-- | docs/hazmat/primitives/hmac.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/hazmat/primitives/hmac.rst b/docs/hazmat/primitives/hmac.rst index 301d72d5..bd1a4934 100644 --- a/docs/hazmat/primitives/hmac.rst +++ b/docs/hazmat/primitives/hmac.rst @@ -23,6 +23,8 @@ message. equal in length to the ``digest_size`` of the hash function chosen. You must keep the ``key`` secret. + This is an implementation of :rfc:`2104`. + .. doctest:: >>> from cryptography.hazmat.primitives import hashes, hmac |