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

1 files changed, 24 insertions, 12 deletions

diff --git a/lib/crypto/src/crypto.erl b/lib/crypto/src/crypto.erl
index 9915a5a6f3..feb02d0f5a 100644
--- a/lib/crypto/src/crypto.erl
+++ b/lib/crypto/src/crypto.erl
@@ -121,7 +121,11 @@
 
 -type ecdsa_public()  :: key_integer() .
 -type ecdsa_private() :: key_integer() .
--type ecdsa_params()  :: ec_named_curve() | edwards_curve() | ec_explicit_curve() .
+-type ecdsa_params()  :: ec_named_curve() | ec_explicit_curve() .
+
+-type eddsa_public()  :: key_integer() .
+-type eddsa_private() :: key_integer() .
+-type eddsa_params()  :: edwards_curve_ed() .
 
 -type srp_public() :: key_integer() .
 -type srp_private() :: key_integer() .
@@ -138,7 +142,7 @@
 
 -type ecdh_public()  :: key_integer() .
 -type ecdh_private() :: key_integer() .
--type ecdh_params()  :: ec_named_curve() | edwards_curve() | ec_explicit_curve() .
+-type ecdh_params()  :: ec_named_curve() | edwards_curve_dh() | ec_explicit_curve() .
 
 
 %%% Curves
@@ -250,8 +254,9 @@
                         | wtls9
                           .
 
--type edwards_curve() :: x25519
-                       | x448 .
+-type edwards_curve_dh() :: x25519 | x448 .
+
+-type edwards_curve_ed() :: ed25519 | ed448 .
 
 %%% 
 -type block_cipher_with_iv() :: cbc_cipher()
@@ -331,7 +336,7 @@ stop() ->
                                         ], 
                              PKs :: [rsa | dss | ecdsa | dh | ecdh | ec_gf2m],
                              Macs :: [hmac | cmac | poly1305],
-                             Curves :: [ec_named_curve() | edwards_curve()],
+                             Curves :: [ec_named_curve() | edwards_curve_dh() | edwards_curve_ed()],
                              RSAopts :: [rsa_sign_verify_opt() | rsa_opt()] .
 supports()->
     {Hashs, PubKeys, Ciphers, Macs, Curves, RsaOpts} = algorithms(),
@@ -904,7 +909,7 @@ rand_seed_nif(_Seed) -> ?nif_stub.
 %%% Sign/verify
 %%%
 %%%================================================================
--type pk_sign_verify_algs() :: rsa | dss | ecdsa .
+-type pk_sign_verify_algs() :: rsa | dss | ecdsa | eddsa .
 
 -type pk_sign_verify_opts() :: [ rsa_sign_verify_opt() ] .
 
@@ -928,7 +933,8 @@ rand_seed_nif(_Seed) -> ?nif_stub.
                       Msg :: binary() | {digest,binary()},
                       Key :: rsa_private()
                            | dss_private()
-                           | [ecdsa_private()|ecdsa_params()]
+                           | [ecdsa_private() | ecdsa_params()]
+                           | [eddsa_private() | eddsa_params()]
                            | engine_key_ref(),
                       Signature :: binary() .
 
@@ -947,6 +953,7 @@ sign(Algorithm, Type, Data, Key) ->
                       Key :: rsa_private()
                            | dss_private()
                            | [ecdsa_private() | ecdsa_params()]
+                           | [eddsa_private() | eddsa_params()]
                            | engine_key_ref(),
                       Options :: pk_sign_verify_opts(),
                       Signature :: binary() .
@@ -969,12 +976,14 @@ pkey_sign_nif(_Algorithm, _Type, _Digest, _Key, _Options) -> ?nif_stub.
                    when Algorithm :: pk_sign_verify_algs(),
                         DigestType :: rsa_digest_type()
                                     | dss_digest_type()
-                                    | ecdsa_digest_type(),
+                                    | ecdsa_digest_type()
+                                    | none,
                         Msg :: binary() | {digest,binary()},
                         Signature :: binary(),
-                        Key :: rsa_private()
-                             | dss_private()
-                             | [ecdsa_private() | ecdsa_params()]
+                        Key :: rsa_public()
+                             | dss_public()
+                             | [ecdsa_public() | ecdsa_params()]
+                             | [eddsa_public() | eddsa_params()]
                              | engine_key_ref(),
                         Result :: boolean().
 
@@ -992,6 +1001,7 @@ verify(Algorithm, Type, Data, Signature, Key) ->
                         Key :: rsa_public()
                              | dss_public()
                              | [ecdsa_public() | ecdsa_params()]
+                             | [eddsa_public() | eddsa_params()]
                              | engine_key_ref(),
                         Options :: pk_sign_verify_opts(),
                         Result :: boolean().
@@ -1889,7 +1899,9 @@ ec_key_generate(_Curve, _Key) -> ?nif_stub.
 
 ecdh_compute_key_nif(_Others, _Curve, _My) -> ?nif_stub.
 
--spec ec_curves() -> [EllipticCurve] when EllipticCurve :: ec_named_curve() | edwards_curve() .
+-spec ec_curves() -> [EllipticCurve] when EllipticCurve :: ec_named_curve()
+                                                         | edwards_curve_dh()
+                                                         | edwards_curve_ed() .
 
 ec_curves() ->
     crypto_ec_curves:curves().