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

9 files changed, 744 insertions, 44 deletions

diff --git a/lib/crypto/c_src/crypto.c b/lib/crypto/c_src/crypto.c
index b2d8123f00..ecb716c98c 100644
--- a/lib/crypto/c_src/crypto.c
+++ b/lib/crypto/c_src/crypto.c
@@ -173,10 +173,13 @@
 #endif
 
 // (test for >= 1.1.1pre8)
-#if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1) - 7) \
+#if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1) -7) \
     && !defined(HAS_LIBRESSL) \
     && defined(HAVE_EC)
 # define HAVE_ED_CURVE_DH
+# if OPENSSL_VERSION_NUMBER >= (PACKED_OPENSSL_VERSION_PLAIN(1,1,1))
+#   define HAVE_EDDSA
+# endif
 #endif
 
 #if OPENSSL_VERSION_NUMBER >= PACKED_OPENSSL_VERSION(0,9,8,'c')
@@ -632,10 +635,8 @@ static ErlNifFunc nif_funcs[] = {
     {"rsa_generate_key_nif", 2, rsa_generate_key_nif},
     {"dh_generate_key_nif", 4, dh_generate_key_nif},
     {"dh_compute_key_nif", 3, dh_compute_key_nif},
-
     {"evp_compute_key_nif", 3, evp_compute_key_nif},
     {"evp_generate_key_nif", 1, evp_generate_key_nif},
-
     {"privkey_to_pubkey_nif", 2, privkey_to_pubkey_nif},
     {"srp_value_B_nif", 5, srp_value_B_nif},
     {"srp_user_secret_nif", 7, srp_user_secret_nif},
@@ -742,6 +743,12 @@ static ERL_NIF_TERM atom_x25519;
 static ERL_NIF_TERM atom_x448;
 #endif
 
+static ERL_NIF_TERM atom_eddsa;
+#ifdef HAVE_EDDSA
+static ERL_NIF_TERM atom_ed25519;
+static ERL_NIF_TERM atom_ed448;
+#endif
+
 static ERL_NIF_TERM atom_rsa_mgf1_md;
 static ERL_NIF_TERM atom_rsa_oaep_label;
 static ERL_NIF_TERM atom_rsa_oaep_md;
@@ -1165,6 +1172,7 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_ppbasis = enif_make_atom(env,"ppbasis");
     atom_onbasis = enif_make_atom(env,"onbasis");
 #endif
+
     atom_aes_cfb8 = enif_make_atom(env, "aes_cfb8");
     atom_aes_cfb128 = enif_make_atom(env, "aes_cfb128");
 #ifdef HAVE_GCM
@@ -1195,6 +1203,11 @@ static int initialize(ErlNifEnv* env, ERL_NIF_TERM load_info)
     atom_x25519 = enif_make_atom(env,"x25519");
     atom_x448 = enif_make_atom(env,"x448");
 #endif
+    atom_eddsa = enif_make_atom(env,"eddsa");
+#ifdef HAVE_EDDSA
+    atom_ed25519 = enif_make_atom(env,"ed25519");
+    atom_ed448 = enif_make_atom(env,"ed448");
+#endif
     atom_rsa_mgf1_md = enif_make_atom(env,"rsa_mgf1_md");
     atom_rsa_oaep_label = enif_make_atom(env,"rsa_oaep_label");
     atom_rsa_oaep_md = enif_make_atom(env,"rsa_oaep_md");
@@ -1336,13 +1349,13 @@ static void unload(ErlNifEnv* env, void* priv_data)
 static int algo_hash_cnt, algo_hash_fips_cnt;
 static ERL_NIF_TERM algo_hash[12];   /* increase when extending the list */
 static int algo_pubkey_cnt, algo_pubkey_fips_cnt;
-static ERL_NIF_TERM algo_pubkey[11]; /* increase when extending the list */
+static ERL_NIF_TERM algo_pubkey[12]; /* increase when extending the list */
 static int algo_cipher_cnt, algo_cipher_fips_cnt;
 static ERL_NIF_TERM algo_cipher[25]; /* increase when extending the list */
 static int algo_mac_cnt, algo_mac_fips_cnt;
 static ERL_NIF_TERM algo_mac[3]; /* increase when extending the list */
 static int algo_curve_cnt, algo_curve_fips_cnt;
-static ERL_NIF_TERM algo_curve[87]; /* increase when extending the list */
+static ERL_NIF_TERM algo_curve[89]; /* increase when extending the list */
 static int algo_rsa_opts_cnt, algo_rsa_opts_fips_cnt;
 static ERL_NIF_TERM algo_rsa_opts[11]; /* increase when extending the list */
 
@@ -1394,6 +1407,10 @@ static void init_algorithms_types(ErlNifEnv* env)
 #endif
     // Non-validated algorithms follow
     algo_pubkey_fips_cnt = algo_pubkey_cnt;
+    // Don't know if Edward curves are fips validated
+#if defined(HAVE_EDDSA)
+    algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "eddsa");
+#endif
     algo_pubkey[algo_pubkey_cnt++] = enif_make_atom(env, "srp");
 
     // Validated algorithms first
@@ -1554,6 +1571,10 @@ static void init_algorithms_types(ErlNifEnv* env)
 #endif
 #endif
     //--
+#ifdef HAVE_EDDSA
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed25519");
+    algo_curve[algo_curve_cnt++] = enif_make_atom(env,"ed448");
+#endif
 #ifdef HAVE_ED_CURVE_DH
     algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x25519");
     algo_curve[algo_curve_cnt++] = enif_make_atom(env,"x448");
@@ -3215,6 +3236,36 @@ static int get_rsa_public_key(ErlNifEnv* env, ERL_NIF_TERM key, RSA *rsa)
     return 1;
 }
 
+#ifdef HAVE_EDDSA
+ static int get_eddsa_key(ErlNifEnv* env, int public, ERL_NIF_TERM key, EVP_PKEY **pkey)
+{
+    /* key=[K] */
+    ERL_NIF_TERM head, tail, tail2, algo;
+    ErlNifBinary bin;
+    int type;
+
+    if (!enif_get_list_cell(env, key, &head, &tail)
+	|| !enif_inspect_binary(env, head, &bin)
+        || !enif_get_list_cell(env, tail, &algo, &tail2)
+        || !enif_is_empty_list(env, tail2)) {
+	return 0;
+    }
+    if (algo == atom_ed25519) type = EVP_PKEY_ED25519;
+    else if (algo == atom_ed448) type = EVP_PKEY_ED448;
+    else
+        return 0;
+
+    if (public)
+        *pkey = EVP_PKEY_new_raw_public_key(type, NULL, bin.data, bin.size);
+    else 
+        *pkey = EVP_PKEY_new_raw_private_key(type, NULL, bin.data, bin.size);
+
+    if (!pkey)
+        return 0;
+    return 1;
+}
+#endif
+
 static int get_dss_private_key(ErlNifEnv* env, ERL_NIF_TERM key, DSA *dsa)
 {
     /* key=[P,Q,G,KEY] */
@@ -4296,7 +4347,9 @@ static int get_pkey_digest_type(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
     *md = NULL;
 
     if (type == atom_none && algorithm == atom_rsa) return PKEY_OK;
-
+#ifdef HAVE_EDDSA
+    if (algorithm == atom_eddsa) return PKEY_OK;
+#endif
     digp = get_digest_type(type);
     if (!digp) return PKEY_BADARG;
     if (!digp->md.p) return PKEY_NOTSUP;
@@ -4546,6 +4599,14 @@ static int get_pkey_private_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_
 #else
 	return PKEY_NOTSUP;
 #endif
+    } else if (algorithm == atom_eddsa) {
+#if defined(HAVE_EDDSA)
+        if (!get_eddsa_key(env, 0, key, pkey)) {
+            return PKEY_BADARG;
+        }
+#else
+     return PKEY_NOTSUP;  
+#endif
     } else if (algorithm == atom_dss) {
 	DSA *dsa = DSA_new();
 
@@ -4624,6 +4685,14 @@ static int get_pkey_public_key(ErlNifEnv *env, ERL_NIF_TERM algorithm, ERL_NIF_T
 #else
 	return PKEY_NOTSUP;
 #endif
+    } else if (algorithm == atom_eddsa) {
+#if defined(HAVE_EDDSA)
+        if (!get_eddsa_key(env, 1, key, pkey)) {
+            return PKEY_BADARG;
+        }
+#else
+     return PKEY_NOTSUP;  
+#endif
     } else if (algorithm == atom_dss) {
 	DSA *dsa = DSA_new();
 
@@ -4697,8 +4766,10 @@ printf("\r\n");
     ctx = EVP_PKEY_CTX_new(pkey, NULL);
     if (!ctx) goto badarg;
 
-    if (EVP_PKEY_sign_init(ctx) <= 0) goto badarg;
-    if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
+    if (argv[0] != atom_eddsa) {
+        if (EVP_PKEY_sign_init(ctx) <= 0) goto badarg;
+        if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
+    }
 
     if (argv[0] == atom_rsa) {
 	if (EVP_PKEY_CTX_set_rsa_padding(ctx, sig_opt.rsa_padding) <= 0) goto badarg;
@@ -4720,14 +4791,39 @@ printf("\r\n");
 #endif
     }
 
-    if (EVP_PKEY_sign(ctx, NULL, &siglen, tbs, tbslen) <= 0) goto badarg;
-    enif_alloc_binary(siglen, &sig_bin);
+    if (argv[0] == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        EVP_MD_CTX* mdctx = EVP_MD_CTX_new();
+        if (!EVP_DigestSignInit(mdctx, NULL, NULL, NULL, pkey)) {
+            if (mdctx) EVP_MD_CTX_free(mdctx);
+            goto badarg;
+        }
 
-    if (md != NULL) {
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
+        if (!EVP_DigestSign(mdctx, NULL, &siglen, tbs, tbslen)) {
+            EVP_MD_CTX_free(mdctx);
+            goto badarg;
+        }
+        enif_alloc_binary(siglen, &sig_bin);
+
+        if (!EVP_DigestSign(mdctx, sig_bin.data, &siglen, tbs, tbslen)) {
+            EVP_MD_CTX_free(mdctx);
+            goto badarg;
+        }
+#else
+        goto badarg;    
+#endif
     }
-    i = EVP_PKEY_sign(ctx, sig_bin.data, &siglen, tbs, tbslen);
+    else
+    {
+        if (EVP_PKEY_sign(ctx, NULL, &siglen, tbs, tbslen) <= 0) goto badarg;
+        enif_alloc_binary(siglen, &sig_bin);
 
+        if (md != NULL) {
+            ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
+        }
+        i = EVP_PKEY_sign(ctx, sig_bin.data, &siglen, tbs, tbslen);
+    }
+        
     EVP_PKEY_CTX_free(ctx);
 #else
 /*printf("Old interface\r\n");
@@ -4835,8 +4931,11 @@ static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
  */
     ctx = EVP_PKEY_CTX_new(pkey, NULL);
     if (!ctx) goto badarg;
-    if (EVP_PKEY_verify_init(ctx) <= 0) goto badarg;
-    if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
+
+    if (argv[0] != atom_eddsa) {
+        if (EVP_PKEY_verify_init(ctx) <= 0) goto badarg;
+        if (md != NULL && EVP_PKEY_CTX_set_signature_md(ctx, md) <= 0) goto badarg;
+    }
 
     if (argv[0] == atom_rsa) {
 	if (EVP_PKEY_CTX_set_rsa_padding(ctx, sig_opt.rsa_padding) <= 0) goto badarg;
@@ -4856,10 +4955,28 @@ static ERL_NIF_TERM pkey_verify_nif(ErlNifEnv *env, int argc, const ERL_NIF_TERM
 	}
     }
 
-    if (md != NULL) {
-	ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
-    }
-    i = EVP_PKEY_verify(ctx, sig_bin.data, sig_bin.size, tbs, tbslen);
+        if (argv[0] == atom_eddsa) {
+#ifdef HAVE_EDDSA
+        EVP_MD_CTX* mdctx = EVP_MD_CTX_create();
+        
+        if (!EVP_DigestVerifyInit(mdctx, NULL, NULL, NULL, pkey)) {
+            if (mdctx) EVP_MD_CTX_destroy(mdctx);
+            goto badarg;
+        }
+
+        i = EVP_DigestVerify(mdctx, sig_bin.data, sig_bin.size, tbs, tbslen);
+        EVP_MD_CTX_destroy(mdctx);
+#else
+        goto badarg;    
+#endif
+        }
+    else
+        {
+            if (md != NULL) {
+                ERL_VALGRIND_ASSERT_MEM_DEFINED(tbs, EVP_MD_size(md));
+            }
+            i = EVP_PKEY_verify(ctx, sig_bin.data, sig_bin.size, tbs, tbslen);
+        }
 
     EVP_PKEY_CTX_free(ctx);
 #else
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
@@ -303,6 +303,20 @@
     </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
       if not disabled by configuration.
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>
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().
diff --git a/lib/crypto/test/crypto_SUITE.erl b/lib/crypto/test/crypto_SUITE.erl
index 0b878f2e5c..8e20304dc9 100644
--- a/lib/crypto/test/crypto_SUITE.erl
+++ b/lib/crypto/test/crypto_SUITE.erl
@@ -1,4 +1,4 @@
-%%
+%
 %% %CopyrightBegin%
 %%
 %% Copyright Ericsson AB 1999-2018. All Rights Reserved.
@@ -58,6 +58,8 @@ groups() ->
                      {group, rsa},
                      {group, dss},
                      {group, ecdsa},
+                     {group, ed25519},
+                     {group, ed448},
                      {group, dh},
                      {group, ecdh},
                      {group, srp},
@@ -145,6 +147,12 @@ groups() ->
      {ecdsa, [], [sign_verify
                 %% Does not work yet:  ,public_encrypt, private_encrypt
                  ]},
+     {ed25519, [], [sign_verify
+                %% Does not work yet:  ,public_encrypt, private_encrypt
+                 ]},
+     {ed448, [], [sign_verify
+                %% Does not work yet:  ,public_encrypt, private_encrypt
+                 ]},
      {dh, [], [generate_compute,
                compute_bug]},
      {ecdh, [], [generate_all_supported, compute, generate]},
@@ -572,7 +580,8 @@ generate_all_supported(_Config) ->
                  ct:log("ERROR: Curve ~p exception ~p:~p~n~p", [C,Cls,Err,Stack]),
                  {error,{C,{Cls,Err}}}
          end
-         || C <- crypto:ec_curves()
+         || C <- crypto:ec_curves(),
+            not lists:member(C, [ed25519, ed448])
         ],
     OK = [C || {ok,C} <- Results],
     ct:log("Ok (len=~p): ~p", [length(OK), OK]),
@@ -884,6 +893,29 @@ aead_cipher({Type, Key, PlainText, IV, AAD, CipherText, CipherTag, TagLen, Info}
                      {got, Other1}})
     end.
 
+do_sign_verify({Type, undefined=Hash, Private, Public, Msg, Signature}) ->
+    case crypto:sign(eddsa, Hash, Msg, [Private,Type]) of
+        Signature ->
+            ct:log("OK crypto:sign(eddsa, ~p, Msg, [Private,~p])", [Hash,Type]),
+            case crypto:verify(eddsa, Hash, Msg, Signature, [Public,Type]) of
+                true ->
+                    ct:log("OK crypto:verify(eddsa, ~p, Msg, Signature, [Public,~p])", [Hash,Type]),
+                    negative_verify(eddsa, Hash, Msg, <<10,20>>, [Public,Type]);
+                false ->
+                    ct:log("ERROR crypto:verify(eddsa, ~p, Msg= ~p, Signature= ~p, [Public= ~p,~p])",
+                           [Hash,Msg,Signature,Public,Type]),
+                    ct:fail({{crypto, verify, [eddsa, Hash, Msg, Signature, [Public,Type]]}})
+            end;
+        ErrorSig ->
+            ct:log("ERROR crypto:sign(~p, ~p, ..., [Private= ~p,~p])", [eddsa,Hash,Private,Type]),
+            ct:log("ERROR crypto:verify(eddsa, ~p, Msg= ~p, [Public= ~p,~p])~n"
+                   "ErrorSig   = ~p~n"
+                   "CorrectSig = ~p~n"
+                  ,
+                   [Hash,Msg,Public,Type,ErrorSig,Signature]),
+            ct:fail({{crypto, sign, [Type, Hash, Msg, ErrorSig, [Private]]}})
+    end;
+
 do_sign_verify({Type, Hash, Public, Private, Msg}) ->
     Signature = crypto:sign(Type, Hash, Msg, Private),
     case crypto:verify(Type, Hash, Msg, Signature, Public) of
@@ -1443,6 +1475,12 @@ group_config(ecdsa = Type, Config) ->
     MsgPubEnc = <<"7896345786348 Asldi">>,
     PubPrivEnc = [{ecdsa, Public, Private, MsgPubEnc, []}],
     [{sign_verify, SignVerify}, {pub_priv_encrypt, PubPrivEnc} | Config];
+
+group_config(Type, Config) when Type == ed25519 ; Type == ed448 ->
+    TestVectors = eddsa(Type),
+    [{sign_verify,TestVectors} | Config]; 
+
+
 group_config(srp, Config) ->
     GenerateCompute = [srp3(), srp6(), srp6a(), srp6a_smaller_prime()],
     [{generate_compute, GenerateCompute} | Config];
@@ -2702,6 +2740,392 @@ srp(ClientPrivate, Generator, Prime, Version, Verifier, ServerPublic, ServerPriv
      ServerPublic, ServerPrivate, {host, [Verifier, Generator, Prime, Version]},
      {host, [Verifier, Prime, Version, Scrambler]},
      SessionKey}.
+
+eddsa(ed25519) ->
+    %% https://tools.ietf.org/html/rfc8032#section-7.1
+    %% {ALGORITHM, (SHA)}, SECRET KEY, PUBLIC KEY,  MESSAGE, SIGNATURE}
+    [
+     %% TEST 1
+     {ed25519, undefined,
+      hexstr2bin("9d61b19deffd5a60ba844af492ec2cc4"
+                 "4449c5697b326919703bac031cae7f60"),
+      hexstr2bin("d75a980182b10ab7d54bfed3c964073a"
+                 "0ee172f3daa62325af021a68f707511a"),
+      hexstr2bin(""),
+      hexstr2bin("e5564300c360ac729086e2cc806e828a"
+                 "84877f1eb8e5d974d873e06522490155"
+                 "5fb8821590a33bacc61e39701cf9b46b"
+                 "d25bf5f0595bbe24655141438e7a100b")},
+     %% TEST 2
+     {ed25519, undefined,
+      hexstr2bin("4ccd089b28ff96da9db6c346ec114e0f"
+                 "5b8a319f35aba624da8cf6ed4fb8a6fb"),
+      hexstr2bin("3d4017c3e843895a92b70aa74d1b7ebc"
+                 "9c982ccf2ec4968cc0cd55f12af4660c"),
+      hexstr2bin("72"),
+      hexstr2bin("92a009a9f0d4cab8720e820b5f642540"
+                 "a2b27b5416503f8fb3762223ebdb69da"
+                 "085ac1e43e15996e458f3613d0f11d8c"
+                 "387b2eaeb4302aeeb00d291612bb0c00")},
+     %% TEST 3
+     {ed25519, undefined,
+      hexstr2bin("c5aa8df43f9f837bedb7442f31dcb7b1"
+                 "66d38535076f094b85ce3a2e0b4458f7"),
+      hexstr2bin("fc51cd8e6218a1a38da47ed00230f058"
+                 "0816ed13ba3303ac5deb911548908025"),
+      hexstr2bin("af82"),
+      hexstr2bin("6291d657deec24024827e69c3abe01a3"
+                 "0ce548a284743a445e3680d7db5ac3ac"
+                 "18ff9b538d16f290ae67f760984dc659"
+                 "4a7c15e9716ed28dc027beceea1ec40a")},
+     %% TEST 1024
+     {ed25519, undefined,
+      hexstr2bin("f5e5767cf153319517630f226876b86c"
+                 "8160cc583bc013744c6bf255f5cc0ee5"),
+      hexstr2bin("278117fc144c72340f67d0f2316e8386"
+                 "ceffbf2b2428c9c51fef7c597f1d426e"),
+      hexstr2bin("08b8b2b733424243760fe426a4b54908"
+                 "632110a66c2f6591eabd3345e3e4eb98"
+                 "fa6e264bf09efe12ee50f8f54e9f77b1"
+                 "e355f6c50544e23fb1433ddf73be84d8"
+                 "79de7c0046dc4996d9e773f4bc9efe57"
+                 "38829adb26c81b37c93a1b270b20329d"
+                 "658675fc6ea534e0810a4432826bf58c"
+                 "941efb65d57a338bbd2e26640f89ffbc"
+                 "1a858efcb8550ee3a5e1998bd177e93a"
+                 "7363c344fe6b199ee5d02e82d522c4fe"
+                 "ba15452f80288a821a579116ec6dad2b"
+                 "3b310da903401aa62100ab5d1a36553e"
+                 "06203b33890cc9b832f79ef80560ccb9"
+                 "a39ce767967ed628c6ad573cb116dbef"
+                 "efd75499da96bd68a8a97b928a8bbc10"
+                 "3b6621fcde2beca1231d206be6cd9ec7"
+                 "aff6f6c94fcd7204ed3455c68c83f4a4"
+                 "1da4af2b74ef5c53f1d8ac70bdcb7ed1"
+                 "85ce81bd84359d44254d95629e9855a9"
+                 "4a7c1958d1f8ada5d0532ed8a5aa3fb2"
+                 "d17ba70eb6248e594e1a2297acbbb39d"
+                 "502f1a8c6eb6f1ce22b3de1a1f40cc24"
+                 "554119a831a9aad6079cad88425de6bd"
+                 "e1a9187ebb6092cf67bf2b13fd65f270"
+                 "88d78b7e883c8759d2c4f5c65adb7553"
+                 "878ad575f9fad878e80a0c9ba63bcbcc"
+                 "2732e69485bbc9c90bfbd62481d9089b"
+                 "eccf80cfe2df16a2cf65bd92dd597b07"
+                 "07e0917af48bbb75fed413d238f5555a"
+                 "7a569d80c3414a8d0859dc65a46128ba"
+                 "b27af87a71314f318c782b23ebfe808b"
+                 "82b0ce26401d2e22f04d83d1255dc51a"
+                 "ddd3b75a2b1ae0784504df543af8969b"
+                 "e3ea7082ff7fc9888c144da2af58429e"
+                 "c96031dbcad3dad9af0dcbaaaf268cb8"
+                 "fcffead94f3c7ca495e056a9b47acdb7"
+                 "51fb73e666c6c655ade8297297d07ad1"
+                 "ba5e43f1bca32301651339e22904cc8c"
+                 "42f58c30c04aafdb038dda0847dd988d"
+                 "cda6f3bfd15c4b4c4525004aa06eeff8"
+                 "ca61783aacec57fb3d1f92b0fe2fd1a8"
+                 "5f6724517b65e614ad6808d6f6ee34df"
+                 "f7310fdc82aebfd904b01e1dc54b2927"
+                 "094b2db68d6f903b68401adebf5a7e08"
+                 "d78ff4ef5d63653a65040cf9bfd4aca7"
+                 "984a74d37145986780fc0b16ac451649"
+                 "de6188a7dbdf191f64b5fc5e2ab47b57"
+                 "f7f7276cd419c17a3ca8e1b939ae49e4"
+                 "88acba6b965610b5480109c8b17b80e1"
+                 "b7b750dfc7598d5d5011fd2dcc5600a3"
+                 "2ef5b52a1ecc820e308aa342721aac09"
+                 "43bf6686b64b2579376504ccc493d97e"
+                 "6aed3fb0f9cd71a43dd497f01f17c0e2"
+                 "cb3797aa2a2f256656168e6c496afc5f"
+                 "b93246f6b1116398a346f1a641f3b041"
+                 "e989f7914f90cc2c7fff357876e506b5"
+                 "0d334ba77c225bc307ba537152f3f161"
+                 "0e4eafe595f6d9d90d11faa933a15ef1"
+                 "369546868a7f3a45a96768d40fd9d034"
+                 "12c091c6315cf4fde7cb68606937380d"
+                 "b2eaaa707b4c4185c32eddcdd306705e"
+                 "4dc1ffc872eeee475a64dfac86aba41c"
+                 "0618983f8741c5ef68d3a101e8a3b8ca"
+                 "c60c905c15fc910840b94c00a0b9d0"),
+      hexstr2bin("0aab4c900501b3e24d7cdf4663326a3a"
+                 "87df5e4843b2cbdb67cbf6e460fec350"
+                 "aa5371b1508f9f4528ecea23c436d94b"
+                 "5e8fcd4f681e30a6ac00a9704a188a03")},
+     %% TEST SHA(abc)
+     {ed25519, undefined,
+      hexstr2bin("833fe62409237b9d62ec77587520911e"
+                 "9a759cec1d19755b7da901b96dca3d42"),
+      hexstr2bin("ec172b93ad5e563bf4932c70e1245034"
+                 "c35467ef2efd4d64ebf819683467e2bf"),
+      hexstr2bin("ddaf35a193617abacc417349ae204131"
+                 "12e6fa4e89a97ea20a9eeee64b55d39a"
+                 "2192992a274fc1a836ba3c23a3feebbd"
+                 "454d4423643ce80e2a9ac94fa54ca49f"),
+      hexstr2bin("dc2a4459e7369633a52b1bf277839a00"
+                 "201009a3efbf3ecb69bea2186c26b589"
+                 "09351fc9ac90b3ecfdfbc7c66431e030"
+                 "3dca179c138ac17ad9bef1177331a704")}
+    ];
+
+eddsa(ed448) ->
+    %% https://tools.ietf.org/html/rfc8032#section-7.4
+    [{ed448, undefined,
+      hexstr2bin("6c82a562cb808d10d632be89c8513ebf"
+                 "6c929f34ddfa8c9f63c9960ef6e348a3"
+                 "528c8a3fcc2f044e39a3fc5b94492f8f"
+                 "032e7549a20098f95b"),
+      hexstr2bin("5fd7449b59b461fd2ce787ec616ad46a"
+                 "1da1342485a70e1f8a0ea75d80e96778"
+                 "edf124769b46c7061bd6783df1e50f6c"
+                 "d1fa1abeafe8256180"),
+      hexstr2bin(""),
+      hexstr2bin("533a37f6bbe457251f023c0d88f976ae"
+                 "2dfb504a843e34d2074fd823d41a591f"
+                 "2b233f034f628281f2fd7a22ddd47d78"
+                 "28c59bd0a21bfd3980ff0d2028d4b18a"
+                 "9df63e006c5d1c2d345b925d8dc00b41"
+                 "04852db99ac5c7cdda8530a113a0f4db"
+                 "b61149f05a7363268c71d95808ff2e65"
+                 "2600")},
+     %% 1 octet
+     {ed448, undefined,
+      hexstr2bin("c4eab05d357007c632f3dbb48489924d"
+                 "552b08fe0c353a0d4a1f00acda2c463a"
+                 "fbea67c5e8d2877c5e3bc397a659949e"
+                 "f8021e954e0a12274e"),
+      hexstr2bin("43ba28f430cdff456ae531545f7ecd0a"
+                 "c834a55d9358c0372bfa0c6c6798c086"
+                 "6aea01eb00742802b8438ea4cb82169c"
+                 "235160627b4c3a9480"),
+      hexstr2bin("03"),
+      hexstr2bin("26b8f91727bd62897af15e41eb43c377"
+                 "efb9c610d48f2335cb0bd0087810f435"
+                 "2541b143c4b981b7e18f62de8ccdf633"
+                 "fc1bf037ab7cd779805e0dbcc0aae1cb"
+                 "cee1afb2e027df36bc04dcecbf154336"
+                 "c19f0af7e0a6472905e799f1953d2a0f"
+                 "f3348ab21aa4adafd1d234441cf807c0"
+                 "3a00")},
+
+     %% %% 1 octet (with context)
+     %% {ed448, undefined,
+     %%  hexstr2bin("c4eab05d357007c632f3dbb48489924d"
+     %%             "552b08fe0c353a0d4a1f00acda2c463a"
+     %%             "fbea67c5e8d2877c5e3bc397a659949e"
+     %%             "f8021e954e0a12274e"),
+     %%  hexstr2bin("43ba28f430cdff456ae531545f7ecd0a"
+     %%             "c834a55d9358c0372bfa0c6c6798c086"
+     %%             "6aea01eb00742802b8438ea4cb82169c"
+     %%             "235160627b4c3a9480"),
+     %%  hexstr2bin("03"),
+     %%  hexstr2bin("666f6f"), % Context
+     %%  hexstr2bin("d4f8f6131770dd46f40867d6fd5d5055"
+     %%             "de43541f8c5e35abbcd001b32a89f7d2"
+     %%             "151f7647f11d8ca2ae279fb842d60721"
+     %%             "7fce6e042f6815ea000c85741de5c8da"
+     %%             "1144a6a1aba7f96de42505d7a7298524"
+     %%             "fda538fccbbb754f578c1cad10d54d0d"
+     %%             "5428407e85dcbc98a49155c13764e66c"
+     %%             "3c00")},
+
+     %% 11 octets
+     {ed448, undefined,
+      hexstr2bin("cd23d24f714274e744343237b93290f5"
+                 "11f6425f98e64459ff203e8985083ffd"
+                 "f60500553abc0e05cd02184bdb89c4cc"
+                 "d67e187951267eb328"),
+      hexstr2bin("dcea9e78f35a1bf3499a831b10b86c90"
+                 "aac01cd84b67a0109b55a36e9328b1e3"
+                 "65fce161d71ce7131a543ea4cb5f7e9f"
+                 "1d8b00696447001400"),
+      hexstr2bin("0c3e544074ec63b0265e0c"),
+      hexstr2bin("1f0a8888ce25e8d458a21130879b840a"
+                 "9089d999aaba039eaf3e3afa090a09d3"
+                 "89dba82c4ff2ae8ac5cdfb7c55e94d5d"
+                 "961a29fe0109941e00b8dbdeea6d3b05"
+                 "1068df7254c0cdc129cbe62db2dc957d"
+                 "bb47b51fd3f213fb8698f064774250a5"
+                 "028961c9bf8ffd973fe5d5c206492b14"
+                 "0e00")},
+     %% 12 octets
+     {ed448, undefined,
+      hexstr2bin("258cdd4ada32ed9c9ff54e63756ae582"
+                 "fb8fab2ac721f2c8e676a72768513d93"
+                 "9f63dddb55609133f29adf86ec9929dc"
+                 "cb52c1c5fd2ff7e21b"),
+      hexstr2bin("3ba16da0c6f2cc1f30187740756f5e79"
+                 "8d6bc5fc015d7c63cc9510ee3fd44adc"
+                 "24d8e968b6e46e6f94d19b945361726b"
+                 "d75e149ef09817f580"),
+      hexstr2bin("64a65f3cdedcdd66811e2915"),
+      hexstr2bin("7eeeab7c4e50fb799b418ee5e3197ff6"
+                 "bf15d43a14c34389b59dd1a7b1b85b4a"
+                 "e90438aca634bea45e3a2695f1270f07"
+                 "fdcdf7c62b8efeaf00b45c2c96ba457e"
+                 "b1a8bf075a3db28e5c24f6b923ed4ad7"
+                 "47c3c9e03c7079efb87cb110d3a99861"
+                 "e72003cbae6d6b8b827e4e6c143064ff"
+                 "3c00")},
+     %% 13 octets
+     {ed448, undefined,
+      hexstr2bin("7ef4e84544236752fbb56b8f31a23a10"
+                 "e42814f5f55ca037cdcc11c64c9a3b29"
+                 "49c1bb60700314611732a6c2fea98eeb"
+                 "c0266a11a93970100e"),
+      hexstr2bin("b3da079b0aa493a5772029f0467baebe"
+                 "e5a8112d9d3a22532361da294f7bb381"
+                 "5c5dc59e176b4d9f381ca0938e13c6c0"
+                 "7b174be65dfa578e80"),
+      hexstr2bin("64a65f3cdedcdd66811e2915e7"),
+      hexstr2bin("6a12066f55331b6c22acd5d5bfc5d712"
+                 "28fbda80ae8dec26bdd306743c5027cb"
+                 "4890810c162c027468675ecf645a8317"
+                 "6c0d7323a2ccde2d80efe5a1268e8aca"
+                 "1d6fbc194d3f77c44986eb4ab4177919"
+                 "ad8bec33eb47bbb5fc6e28196fd1caf5"
+                 "6b4e7e0ba5519234d047155ac727a105"
+                 "3100")},
+     %% 64 octets
+     {ed448, undefined,
+      hexstr2bin("d65df341ad13e008567688baedda8e9d"
+                 "cdc17dc024974ea5b4227b6530e339bf"
+                 "f21f99e68ca6968f3cca6dfe0fb9f4fa"
+                 "b4fa135d5542ea3f01"),
+      hexstr2bin("df9705f58edbab802c7f8363cfe5560a"
+                 "b1c6132c20a9f1dd163483a26f8ac53a"
+                 "39d6808bf4a1dfbd261b099bb03b3fb5"
+                 "0906cb28bd8a081f00"),
+      hexstr2bin("bd0f6a3747cd561bdddf4640a332461a"
+                 "4a30a12a434cd0bf40d766d9c6d458e5"
+                 "512204a30c17d1f50b5079631f64eb31"
+                 "12182da3005835461113718d1a5ef944"),
+      hexstr2bin("554bc2480860b49eab8532d2a533b7d5"
+                 "78ef473eeb58c98bb2d0e1ce488a98b1"
+                 "8dfde9b9b90775e67f47d4a1c3482058"
+                 "efc9f40d2ca033a0801b63d45b3b722e"
+                 "f552bad3b4ccb667da350192b61c508c"
+                 "f7b6b5adadc2c8d9a446ef003fb05cba"
+                 "5f30e88e36ec2703b349ca229c267083"
+                 "3900")},
+     %% 256 octets
+     {ed448, undefined,
+      hexstr2bin("2ec5fe3c17045abdb136a5e6a913e32a"
+                 "b75ae68b53d2fc149b77e504132d3756"
+                 "9b7e766ba74a19bd6162343a21c8590a"
+                 "a9cebca9014c636df5"),
+      hexstr2bin("79756f014dcfe2079f5dd9e718be4171"
+                 "e2ef2486a08f25186f6bff43a9936b9b"
+                 "fe12402b08ae65798a3d81e22e9ec80e"
+                 "7690862ef3d4ed3a00"),
+      hexstr2bin("15777532b0bdd0d1389f636c5f6b9ba7"
+                 "34c90af572877e2d272dd078aa1e567c"
+                 "fa80e12928bb542330e8409f31745041"
+                 "07ecd5efac61ae7504dabe2a602ede89"
+                 "e5cca6257a7c77e27a702b3ae39fc769"
+                 "fc54f2395ae6a1178cab4738e543072f"
+                 "c1c177fe71e92e25bf03e4ecb72f47b6"
+                 "4d0465aaea4c7fad372536c8ba516a60"
+                 "39c3c2a39f0e4d832be432dfa9a706a6"
+                 "e5c7e19f397964ca4258002f7c0541b5"
+                 "90316dbc5622b6b2a6fe7a4abffd9610"
+                 "5eca76ea7b98816af0748c10df048ce0"
+                 "12d901015a51f189f3888145c03650aa"
+                 "23ce894c3bd889e030d565071c59f409"
+                 "a9981b51878fd6fc110624dcbcde0bf7"
+                 "a69ccce38fabdf86f3bef6044819de11"),
+      hexstr2bin("c650ddbb0601c19ca11439e1640dd931"
+                 "f43c518ea5bea70d3dcde5f4191fe53f"
+                 "00cf966546b72bcc7d58be2b9badef28"
+                 "743954e3a44a23f880e8d4f1cfce2d7a"
+                 "61452d26da05896f0a50da66a239a8a1"
+                 "88b6d825b3305ad77b73fbac0836ecc6"
+                 "0987fd08527c1a8e80d5823e65cafe2a"
+                 "3d00")},
+     %% 1023 octets
+     {ed448, undefined,
+      hexstr2bin("872d093780f5d3730df7c212664b37b8"
+                 "a0f24f56810daa8382cd4fa3f77634ec"
+                 "44dc54f1c2ed9bea86fafb7632d8be19"
+                 "9ea165f5ad55dd9ce8"),
+      hexstr2bin("a81b2e8a70a5ac94ffdbcc9badfc3feb"
+                 "0801f258578bb114ad44ece1ec0e799d"
+                 "a08effb81c5d685c0c56f64eecaef8cd"
+                 "f11cc38737838cf400"),
+      hexstr2bin("6ddf802e1aae4986935f7f981ba3f035"
+                 "1d6273c0a0c22c9c0e8339168e675412"
+                 "a3debfaf435ed651558007db4384b650"
+                 "fcc07e3b586a27a4f7a00ac8a6fec2cd"
+                 "86ae4bf1570c41e6a40c931db27b2faa"
+                 "15a8cedd52cff7362c4e6e23daec0fbc"
+                 "3a79b6806e316efcc7b68119bf46bc76"
+                 "a26067a53f296dafdbdc11c77f7777e9"
+                 "72660cf4b6a9b369a6665f02e0cc9b6e"
+                 "dfad136b4fabe723d2813db3136cfde9"
+                 "b6d044322fee2947952e031b73ab5c60"
+                 "3349b307bdc27bc6cb8b8bbd7bd32321"
+                 "9b8033a581b59eadebb09b3c4f3d2277"
+                 "d4f0343624acc817804728b25ab79717"
+                 "2b4c5c21a22f9c7839d64300232eb66e"
+                 "53f31c723fa37fe387c7d3e50bdf9813"
+                 "a30e5bb12cf4cd930c40cfb4e1fc6225"
+                 "92a49588794494d56d24ea4b40c89fc0"
+                 "596cc9ebb961c8cb10adde976a5d602b"
+                 "1c3f85b9b9a001ed3c6a4d3b1437f520"
+                 "96cd1956d042a597d561a596ecd3d173"
+                 "5a8d570ea0ec27225a2c4aaff26306d1"
+                 "526c1af3ca6d9cf5a2c98f47e1c46db9"
+                 "a33234cfd4d81f2c98538a09ebe76998"
+                 "d0d8fd25997c7d255c6d66ece6fa56f1"
+                 "1144950f027795e653008f4bd7ca2dee"
+                 "85d8e90f3dc315130ce2a00375a318c7"
+                 "c3d97be2c8ce5b6db41a6254ff264fa6"
+                 "155baee3b0773c0f497c573f19bb4f42"
+                 "40281f0b1f4f7be857a4e59d416c06b4"
+                 "c50fa09e1810ddc6b1467baeac5a3668"
+                 "d11b6ecaa901440016f389f80acc4db9"
+                 "77025e7f5924388c7e340a732e554440"
+                 "e76570f8dd71b7d640b3450d1fd5f041"
+                 "0a18f9a3494f707c717b79b4bf75c984"
+                 "00b096b21653b5d217cf3565c9597456"
+                 "f70703497a078763829bc01bb1cbc8fa"
+                 "04eadc9a6e3f6699587a9e75c94e5bab"
+                 "0036e0b2e711392cff0047d0d6b05bd2"
+                 "a588bc109718954259f1d86678a579a3"
+                 "120f19cfb2963f177aeb70f2d4844826"
+                 "262e51b80271272068ef5b3856fa8535"
+                 "aa2a88b2d41f2a0e2fda7624c2850272"
+                 "ac4a2f561f8f2f7a318bfd5caf969614"
+                 "9e4ac824ad3460538fdc25421beec2cc"
+                 "6818162d06bbed0c40a387192349db67"
+                 "a118bada6cd5ab0140ee273204f628aa"
+                 "d1c135f770279a651e24d8c14d75a605"
+                 "9d76b96a6fd857def5e0b354b27ab937"
+                 "a5815d16b5fae407ff18222c6d1ed263"
+                 "be68c95f32d908bd895cd76207ae7264"
+                 "87567f9a67dad79abec316f683b17f2d"
+                 "02bf07e0ac8b5bc6162cf94697b3c27c"
+                 "d1fea49b27f23ba2901871962506520c"
+                 "392da8b6ad0d99f7013fbc06c2c17a56"
+                 "9500c8a7696481c1cd33e9b14e40b82e"
+                 "79a5f5db82571ba97bae3ad3e0479515"
+                 "bb0e2b0f3bfcd1fd33034efc6245eddd"
+                 "7ee2086ddae2600d8ca73e214e8c2b0b"
+                 "db2b047c6a464a562ed77b73d2d841c4"
+                 "b34973551257713b753632efba348169"
+                 "abc90a68f42611a40126d7cb21b58695"
+                 "568186f7e569d2ff0f9e745d0487dd2e"
+                 "b997cafc5abf9dd102e62ff66cba87"),
+      hexstr2bin("e301345a41a39a4d72fff8df69c98075"
+                 "a0cc082b802fc9b2b6bc503f926b65bd"
+                 "df7f4c8f1cb49f6396afc8a70abe6d8a"
+                 "ef0db478d4c6b2970076c6a0484fe76d"
+                 "76b3a97625d79f1ce240e7c576750d29"
+                 "5528286f719b413de9ada3e8eb78ed57"
+                 "3603ce30d8bb761785dc30dbc320869e"
+                 "1a00")}
+    ].
+
 ecdh() ->
     %% http://csrc.nist.gov/groups/STM/cavp/
     Curves = crypto:ec_curves() ++ 
diff --git a/lib/public_key/doc/src/public_key.xml b/lib/public_key/doc/src/public_key.xml
index 1b588018e4..9523a3b7c2 100644
--- a/lib/public_key/doc/src/public_key.xml
+++ b/lib/public_key/doc/src/public_key.xml
@@ -109,6 +109,13 @@
     </datatype>
 
     <datatype>
+      <name name="ed_public_key"/>
+      <desc>
+	<warning><p>This format of the EdDSA curves is temporary and may change without prior notice!</p></warning>
+      </desc>
+    </datatype>
+
+    <datatype>
       <name name="private_key"/>
       <name name="rsa_private_key"/>
       <name name="dsa_private_key"/>
@@ -118,6 +125,14 @@
     </datatype>
 
     <datatype>
+      <name name="ed_private_key"/>
+      <desc>
+	<warning><p>This format of the EdDSA curves is temporary and may change without prior notice!</p></warning>
+      </desc>
+    </datatype>
+
+
+    <datatype>
       <name name="key_params"/>
       <desc>
       </desc>
diff --git a/lib/public_key/src/pubkey_pem.erl b/lib/public_key/src/pubkey_pem.erl
index b92790554f..d7e5bc3ad8 100644
--- a/lib/public_key/src/pubkey_pem.erl
+++ b/lib/public_key/src/pubkey_pem.erl
@@ -222,7 +222,9 @@ pem_start('CertificateList') ->
 pem_start('EcpkParameters') ->
     <<"-----BEGIN EC PARAMETERS-----">>;
 pem_start('ECPrivateKey') ->
-    <<"-----BEGIN EC PRIVATE KEY-----">>.
+    <<"-----BEGIN EC PRIVATE KEY-----">>;
+pem_start({no_asn1, new_openssh}) ->  %% Temporarily in the prototype of this format
+    <<"-----BEGIN OPENSSH PRIVATE KEY-----">>.
 
 pem_end(<<"-----BEGIN CERTIFICATE-----">>) ->
     <<"-----END CERTIFICATE-----">>;
@@ -250,6 +252,8 @@ pem_end(<<"-----BEGIN EC PARAMETERS-----">>) ->
     <<"-----END EC PARAMETERS-----">>;
 pem_end(<<"-----BEGIN EC PRIVATE KEY-----">>) ->
     <<"-----END EC PRIVATE KEY-----">>;
+pem_end(<<"-----BEGIN OPENSSH PRIVATE KEY-----">>) ->
+    <<"-----END OPENSSH PRIVATE KEY-----">>;
 pem_end(_) ->
     undefined.
 
@@ -278,7 +282,10 @@ asn1_type(<<"-----BEGIN X509 CRL-----">>) ->
 asn1_type(<<"-----BEGIN EC PARAMETERS-----">>) ->
     'EcpkParameters';
 asn1_type(<<"-----BEGIN EC PRIVATE KEY-----">>) ->
-    'ECPrivateKey'.
+    'ECPrivateKey';
+asn1_type(<<"-----BEGIN OPENSSH PRIVATE KEY-----">>) ->
+    {no_asn1, new_openssh}. %% Temporarily in the prototype of this format
+
 
 pem_decrypt() ->
     <<"Proc-Type: 4,ENCRYPTED">>.
diff --git a/lib/public_key/src/pubkey_ssh.erl b/lib/public_key/src/pubkey_ssh.erl
index 02c061efc9..d0ef4abfb1 100644
--- a/lib/public_key/src/pubkey_ssh.erl
+++ b/lib/public_key/src/pubkey_ssh.erl
@@ -25,7 +25,8 @@
 
 -export([decode/2, encode/2,
 	 dh_gex_group/4, 
-	 dh_gex_group_sizes/0
+	 dh_gex_group_sizes/0,
+pad/2,         new_openssh_encode/1, new_openssh_decode/1  % For test and experiments
 	]).
 
 -define(UINT32(X), X:32/unsigned-big-integer).
@@ -67,6 +68,8 @@ decode(Bin, rfc4716_public_key) ->
     rfc4716_decode(Bin);
 decode(Bin, ssh2_pubkey) ->
     ssh2_pubkey_decode(Bin);
+decode(Bin, new_openssh) ->
+    new_openssh_decode(Bin);
 decode(Bin, Type) ->
     openssh_decode(Bin, Type).
 
@@ -177,6 +180,70 @@ join_entry([Line | Lines], Entry) ->
 rfc4716_pubkey_decode(BinKey) -> ssh2_pubkey_decode(BinKey).
 
 
+%% From https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key
+new_openssh_decode(<<"openssh-key-v1",0,
+                     ?DEC_BIN(CipherName, _L1),
+                     ?DEC_BIN(KdfName, _L2),
+                     ?DEC_BIN(KdfOptions, _L3),
+                     ?UINT32(N),      % number of keys
+                     ?DEC_BIN(PublicKey, _L4),
+                     ?DEC_BIN(Encrypted, _L5),
+                     _Rest/binary
+                   >>) ->
+    %%io:format("CipherName = ~p~nKdfName = ~p~nKdfOptions = ~p~nPublicKey = ~p~nN = ~p~nEncrypted = ~p~nRest = ~p~n", [CipherName, KdfName, KdfOptions, PublicKey, N, Encrypted, _Rest]),
+    new_openssh_decode(CipherName, KdfName, KdfOptions, PublicKey, N, Encrypted).
+
+new_openssh_decode(<<"none">>, <<"none">>, <<"">>, _PublicKey, 1,
+                   <<?UINT32(CheckInt),
+                     ?UINT32(CheckInt),
+                     ?DEC_BIN(Type, _Lt),
+                     ?DEC_BIN(PubKey, _Lpu),
+                     ?DEC_BIN(PrivPubKey, _Lpripub),
+                     ?DEC_BIN(_Comment,    _C1),
+                     _Pad/binary>>) ->
+    case {Type,PrivPubKey} of
+        {<<"ssh-ed25519">>,
+         <<PrivKey:32/binary, PubKey:32/binary>>} ->
+            {ed_pri, ed25519, PubKey, PrivKey}; 
+
+        {<<"ssh-ed448">>,
+         <<PrivKey:57/binary, PubKey/binary>>} -> % "Intelligent" guess from
+                                                % https://tools.ietf.org/html/draft-ietf-curdle-ssh-ed25519-ed448
+            {ed_pri, ed448, PubKey, PrivKey}
+    end.
+
+
+new_openssh_encode({ed_pri,_,PubKey,PrivKey}=Key) ->
+    Type = key_type(Key),
+    CheckInt = 17*256+17, %crypto:strong_rand_bytes(4),
+    Comment = <<>>,
+    PublicKey = <<?STRING(Type),?STRING(PubKey)>>,
+    CipherName = <<"none">>,
+    KdfName = <<"none">>,
+    KdfOptions = <<>>,
+    BlockSize = 8, % Crypto dependent
+    NumKeys = 1,
+    Encrypted0 = <<?UINT32(CheckInt),
+                   ?UINT32(CheckInt),
+                   ?STRING(Type),
+                   ?STRING(PubKey),
+                   ?STRING(<<PrivKey/binary,PubKey/binary>>),
+                   ?STRING(Comment)
+                >>,
+    Pad = pad(size(Encrypted0), BlockSize),
+    Encrypted = <<Encrypted0/binary, Pad/binary>>,
+    <<"openssh-key-v1",0,
+      ?STRING(CipherName),
+      ?STRING(KdfName),
+      ?STRING(KdfOptions),
+      ?UINT32(NumKeys),
+      ?STRING(PublicKey),
+      ?STRING(Encrypted)>>.
+
+pad(N, BlockSize) when N>BlockSize -> pad(N rem BlockSize, BlockSize);
+pad(N, BlockSize) -> list_to_binary(lists:seq(1,BlockSize-N)).
+
+
 openssh_decode(Bin, FileType) ->
     Lines = binary:split(Bin, <<"\n">>, [global]),
     do_openssh_decode(FileType, Lines, []).
@@ -235,6 +302,8 @@ do_openssh_decode(openssh_public_key = FileType, [Line | Lines], Acc) ->
 	    <<"ssh-rsa">> -> true;
 	    <<"ssh-dss">> -> true;
 	    <<"ecdsa-sha2-",Curve/binary>> -> is_ssh_curvename(Curve);
+            <<"ssh-ed25519">> -> true;
+            <<"ssh-ed448">> -> true;
 	    _ -> false
 	end,
 
@@ -247,7 +316,9 @@ do_openssh_decode(openssh_public_key = FileType, [Line | Lines], Acc) ->
 	    Comment = string:strip(string_decode(iolist_to_binary(Comment0)), right, $\n),
 	    do_openssh_decode(FileType, Lines,
 			      [{openssh_pubkey_decode(KeyType, Base64Enc),
-				[{comment, Comment}]} | Acc])
+				[{comment, Comment}]} | Acc]);
+        _ when KnownKeyType==false ->
+                  do_openssh_decode(FileType, Lines,  Acc)
     end.
 
 
@@ -386,6 +457,10 @@ line_end(Comment) ->
 
 key_type(#'RSAPublicKey'{})   -> <<"ssh-rsa">>;
 key_type({_, #'Dss-Parms'{}}) -> <<"ssh-dss">>;
+key_type({ed_pub,ed25519,_}) -> <<"ssh-ed25519">>;
+key_type({ed_pub,ed448,_}) -> <<"ssh-ed448">>;
+key_type({ed_pri,ed25519,_,_}) -> <<"ssh-ed25519">>;
+key_type({ed_pri,ed448,_,_}) -> <<"ssh-ed448">>;
 key_type({#'ECPoint'{}, {namedCurve,Curve}}) -> <<"ecdsa-sha2-", (public_key:oid2ssh_curvename(Curve))/binary>>.
 
 comma_list_encode([Option], [])  ->
@@ -404,7 +479,12 @@ ssh2_pubkey_encode({Y,  #'Dss-Parms'{p = P, q = Q, g = G}}) ->
     <<?STRING(<<"ssh-dss">>), ?Empint(P), ?Empint(Q), ?Empint(G), ?Empint(Y)>>;
 ssh2_pubkey_encode(Key={#'ECPoint'{point = Q}, {namedCurve,OID}}) ->
     Curve = public_key:oid2ssh_curvename(OID),
-    <<?STRING(key_type(Key)), ?Estring(Curve), ?Estring(Q)>>.
+    <<?STRING(key_type(Key)), ?Estring(Curve), ?Estring(Q)>>;
+ssh2_pubkey_encode({ed_pub, ed25519, Key}) ->
+    <<?STRING(<<"ssh-ed25519">>), ?Estring(Key)>>;
+ssh2_pubkey_encode({ed_pub, ed448, Key}) ->
+    <<?STRING(<<"ssh-ed448">>), ?Estring(Key)>>.
+
 
 
 ssh2_pubkey_decode(<<?DEC_BIN(Type,_TL), Bin/binary>>) ->
@@ -430,12 +510,23 @@ ssh2_pubkey_decode(<<"ssh-dss">>,
 ssh2_pubkey_decode(<<"ecdsa-sha2-",Id/binary>>,
                    <<?DEC_BIN(Id, _IL),
                      ?DEC_BIN(Q, _QL)>>) ->
-    {#'ECPoint'{point = Q}, {namedCurve,public_key:ssh_curvename2oid(Id)}}.
+    {#'ECPoint'{point = Q}, {namedCurve,public_key:ssh_curvename2oid(Id)}};
+
+ssh2_pubkey_decode(<<"ssh-ed25519">>,
+                   <<?DEC_BIN(Key, _L)>>) ->
+    {ed_pub, ed25519, Key};
+
+ssh2_pubkey_decode(<<"ssh-ed448">>,
+                   <<?DEC_BIN(Key, _L)>>) ->
+    {ed_pub, ed448, Key}.
+
 
 
 
 is_key_field(<<"ssh-dss">>) ->  true;
 is_key_field(<<"ssh-rsa">>) ->  true;
+is_key_field(<<"ssh-ed25519">>) -> true;
+is_key_field(<<"ssh-ed448">>) -> true;
 is_key_field(<<"ecdsa-sha2-",Id/binary>>) -> is_ssh_curvename(Id);
 is_key_field(_) -> false.
 
diff --git a/lib/public_key/src/public_key.erl b/lib/public_key/src/public_key.erl
index dca1e0766e..75d40d2e8a 100644
--- a/lib/public_key/src/public_key.erl
+++ b/lib/public_key/src/public_key.erl
@@ -68,8 +68,8 @@
 	      pki_asn1_type/0, asn1_type/0, ssh_file/0, der_encoded/0,
               key_params/0, digest_type/0]).
 
--type public_key()           ::  rsa_public_key() | dsa_public_key() | ec_public_key().
--type private_key()          ::  rsa_private_key() | dsa_private_key() | ec_private_key().
+-type public_key()           ::  rsa_public_key() | dsa_public_key() | ec_public_key() | ed_public_key() .
+-type private_key()          ::  rsa_private_key() | dsa_private_key() | ec_private_key() | ed_private_key() .
 
 -type rsa_public_key()       ::  #'RSAPublicKey'{}.
 -type rsa_private_key()      ::  #'RSAPrivateKey'{}.
@@ -79,6 +79,9 @@
 -type ecpk_parameters_api() :: ecpk_parameters() | #'ECParameters'{} | {namedCurve, Name::crypto:ec_named_curve()}.
 -type ec_public_key()        :: {#'ECPoint'{}, ecpk_parameters_api()}.
 -type ec_private_key()       :: #'ECPrivateKey'{}.
+-type ed_public_key()        :: {ed_pub, ed25519|ed448, Key::binary()}.
+-type ed_private_key()       :: {ed_pri, ed25519|ed448, Pub::binary(), Priv::binary()}.
+
 -type key_params()           :: #'DHParameter'{} | {namedCurve, oid()} | #'ECParameters'{} | 
                                 {rsa, Size::integer(), PubExp::integer()}. 
 -type der_encoded()          :: binary().
@@ -166,6 +169,8 @@ pem_entry_decode({'SubjectPublicKeyInfo', Der, _}) ->
 	    ECCParams = der_decode('EcpkParameters', Params),
             {#'ECPoint'{point = Key0}, ECCParams}
     end;
+pem_entry_decode({{no_asn1,new_openssh}, Special, not_encrypted}) ->
+    ssh_decode(Special, new_openssh);
 pem_entry_decode({Asn1Type, Der, not_encrypted}) when is_atom(Asn1Type),
 						      is_binary(Der) ->
     der_decode(Asn1Type, Der).
@@ -1070,8 +1075,9 @@ pkix_verify_hostname_match_fun(https) ->
 -spec ssh_decode(SshBin, Type) ->
                         Decoded
                             when SshBin :: binary(),
-                                 Type :: ssh2_pubkey | OtherType,
+                                 Type :: ssh2_pubkey | OtherType | InternalType,
                                  OtherType :: public_key | ssh_file(),
+                                 InternalType :: new_openssh,
                                  Decoded :: Decoded_ssh2_pubkey
                                           | Decoded_OtherType,
                                  Decoded_ssh2_pubkey :: public_key(),
@@ -1090,7 +1096,8 @@ ssh_decode(SshBin, Type) when is_binary(SshBin),
 			      Type == openssh_public_key;
 			      Type == auth_keys;
 			      Type == known_hosts;
-			      Type == ssh2_pubkey ->
+			      Type == ssh2_pubkey;
+                              Type == new_openssh ->
     pubkey_ssh:decode(SshBin, Type).
 
 %%--------------------------------------------------------------------
@@ -1233,6 +1240,8 @@ format_sign_key(#'DSAPrivateKey'{p = P, q = Q, g = G, x = X}) ->
     {dss, [P, Q, G, X]};
 format_sign_key(#'ECPrivateKey'{privateKey = PrivKey, parameters = Param}) ->
     {ecdsa, [PrivKey, ec_curve_spec(Param)]};
+format_sign_key({ed_pri, Curve, _Pub, Priv}) ->
+    {eddsa, [Priv,Curve]};
 format_sign_key(_) ->
     badarg.
 
@@ -1242,6 +1251,8 @@ format_verify_key({#'ECPoint'{point = Point}, Param}) ->
     {ecdsa, [Point, ec_curve_spec(Param)]};
 format_verify_key({Key,  #'Dss-Parms'{p = P, q = Q, g = G}}) ->
     {dss, [P, Q, G, Key]};
+format_verify_key({ed_pub, Curve, Key}) ->
+    {eddsa, [Key,Curve]};
 %% Convert private keys to public keys
 format_verify_key(#'RSAPrivateKey'{modulus = Mod, publicExponent = Exp}) ->
     format_verify_key(#'RSAPublicKey'{modulus = Mod, publicExponent = Exp});