aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-16 00:11:56 -0500
committerPaul Kehrer <paul.l.kehrer@gmail.com>2015-10-16 00:11:56 -0500
commit7a0ed4a7e9443a0506ae5373a8e5cd1ce3539e97 (patch)
tree0585c05880ba1cf5f08876e09f0a175795677979 /docs
parent1e3e4a588b68b274eca26fe5b9ff8f6421311de2 (diff)
parente6abbfd2ad055b8be81c49a1d9cd4c01a890dd55 (diff)
downloadcryptography-7a0ed4a7e9443a0506ae5373a8e5cd1ce3539e97.tar.gz
cryptography-7a0ed4a7e9443a0506ae5373a8e5cd1ce3539e97.tar.bz2
cryptography-7a0ed4a7e9443a0506ae5373a8e5cd1ce3539e97.zip
Merge pull request #2419 from simo5/killKEX
Kill Key Exchange as a separate interface
Diffstat (limited to 'docs')
-rw-r--r--docs/hazmat/primitives/index.rst1
-rw-r--r--docs/hazmat/primitives/key-exchange-agreements.rst23
2 files changed, 0 insertions, 24 deletions
diff --git a/docs/hazmat/primitives/index.rst b/docs/hazmat/primitives/index.rst
index 675111bb..a9ab38a0 100644
--- a/docs/hazmat/primitives/index.rst
+++ b/docs/hazmat/primitives/index.rst
@@ -15,4 +15,3 @@ Primitives
constant-time
interfaces
twofactor
- key-exchange-agreements
diff --git a/docs/hazmat/primitives/key-exchange-agreements.rst b/docs/hazmat/primitives/key-exchange-agreements.rst
deleted file mode 100644
index 8d79fbad..00000000
--- a/docs/hazmat/primitives/key-exchange-agreements.rst
+++ /dev/null
@@ -1,23 +0,0 @@
-.. hazmat::
-
-Key Exchange agreements
-=======================
-
-.. module:: cryptography.hazmat.primitives.asymmetric.key_exchange
-
-Key exchange agreements are cryptographic operations, like Diffie-Hellman
-key exchanges, that allow two parties to use their public-private key pairs
-to establish a shared secret key over an insecure channel. Usually the
-negotiated key is further derived before using it for symmetric operations.
-
-Interfaces
-~~~~~~~~~~
-
-.. class:: KeyExchangeContext
-
- .. versionadded:: 1.1
-
- .. method:: agree(public_key)
-
- :param public_key: The peer public key, the type depends on the
- crypto system used, for example :class:`~cryptography.hazmat.primitives.asymmetric.ec.EllipticCurvePublicKey`