1 files changed, 27 insertions, 112 deletions

diff --git a/myproposal.h b/myproposal.h
index 34bd10c9f..5312e6058 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.58 2019/02/23 08:20:43 djm Exp $ */
+/* $OpenBSD: myproposal.h,v 1.67 2020/01/24 00:28:57 djm Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -24,103 +24,47 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <openssl/opensslv.h>
-
-/* conditional algorithm support */
-
-#ifdef OPENSSL_HAS_ECC
-#ifdef OPENSSL_HAS_NISTP521
-# define KEX_ECDH_METHODS \
+#define KEX_SERVER_KEX  \
+        "curve25519-sha256," \
+        "curve25519-sha256@libssh.org," \
         "ecdh-sha2-nistp256," \
         "ecdh-sha2-nistp384," \
-        "ecdh-sha2-nistp521,"
-# define HOSTKEY_ECDSA_CERT_METHODS \
-        "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
-        "ecdsa-sha2-nistp384-cert-v01@openssh.com," \
-        "ecdsa-sha2-nistp521-cert-v01@openssh.com,"
-# define HOSTKEY_ECDSA_METHODS \
-        "ecdsa-sha2-nistp256," \
-        "ecdsa-sha2-nistp384," \
-        "ecdsa-sha2-nistp521,"
-#else
-# define KEX_ECDH_METHODS \
-        "ecdh-sha2-nistp256," \
-        "ecdh-sha2-nistp384,"
-# define HOSTKEY_ECDSA_CERT_METHODS \
-        "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
-        "ecdsa-sha2-nistp384-cert-v01@openssh.com,"
-# define HOSTKEY_ECDSA_METHODS \
-        "ecdsa-sha2-nistp256," \
-        "ecdsa-sha2-nistp384,"
-#endif
-#else
-# define KEX_ECDH_METHODS
-# define HOSTKEY_ECDSA_CERT_METHODS
-# define HOSTKEY_ECDSA_METHODS
-#endif
-
-#ifdef OPENSSL_HAVE_EVPGCM
-# define AESGCM_CIPHER_MODES \
-        ",aes128-gcm@openssh.com,aes256-gcm@openssh.com"
-#else
-# define AESGCM_CIPHER_MODES
-#endif
-
-#ifdef HAVE_EVP_SHA256
-# define KEX_SHA2_METHODS \
+        "ecdh-sha2-nistp521," \
         "diffie-hellman-group-exchange-sha256," \
         "diffie-hellman-group16-sha512," \
-        "diffie-hellman-group18-sha512,"
-# define KEX_SHA2_GROUP14 \
-        "diffie-hellman-group14-sha256,"
-#define SHA2_HMAC_MODES \
-        "hmac-sha2-256," \
-        "hmac-sha2-512,"
-#else
-# define KEX_SHA2_METHODS
-# define KEX_SHA2_GROUP14
-# define SHA2_HMAC_MODES
-#endif
-
-#ifdef WITH_OPENSSL
-# ifdef HAVE_EVP_SHA256
-#  define KEX_CURVE25519_METHODS \
-        "curve25519-sha256," \
-        "curve25519-sha256@libssh.org,"
-# else
-#  define KEX_CURVE25519_METHODS ""
-# endif
-#define KEX_SERVER_KEX \
-        KEX_CURVE25519_METHODS \
-        KEX_ECDH_METHODS \
-        KEX_SHA2_METHODS \
-        KEX_SHA2_GROUP14 \
-        "diffie-hellman-group14-sha1"
+        "diffie-hellman-group18-sha512," \
+        "diffie-hellman-group14-sha256"
 
 #define KEX_CLIENT_KEX KEX_SERVER_KEX
 
 #define KEX_DEFAULT_PK_ALG      \
-        HOSTKEY_ECDSA_CERT_METHODS \
+        "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
+        "ecdsa-sha2-nistp384-cert-v01@openssh.com," \
+        "ecdsa-sha2-nistp521-cert-v01@openssh.com," \
+        "sk-ecdsa-sha2-nistp256-cert-v01@openssh.com," \
         "ssh-ed25519-cert-v01@openssh.com," \
+        "sk-ssh-ed25519-cert-v01@openssh.com," \
         "rsa-sha2-512-cert-v01@openssh.com," \
         "rsa-sha2-256-cert-v01@openssh.com," \
         "ssh-rsa-cert-v01@openssh.com," \
-        HOSTKEY_ECDSA_METHODS \
+        "ecdsa-sha2-nistp256," \
+        "ecdsa-sha2-nistp384," \
+        "ecdsa-sha2-nistp521," \
+        "sk-ecdsa-sha2-nistp256@openssh.com," \
         "ssh-ed25519," \
+        "sk-ssh-ed25519@openssh.com," \
         "rsa-sha2-512," \
         "rsa-sha2-256," \
         "ssh-rsa"
 
-/* the actual algorithms */
-
-#define KEX_SERVER_ENCRYPT \
+#define KEX_SERVER_ENCRYPT \
         "chacha20-poly1305@openssh.com," \
-        "aes128-ctr,aes192-ctr,aes256-ctr" \
-        AESGCM_CIPHER_MODES
+        "aes128-ctr,aes192-ctr,aes256-ctr," \
+        "aes128-gcm@openssh.com,aes256-gcm@openssh.com"
 
 #define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
 
-#define KEX_SERVER_MAC \
+#define KEX_SERVER_MAC \
         "umac-64-etm@openssh.com," \
         "umac-128-etm@openssh.com," \
         "hmac-sha2-256-etm@openssh.com," \
@@ -136,42 +80,14 @@
 
 /* Not a KEX value, but here so all the algorithm defaults are together */
 #define SSH_ALLOWED_CA_SIGALGS  \
-        HOSTKEY_ECDSA_METHODS \
+        "ecdsa-sha2-nistp256," \
+        "ecdsa-sha2-nistp384," \
+        "ecdsa-sha2-nistp521," \
+        "sk-ecdsa-sha2-nistp256@openssh.com," \
         "ssh-ed25519," \
+        "sk-ssh-ed25519@openssh.com," \
         "rsa-sha2-512," \
-        "rsa-sha2-256," \
-        "ssh-rsa"
-
-#else /* WITH_OPENSSL */
-
-#define KEX_SERVER_KEX          \
-        "curve25519-sha256," \
-        "curve25519-sha256@libssh.org"
-#define KEX_DEFAULT_PK_ALG      \
-        "ssh-ed25519-cert-v01@openssh.com," \
-        "ssh-ed25519"
-#define KEX_SERVER_ENCRYPT \
-        "chacha20-poly1305@openssh.com," \
-        "aes128-ctr,aes192-ctr,aes256-ctr"
-#define KEX_SERVER_MAC \
-        "umac-64-etm@openssh.com," \
-        "umac-128-etm@openssh.com," \
-        "hmac-sha2-256-etm@openssh.com," \
-        "hmac-sha2-512-etm@openssh.com," \
-        "hmac-sha1-etm@openssh.com," \
-        "umac-64@openssh.com," \
-        "umac-128@openssh.com," \
-        "hmac-sha2-256," \
-        "hmac-sha2-512," \
-        "hmac-sha1"
-
-#define KEX_CLIENT_KEX KEX_SERVER_KEX
-#define KEX_CLIENT_ENCRYPT KEX_SERVER_ENCRYPT
-#define KEX_CLIENT_MAC KEX_SERVER_MAC
-
-#define SSH_ALLOWED_CA_SIGALGS  "ssh-ed25519"
-
-#endif /* WITH_OPENSSL */
+        "rsa-sha2-256"
 
 #define KEX_DEFAULT_COMP        "none,zlib@openssh.com"
 #define KEX_DEFAULT_LANG        ""
@@ -199,4 +115,3 @@
         KEX_DEFAULT_COMP, \
         KEX_DEFAULT_LANG, \
         KEX_DEFAULT_LANG
-