- markus@cvs.openbsd.org 2013/12/06 13:39:49

     [authfd.c authfile.c key.c key.h myproposal.h pathnames.h readconf.c]
     [servconf.c ssh-agent.c ssh-keygen.c ssh-keyscan.1 ssh-keyscan.c]
     [ssh-keysign.c ssh.c ssh_config.5 sshd.8 sshd.c verify.c ssh-ed25519.c]
     [sc25519.h sc25519.c hash.c ge25519_base.data ge25519.h ge25519.c]
     [fe25519.h fe25519.c ed25519.c crypto_api.h blocks.c]
     support ed25519 keys (hostkeys and user identities) using the public
     domain ed25519 reference code from SUPERCOP, see
     http://ed25519.cr.yp.to/software.html
     feedback, help & ok djm@

1 files changed, 11 insertions, 2 deletions

diff --git a/key.h b/key.h
index efa711769..6a049d277 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.39 2013/12/06 13:30:08 markus Exp $ */
+/* $OpenBSD: key.h,v 1.40 2013/12/06 13:39:49 markus Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -39,9 +39,11 @@ enum types {
         KEY_RSA,
         KEY_DSA,
         KEY_ECDSA,
+        KEY_ED25519,
         KEY_RSA_CERT,
         KEY_DSA_CERT,
         KEY_ECDSA_CERT,
+        KEY_ED25519_CERT,
         KEY_RSA_CERT_V00,
         KEY_DSA_CERT_V00,
         KEY_UNSPEC
@@ -86,8 +88,13 @@ struct Key {
         void    *ecdsa;
 #endif
         struct KeyCert *cert;
+        u_char  *ed25519_sk;
+        u_char  *ed25519_pk;
 };
 
+#define ED25519_SK_SZ   crypto_sign_ed25519_SECRETKEYBYTES
+#define ED25519_PK_SZ   crypto_sign_ed25519_PUBLICKEYBYTES
+
 Key             *key_new(int);
 void             key_add_private(Key *);
 Key             *key_new_private(int);
@@ -128,7 +135,7 @@ const EVP_MD	*key_ec_nid_to_evpmd(int nid);
 int              key_ec_validate_public(const EC_GROUP *, const EC_POINT *);
 int              key_ec_validate_private(const EC_KEY *);
 #endif
-char            *key_alg_list(void);
+char            *key_alg_list(int, int);
 
 Key             *key_from_blob(const u_char *, u_int);
 int              key_to_blob(const Key *, u_char **, u_int *);
@@ -145,6 +152,8 @@ int	 ssh_ecdsa_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
 int      ssh_ecdsa_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
 int      ssh_rsa_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
 int      ssh_rsa_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
+int      ssh_ed25519_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
+int      ssh_ed25519_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
 
 #if defined(OPENSSL_HAS_ECC) && (defined(DEBUG_KEXECDH) || defined(DEBUG_PK))
 void    key_dump_ec_point(const EC_GROUP *, const EC_POINT *);