- djm@cvs.openbsd.org 2010/08/31 11:54:45

     [PROTOCOL PROTOCOL.agent PROTOCOL.certkeys auth2-jpake.c authfd.c]
     [authfile.c buffer.h dns.c kex.c kex.h key.c key.h monitor.c]
     [monitor_wrap.c myproposal.h packet.c packet.h pathnames.h readconf.c]
     [ssh-add.1 ssh-add.c ssh-agent.1 ssh-agent.c ssh-keygen.1 ssh-keygen.c]
     [ssh-keyscan.1 ssh-keyscan.c ssh-keysign.8 ssh.1 ssh.c ssh2.h]
     [ssh_config.5 sshconnect.c sshconnect2.c sshd.8 sshd.c sshd_config.5]
     [uuencode.c uuencode.h bufec.c kexecdh.c kexecdhc.c kexecdhs.c ssh-ecdsa.c]
     Implement Elliptic Curve Cryptography modes for key exchange (ECDH) and
     host/user keys (ECDSA) as specified by RFC5656. ECDH and ECDSA offer
     better performance than plain DH and DSA at the same equivalent symmetric
     key length, as well as much shorter keys.

     Only the mandatory sections of RFC5656 are implemented, specifically the
     three REQUIRED curves nistp256, nistp384 and nistp521 and only ECDH and
     ECDSA. Point compression (optional in RFC5656 is NOT implemented).

     Certificate host and user keys using the new ECDSA key types are supported.

     Note that this code has not been tested for interoperability and may be
     subject to change.

     feedback and ok markus@

1 files changed, 22 insertions, 1 deletions

diff --git a/key.h b/key.h
index 11d30eae6..2eb124364 100644
--- a/key.h
+++ b/key.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: key.h,v 1.30 2010/04/16 01:47:26 djm Exp $ */
+/* $OpenBSD: key.h,v 1.31 2010/08/31 11:54:45 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -29,14 +29,17 @@
 #include "buffer.h"
 #include <openssl/rsa.h>
 #include <openssl/dsa.h>
+#include <openssl/ec.h>
 
 typedef struct Key Key;
 enum types {
         KEY_RSA1,
         KEY_RSA,
         KEY_DSA,
+        KEY_ECDSA,
         KEY_RSA_CERT,
         KEY_DSA_CERT,
+        KEY_ECDSA_CERT,
         KEY_RSA_CERT_V00,
         KEY_DSA_CERT_V00,
         KEY_UNSPEC
@@ -73,6 +76,8 @@ struct Key {
         int      flags;
         RSA     *rsa;
         DSA     *dsa;
+        int      ecdsa_nid;     /* NID of curve */
+        EC_KEY  *ecdsa;
         struct KeyCert *cert;
 };
 
@@ -104,9 +109,18 @@ int	 key_cert_check_authority(const Key *, int, int, const char *,
             const char **);
 int      key_cert_is_legacy(Key *);
 
+int              key_ecdsa_nid_from_name(const char *);
+int              key_curve_name_to_nid(const char *);
+const char *     key_curve_nid_to_name(int);
+int              key_ecdsa_bits_to_nid(int);
+int              key_ecdsa_group_to_nid(const EC_GROUP *);
+int              key_ec_validate_public(const EC_GROUP *, const EC_POINT *);
+int              key_ec_validate_private(const EC_KEY *);
+
 Key             *key_from_blob(const u_char *, u_int);
 int              key_to_blob(const Key *, u_char **, u_int *);
 const char      *key_ssh_name(const Key *);
+const char      *key_ssh_name_plain(const Key *);
 int              key_names_valid2(const char *);
 
 int      key_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
@@ -114,7 +128,14 @@ int	 key_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
 
 int      ssh_dss_sign(const Key *, u_char **, u_int *, const u_char *, u_int);
 int      ssh_dss_verify(const Key *, const u_char *, u_int, const u_char *, u_int);
+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);
 
+#if defined(DEBUG_KEXECDH) || defined(DEBUG_PK)
+void    key_dump_ec_point(const EC_GROUP *, const EC_POINT *);
+void    key_dump_ec_key(const EC_KEY *);
+#endif
+
 #endif