aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2014-01-01 07:53:48 -0800
committerAlex Gaynor <alex.gaynor@gmail.com>2014-01-01 07:53:48 -0800
commit77762bcb2fae77de60d37c60f74874730eeb785b (patch)
tree05bcab96f4651afd6847270ef73b54af1a186a6f /docs
parent522487e5a7dd3004747da85c9f6c53fc5dc4de06 (diff)
downloadcryptography-77762bcb2fae77de60d37c60f74874730eeb785b.tar.gz
cryptography-77762bcb2fae77de60d37c60f74874730eeb785b.tar.bz2
cryptography-77762bcb2fae77de60d37c60f74874730eeb785b.zip
This page has been subsumed by the index
Diffstat (limited to 'docs')
-rw-r--r--docs/architecture.rst13
-rw-r--r--docs/index.rst5
2 files changed, 3 insertions, 15 deletions
diff --git a/docs/architecture.rst b/docs/architecture.rst
deleted file mode 100644
index bacde1bb..00000000
--- a/docs/architecture.rst
+++ /dev/null
@@ -1,13 +0,0 @@
-Architecture
-============
-
-``cryptography`` has three different layers:
-
-* ``cryptography``: This package contains higher level recipes, for example
- "encrypt and then MAC". This is implemented on top of
- ``cryptography.hazmat.primitives``.
-* ``cryptography.hazmat.primitives``: This packages contains low level
- algorithms, things like ``AES`` or ``SHA1``. This is implemented on top of
- ``cryptography.hazmat.backends``.
-* ``cryptography.hazmat.backends``: This package contains bindings to low level
- cryptographic libraries. Our initial target is OpenSSL.
diff --git a/docs/index.rst b/docs/index.rst
index 70558bda..81e48dd8 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -43,7 +43,9 @@ The other level is low-level cryptographic primitives. These are often
dangerous and can be used incorrectly. They require making decisions and having
an in-depth knowledge of the cryptographic concepts at work. Because of the
potential danger in working at this level, this is referred to as the
-"hazardous materials" or "hazmat" layer.
+"hazardous materials" or "hazmat" layer. These live in the
+``cryptography.hazmat`` package, and their documentation will always contain a
+admonition at the top.
We recommend using the recipes layer whenever possible, and falling back to the
hazmat layer only when necessary.
@@ -54,7 +56,6 @@ The recipes layer
.. toctree::
:maxdepth: 2
- architecture
exceptions
glossary