diff options
| author | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-16 10:21:39 -0400 |
|---|---|---|
| committer | Alex Gaynor <alex.gaynor@gmail.com> | 2014-05-16 10:21:39 -0400 |
| commit | 59bcae860e9b0b2d603608965e5ef3d913b2c92e (patch) | |
| tree | e628e26852fa8692b45fc475fd83f6efb1ce4341 /docs/hazmat/primitives/symmetric-encryption.rst | |
| parent | e653e490b4d648daf3cb85d8050d04b47469a939 (diff) | |
| parent | d1c0fb8bbe0984d54ba0f4b7a8861bca0e446e19 (diff) | |
| download | cryptography-59bcae860e9b0b2d603608965e5ef3d913b2c92e.tar.gz cryptography-59bcae860e9b0b2d603608965e5ef3d913b2c92e.tar.bz2 cryptography-59bcae860e9b0b2d603608965e5ef3d913b2c92e.zip | |
Merge branch 'master' into pypy-2.3
Diffstat (limited to 'docs/hazmat/primitives/symmetric-encryption.rst')
| -rw-r--r-- | docs/hazmat/primitives/symmetric-encryption.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst index 78bf6637..e5d8c65b 100644 --- a/docs/hazmat/primitives/symmetric-encryption.rst +++ b/docs/hazmat/primitives/symmetric-encryption.rst @@ -20,7 +20,7 @@ provides secrecy but not authenticity. That means an attacker can't see the 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 +For this reason it is **strongly** recommended to combine encryption with a message authentication code, such as :doc:`HMAC </hazmat/primitives/mac/hmac>`, in an "encrypt-then-MAC" formulation as `described by Colin Percival`_. |