aboutsummaryrefslogtreecommitdiffstats
path: root/doc/manual
diff options
context:
space:
mode:
Diffstat (limited to 'doc/manual')
-rw-r--r--doc/manual/aead.rst5
-rw-r--r--doc/manual/building.rst10
-rw-r--r--doc/manual/tls.rst7
3 files changed, 15 insertions, 7 deletions
diff --git a/doc/manual/aead.rst b/doc/manual/aead.rst
index 9798cac3b..5ab33c849 100644
--- a/doc/manual/aead.rst
+++ b/doc/manual/aead.rst
@@ -12,8 +12,9 @@ The AEAD interface can be used directly, or as part of the filter system by
using :cpp:class:`AEAD_Filter` (a subclass of :cpp:class:`Keyed_Filter` which
will be returned by :cpp:func:`get_cipher` if the named cipher is an AEAD mode).
-AEAD modes currently available include GCM, OCB, and EAX. All three use a
-128-bit block cipher such as AES.
+AEAD modes currently available include GCM, OCB, EAX, SIV and CCM. All
+support a 128-bit block cipher such as AES. EAX and SIV also support
+256 and 512 bit block ciphers.
.. cpp:class:: AEAD_Mode
diff --git a/doc/manual/building.rst b/doc/manual/building.rst
index dd5bebf0f..e4afb7e77 100644
--- a/doc/manual/building.rst
+++ b/doc/manual/building.rst
@@ -76,12 +76,12 @@ see :ref:`amalgamation`.
For instance::
- $ ./configure.py --minimized-build --enable-modules=rsa,ecdsa,eme1,emsa1,emsa4
+ $ ./configure.py --minimized-build --enable-modules=rsa,eme_oaep,emsa_pssr
-will set up a build that only includes RSA, ECDSA, and some padding
-modes, along with their dependencies. A small subset of core features,
-including AES, SHA-2, HMAC, and the multiple precision integer
-library, are always loaded.
+will set up a build that only includes RSA, OAEP, PSS along with any
+required dependencies. A small subset of core features, including AES,
+SHA-2, HMAC, and the multiple precision integer library, are always
+loaded.
The script tries to guess what kind of makefile to generate, and it
almost always guesses correctly (basically, Visual C++ uses NMAKE with
diff --git a/doc/manual/tls.rst b/doc/manual/tls.rst
index 5f96816a8..c5be39aaa 100644
--- a/doc/manual/tls.rst
+++ b/doc/manual/tls.rst
@@ -534,6 +534,13 @@ policy settings from a file.
.. note::
+ The current ChaCha20Poly1305 ciphersuites are non-standard but
+ as of 2015 were implemented and deployed by Google and
+ elsewhere. Support will be changed to using IETF standard
+ ChaCha20Poly1305 ciphersuites when those are defined.
+
+ .. note::
+
Support for the broken RC4 cipher was removed in 1.11.17
.. cpp:function:: std::vector<std::string> allowed_macs() const