aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/mac
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-17 22:44:35 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2014-05-17 22:44:35 -0500
commit3884b6afbf484dc49a0ba6fdaf7be4343ed480cf (patch)
tree680aec8096359fa544e23c1ebada333263c4526d /docs/hazmat/primitives/mac
parent996d659a46c1d26a0346c60694fb504e75e3444f (diff)
parentf24415092b8ce0fd3b081a383005568251f69483 (diff)
downloadcryptography-3884b6afbf484dc49a0ba6fdaf7be4343ed480cf.tar.gz
cryptography-3884b6afbf484dc49a0ba6fdaf7be4343ed480cf.tar.bz2
cryptography-3884b6afbf484dc49a0ba6fdaf7be4343ed480cf.zip
Merge pull request #1053 from alex/long-lines-docs
Word wrap some long lines in teh docs
Diffstat (limited to 'docs/hazmat/primitives/mac')
-rw-r--r--docs/hazmat/primitives/mac/cmac.rst4
-rw-r--r--docs/hazmat/primitives/mac/index.rst3
2 files changed, 4 insertions, 3 deletions
diff --git a/docs/hazmat/primitives/mac/cmac.rst b/docs/hazmat/primitives/mac/cmac.rst
index 23b1fea2..498b8b1e 100644
--- a/docs/hazmat/primitives/mac/cmac.rst
+++ b/docs/hazmat/primitives/mac/cmac.rst
@@ -10,8 +10,8 @@ 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
-message authentication codes using a block cipher coupled with a
+`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.
diff --git a/docs/hazmat/primitives/mac/index.rst b/docs/hazmat/primitives/mac/index.rst
index 4f075417..acfe9bed 100644
--- a/docs/hazmat/primitives/mac/index.rst
+++ b/docs/hazmat/primitives/mac/index.rst
@@ -6,7 +6,8 @@ Message Authentication Codes
While cryptography supports both the CMAC and HMAC algorithms, we strongly
recommend that HMAC should be used unless you have a good reason otherwise.
-For more information on why HMAC is preferred, see `Use cases for CMAC vs. HMAC?`_
+For more information on why HMAC is preferred, see `Use cases for CMAC vs.
+HMAC?`_
.. _`Use cases for CMAC vs. HMAC?`: http://crypto.stackexchange.com/questions/15721/use-cases-for-cmac-vs-hmac