New upstream release (7.0p1).

1 files changed, 3 insertions, 8 deletions

diff --git a/myproposal.h b/myproposal.h
index 84b63bcd5..46e5b988d 100644
--- a/myproposal.h
+++ b/myproposal.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: myproposal.h,v 1.44 2015/05/27 23:51:10 dtucker Exp $ */
+/* $OpenBSD: myproposal.h,v 1.47 2015/07/10 06:21:53 markus Exp $ */
 
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
@@ -93,20 +93,15 @@
 
 #define KEX_CLIENT_KEX KEX_COMMON_KEX \
         "diffie-hellman-group-exchange-sha1," \
-        "diffie-hellman-group14-sha1," \
-        "diffie-hellman-group1-sha1"
+        "diffie-hellman-group14-sha1"
 
 #define KEX_DEFAULT_PK_ALG      \
         HOSTKEY_ECDSA_CERT_METHODS \
         "ssh-ed25519-cert-v01@openssh.com," \
         "ssh-rsa-cert-v01@openssh.com," \
-        "ssh-dss-cert-v01@openssh.com," \
-        "ssh-rsa-cert-v00@openssh.com," \
-        "ssh-dss-cert-v00@openssh.com," \
         HOSTKEY_ECDSA_METHODS \
         "ssh-ed25519," \
-        "ssh-rsa," \
-        "ssh-dss"
+        "ssh-rsa" \
 
 /* the actual algorithms */