- djm@cvs.openbsd.org 2013/04/19 01:06:50

     [authfile.c cipher.c cipher.h kex.c kex.h kexecdh.c kexecdhc.c kexecdhs.c]
     [key.c key.h mac.c mac.h packet.c ssh.1 ssh.c]
     add the ability to query supported ciphers, MACs, key type and KEX
     algorithms to ssh. Includes some refactoring of KEX and key type handling
     to be table-driven; ok markus@

1 files changed, 7 insertions, 9 deletions

diff --git a/kex.h b/kex.h
index 46731fa45..680264af2 100644
--- a/kex.h
+++ b/kex.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: kex.h,v 1.54 2013/01/08 18:49:04 markus Exp $ */
+/* $OpenBSD: kex.h,v 1.55 2013/04/19 01:06:50 djm Exp $ */
 
 /*
  * Copyright (c) 2000, 2001 Markus Friedl.  All rights reserved.
@@ -40,8 +40,9 @@
 #define KEX_DHGEX_SHA1          "diffie-hellman-group-exchange-sha1"
 #define KEX_DHGEX_SHA256        "diffie-hellman-group-exchange-sha256"
 #define KEX_RESUME              "resume@appgate.com"
-/* The following represents the family of ECDH methods */
-#define KEX_ECDH_SHA2_STEM      "ecdh-sha2-"
+#define KEX_ECDH_SHA2_NISTP256  "ecdh-sha2-nistp256"
+#define KEX_ECDH_SHA2_NISTP384  "ecdh-sha2-nistp384"
+#define KEX_ECDH_SHA2_NISTP521  "ecdh-sha2-nistp521"
 
 #define COMP_NONE       0
 #define COMP_ZLIB       1
@@ -86,7 +87,7 @@ typedef struct Newkeys Newkeys;
 
 struct Enc {
         char    *name;
-        Cipher  *cipher;
+        const Cipher *cipher;
         int     enabled;
         u_int   key_len;
         u_int   iv_len;
@@ -131,6 +132,7 @@ struct Kex {
         sig_atomic_t done;
         int     flags;
         const EVP_MD *evp_md;
+        int     ec_nid;
         char    *client_version_string;
         char    *server_version_string;
         int     (*verify_host_key)(Key *);
@@ -141,6 +143,7 @@ struct Kex {
 };
 
 int      kex_names_valid(const char *);
+char    *kex_alg_list(void);
 
 Kex     *kex_setup(char *[PROPOSAL_MAX]);
 void     kex_finish(Kex *);
@@ -170,11 +173,6 @@ void
 kex_ecdh_hash(const EVP_MD *, const EC_GROUP *, char *, char *, char *, int,
     char *, int, u_char *, int, const EC_POINT *, const EC_POINT *,
     const BIGNUM *, u_char **, u_int *);
-int     kex_ecdh_name_to_nid(const char *);
-const EVP_MD *kex_ecdh_name_to_evpmd(const char *);
-#else
-# define kex_ecdh_name_to_nid(x) (-1)
-# define kex_ecdh_name_to_evpmd(x) (NULL)
 #endif
 
 void