aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAyrx <terrycwk1994@gmail.com>2014-04-21 22:32:43 +0800
committerAyrx <terrycwk1994@gmail.com>2014-04-22 12:12:41 +0800
commit001637bec0e7a2442c2694dfe9c98c6efdc97d16 (patch)
treef53fdde2687dabb7c2c1e951e39065c91a4dd99a
parent3f695110b27afc05f0a9e9e6dc0bfd6e67501418 (diff)
downloadcryptography-001637bec0e7a2442c2694dfe9c98c6efdc97d16.tar.gz
cryptography-001637bec0e7a2442c2694dfe9c98c6efdc97d16.tar.bz2
cryptography-001637bec0e7a2442c2694dfe9c98c6efdc97d16.zip
Added wikipedia link
-rw-r--r--cryptography/hazmat/backends/multibackend.py4
-rw-r--r--docs/hazmat/primitives/mac/cmac.rst5
2 files changed, 6 insertions, 3 deletions
diff --git a/cryptography/hazmat/backends/multibackend.py b/cryptography/hazmat/backends/multibackend.py
index 903bcceb..86cded85 100644
--- a/cryptography/hazmat/backends/multibackend.py
+++ b/cryptography/hazmat/backends/multibackend.py
@@ -16,8 +16,8 @@ from __future__ import absolute_import, division, print_function
from cryptography import utils
from cryptography.exceptions import UnsupportedAlgorithm, _Reasons
from cryptography.hazmat.backends.interfaces import (
- CipherBackend, DSABackend, HMACBackend, HashBackend,
- PBKDF2HMACBackend, RSABackend
+ CipherBackend, DSABackend, HMACBackend, HashBackend, PBKDF2HMACBackend,
+ RSABackend
)
diff --git a/docs/hazmat/primitives/mac/cmac.rst b/docs/hazmat/primitives/mac/cmac.rst
index c2a50cdd..be35014f 100644
--- a/docs/hazmat/primitives/mac/cmac.rst
+++ b/docs/hazmat/primitives/mac/cmac.rst
@@ -10,7 +10,7 @@ Cipher-based message authentication code
import binascii
key = binascii.unhexlify(b"0" * 32)
-Cipher-based message authentication codes (or CMACs) are a tool for calculating
+`Cipher-based message authentication codes`_ (or CMACs) are a tool for calculating
message authentication codes using a block cipher coupled with a
secret key. You can use an CMAC to verify both the integrity and authenticity
of a message.
@@ -98,3 +98,6 @@ of a message.
:return bytes: The message authentication code as bytes.
:raises cryptography.exceptions.AlreadyFinalized:
+
+
+.. _`Cipher-based message authentication codes`: https://en.wikipedia.org/wiki/CMAC