diff options
author | Hans Nilsson <[email protected]> | 2018-11-19 17:26:10 +0100 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2018-11-19 17:26:10 +0100 |
commit | 0fc332c2ba37772c3d4510c1b0235994de73b5b2 (patch) | |
tree | dc3e3b0fd92ec9291dcba873732eded70385be0a /lib/crypto/doc/src/crypto.xml | |
parent | 3826f8f3580d62f53a8990de4c731a07313d34dc (diff) | |
parent | d743f51960384dd17ae3cb905ec57e8012c3abd7 (diff) | |
download | otp-0fc332c2ba37772c3d4510c1b0235994de73b5b2.tar.gz otp-0fc332c2ba37772c3d4510c1b0235994de73b5b2.tar.bz2 otp-0fc332c2ba37772c3d4510c1b0235994de73b5b2.zip |
Merge branch 'maint'
* maint:
public_key: Add Edward curves to the documentation
public_key: Add ed25519 and ed448 sign/verify
crypto: Add Edward curves to the documentation
crypto: Add eddsa test case (ed25519 and ed448)
crypto: Add ed25519 and ed448 sign/verify
Diffstat (limited to 'lib/crypto/doc/src/crypto.xml')
-rw-r--r-- | lib/crypto/doc/src/crypto.xml | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/lib/crypto/doc/src/crypto.xml b/lib/crypto/doc/src/crypto.xml index b8ec41bea8..96fda34860 100644 --- a/lib/crypto/doc/src/crypto.xml +++ b/lib/crypto/doc/src/crypto.xml @@ -267,7 +267,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 @@ </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"/> <desc> |