From f4885a2443b33db431669e5891d9004a481c60be Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Mon, 12 Nov 2018 13:24:37 +0100
Subject: crypto: Add Edward curves to the documentation

---
 lib/crypto/doc/src/algorithm_details.xml | 14 ++++++++++++++
 lib/crypto/doc/src/crypto.xml            | 11 ++++++++++-
 2 files changed, 24 insertions(+), 1 deletion(-)

(limited to 'lib/crypto/doc')

diff --git a/lib/crypto/doc/src/algorithm_details.xml b/lib/crypto/doc/src/algorithm_details.xml
index 4d58d26970..854bfbb4b1 100644
--- a/lib/crypto/doc/src/algorithm_details.xml
+++ b/lib/crypto/doc/src/algorithm_details.xml
@@ -302,6 +302,20 @@
       </p>
     </section>
 
+    <section>
+      <title>EdDSA</title>
+      <p>EdDSA is available with OpenSSL 1.1.1 or later if not disabled by configuration.
+      To dynamically check availability, check that the atom <c>eddsa</c> is present in the
+      list with the <c>public_keys</c> tag in the return value of
+      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      </p>
+      <p>Support for the curves ed25519 and ed448 is implemented.
+      The actual supported named curves could be checked by examining the list with the
+      <c>curves</c> tag in the return value of
+      <seealso marker="crypto#supports-0">crypto:supports()</seealso>.
+      </p>
+    </section>
+
     <section>
       <title>Diffie-Hellman</title>
       <p>Diffie-Hellman computations are available with OpenSSL versions compatible with Erlang CRYPTO
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml
index 651b647e1c..b33db0d6e4 100644
--- a/lib/crypto/doc/src/crypto.xml
+++ b/lib/crypto/doc/src/crypto.xml
@@ -268,7 +268,8 @@
     <datatype_title>Elliptic Curves</datatype_title>
     <datatype>
       <name name="ec_named_curve"/>
-      <name name="edwards_curve"/>
+      <name name="edwards_curve_dh"/>
+      <name name="edwards_curve_ed"/>
       <desc>
 	<p>Note that some curves are disabled if FIPS is enabled.</p>
       </desc>
@@ -347,6 +348,14 @@
       </desc>
     </datatype>
 
+    <datatype>
+      <name name="eddsa_public"/>
+      <name name="eddsa_private"/>
+      <name name="eddsa_params"/>
+      <desc>
+      </desc>
+    </datatype>
+
     <datatype>
       <name name="srp_public"/>
       <name name="srp_private"/>
-- 
cgit v1.2.3