aboutsummaryrefslogtreecommitdiffstats
path: root/docs/glossary.rst
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2013-12-15 23:09:13 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2013-12-15 23:09:13 -0800
commit5175e4e6394ade40e38dc00b8e1e14a2877aafe4 (patch)
treece9073684c790f908044f939e92312ad82112514 /docs/glossary.rst
parent973499aded3ce3580a8c6d44aa111288240f90a1 (diff)
parentffb7726fa3042e66e8011fbd17a8b6f83f0c8110 (diff)
downloadcryptography-5175e4e6394ade40e38dc00b8e1e14a2877aafe4.tar.gz
cryptography-5175e4e6394ade40e38dc00b8e1e14a2877aafe4.tar.bz2
cryptography-5175e4e6394ade40e38dc00b8e1e14a2877aafe4.zip
Merge branch 'master' into validate-iv
Conflicts: cryptography/hazmat/primitives/ciphers/modes.py tests/hazmat/primitives/test_block.py
Diffstat (limited to 'docs/glossary.rst')
-rw-r--r--docs/glossary.rst11
1 files changed, 11 insertions, 0 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index b6f2d06f..63e0a6ce 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -28,3 +28,14 @@ Glossary
asymmetric cryptography
Cryptographic operations where encryption and decryption use different
keys. There are separate encryption and decryption keys.
+
+ authentication
+ The process of verifying that a message was created by a specific
+ individual (or program). Like encryption, authentication can be either
+ symmetric or asymmetric. Authentication is necessary for effective
+ encryption.
+
+ Ciphertext indistinguishability
+ This is a property of encryption systems whereby two encrypted messages
+ aren't distinguishable without knowing the encryption key. This is
+ considered a basic, necessary property for a working encryption system.