diff options
| author | Alex Stapleton <alexs@prol.etari.at> | 2014-04-22 08:54:55 +0100 |
|---|---|---|
| committer | Alex Stapleton <alexs@prol.etari.at> | 2014-04-22 08:54:55 +0100 |
| commit | b5236fe24efa4d399353327db49c23dc6e81d1f5 (patch) | |
| tree | e2f9e10253aa11abf3db77ea5613f7e5daab47b5 /docs/hazmat/primitives/symmetric-encryption.rst | |
| parent | a33dd28e1b4412695bc72ba1c888ca616852eac6 (diff) | |
| parent | 9a97cb93205b5785423bac9cae9288310f3b0c5a (diff) | |
| download | cryptography-b5236fe24efa4d399353327db49c23dc6e81d1f5.tar.gz cryptography-b5236fe24efa4d399353327db49c23dc6e81d1f5.tar.bz2 cryptography-b5236fe24efa4d399353327db49c23dc6e81d1f5.zip | |
Merge pull request #931 from Ayrx/cmac-implementation
CMAC implementation and docs
Diffstat (limited to 'docs/hazmat/primitives/symmetric-encryption.rst')
| -rw-r--r-- | docs/hazmat/primitives/symmetric-encryption.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst index 1a4df222..c2692ae2 100644 --- a/docs/hazmat/primitives/symmetric-encryption.rst +++ b/docs/hazmat/primitives/symmetric-encryption.rst @@ -21,7 +21,7 @@ message but an attacker can create bogus messages and force the application to decrypt them. For this reason it is *strongly* recommended to combine encryption with a -message authentication code, such as :doc:`HMAC </hazmat/primitives/hmac>`, in +message authentication code, such as :doc:`HMAC </hazmat/primitives/mac/hmac>`, in an "encrypt-then-MAC" formulation as `described by Colin Percival`_. .. class:: Cipher(algorithm, mode, backend) @@ -289,7 +289,7 @@ Modes block cipher mode that simultaneously encrypts the message as well as authenticating it. Additional unencrypted data may also be authenticated. Additional means of verifying integrity such as - :doc:`HMAC </hazmat/primitives/hmac>` are not necessary. + :doc:`HMAC </hazmat/primitives/mac/hmac>` are not necessary. **This mode does not require padding.** |