aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/glossary.rst3
-rw-r--r--docs/hazmat/bindings/index.rst2
-rw-r--r--docs/hazmat/primitives/hmac.rst9
-rw-r--r--docs/hazmat/primitives/interfaces.rst12
4 files changed, 21 insertions, 5 deletions
diff --git a/docs/glossary.rst b/docs/glossary.rst
index 63e0a6ce..4421fca3 100644
--- a/docs/glossary.rst
+++ b/docs/glossary.rst
@@ -2,6 +2,7 @@ Glossary
========
.. glossary::
+ :sorted:
plaintext
User-readable data you care about.
@@ -35,7 +36,7 @@ Glossary
symmetric or asymmetric. Authentication is necessary for effective
encryption.
- Ciphertext indistinguishability
+ 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.
diff --git a/docs/hazmat/bindings/index.rst b/docs/hazmat/bindings/index.rst
index 809eddfc..e2a17591 100644
--- a/docs/hazmat/bindings/index.rst
+++ b/docs/hazmat/bindings/index.rst
@@ -6,7 +6,7 @@ Bindings
.. currentmodule:: cryptography.hazmat.bindings
``cryptography`` aims to provide low-level CFFI based bindings to multiple
-native C libraries. These provide no automatic initialisation of the library
+native C libraries. These provide no automatic initialization of the library
and may not provide complete wrappers for its API.
Using these functions directly is likely to require you to be careful in
diff --git a/docs/hazmat/primitives/hmac.rst b/docs/hazmat/primitives/hmac.rst
index b8f94fd2..dc5c54f8 100644
--- a/docs/hazmat/primitives/hmac.rst
+++ b/docs/hazmat/primitives/hmac.rst
@@ -74,8 +74,11 @@ message.
.. method:: verify(signature)
- Finalize the current context and securely compare digest to ``signature``.
+ Finalize the current context and securely compare digest to
+ ``signature``.
- :param bytes signature: The bytes of the HMAC signature recieved.
+ :param bytes signature: The bytes to compare the current digest
+ against.
:raises cryptography.exceptions.AlreadyFinalized: See :meth:`finalize`
- :raises cryptography.exceptions.InvalidSignature: If signature does not match digest
+ :raises cryptography.exceptions.InvalidSignature: If signature does not
+ match digest
diff --git a/docs/hazmat/primitives/interfaces.rst b/docs/hazmat/primitives/interfaces.rst
index 361b723e..edb24cd9 100644
--- a/docs/hazmat/primitives/interfaces.rst
+++ b/docs/hazmat/primitives/interfaces.rst
@@ -67,6 +67,18 @@ Interfaces used by the symmetric cipher modes described in
The name may be used by a backend to influence the operation of a
cipher in conjunction with the algorithm's name.
+ .. method:: validate_for_algorithm(algorithm)
+
+ :param CipherAlgorithm algorithm:
+
+ Checks that the combination of this mode with the provided algorithm
+ meets any necessary invariants. This should raise an exception if they
+ are not met.
+
+ For example, the :class:`~cryptography.hazmat.primitives.modes.CBC`
+ mode uses this method to check that the provided initialization
+ vector's length matches the block size of the algorithm.
+
.. class:: ModeWithInitializationVector