aboutsummaryrefslogtreecommitdiffstats
path: root/docs/hazmat/primitives/symmetric-encryption.rst
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-15 18:01:36 -0800
committerPaul Kehrer <paul.l.kehrer@gmail.com>2013-11-15 18:01:36 -0800
commitb3fa4b246a889cc98fae1757d3123b1a122795fe (patch)
treece8ab62edf72423825bbb2c32d7341171860ef7d /docs/hazmat/primitives/symmetric-encryption.rst
parent9489c769dbd7ea7c6830b5fcd70095818452e607 (diff)
parentb317c7a0dd197140b7ef1fd3446941f5b568e645 (diff)
downloadcryptography-b3fa4b246a889cc98fae1757d3123b1a122795fe.tar.gz
cryptography-b3fa4b246a889cc98fae1757d3123b1a122795fe.tar.bz2
cryptography-b3fa4b246a889cc98fae1757d3123b1a122795fe.zip
Merge pull request #263 from alex/spelling-fixes
Fixed some spelling mistakes
Diffstat (limited to 'docs/hazmat/primitives/symmetric-encryption.rst')
-rw-r--r--docs/hazmat/primitives/symmetric-encryption.rst10
1 files changed, 5 insertions, 5 deletions
diff --git a/docs/hazmat/primitives/symmetric-encryption.rst b/docs/hazmat/primitives/symmetric-encryption.rst
index 4ef15459..eef359d6 100644
--- a/docs/hazmat/primitives/symmetric-encryption.rst
+++ b/docs/hazmat/primitives/symmetric-encryption.rst
@@ -14,11 +14,11 @@ Symmetric Encryption
Symmetric encryption is a way to encrypt (hide the plaintext value) material
-where the encrypter and decrypter both use the same key. Note that symmetric
+where the sender and receiver both use the same key. Note that symmetric
encryption is **not** sufficient for most applications, because it only
provides secrecy (an attacker can't see the message) but not authenticity (an
attacker can create bogus messages and force the application to decrypt them).
-For this reason it is *strongly* reccomended 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/hmac>`, in
an "encrypt-then-MAC" formulation as `described by Colin Percival`_.
@@ -121,10 +121,10 @@ Algorithms
.. class:: TripleDES(key)
- Triple DES (Data Encryption Standard), sometimes refered to as 3DES, is a
- block cipher standardized by NIST. Triple DES has known cryptoanalytic
+ Triple DES (Data Encryption Standard), sometimes referred to as 3DES, is a
+ block cipher standardized by NIST. Triple DES has known crypto-analytic
flaws, however none of them currently enable a practical attack.
- Nonetheless, Triples DES is not reccomended for new applications because it
+ Nonetheless, Triples DES is not recommended for new applications because it
is incredibly slow; old applications should consider moving away from it.
:param bytes key: The secret key, either ``64``, ``128``, or ``192`` bits