From 67cc3a3cf8518dd2e78b340d35c15dbfd1e7e89d Mon Sep 17 00:00:00 2001
From: djm <djm@openbsd.org>
Date: Sun, 30 Apr 2017 23:10:43 +0000
Subject: unifdef WITH_SSH1 ok markus@

---
 usr.bin/ssh/ssh-keygen.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'usr.bin/ssh/ssh-keygen.c')

diff --git a/usr.bin/ssh/ssh-keygen.c b/usr.bin/ssh/ssh-keygen.c
index 09a75bbfb34..f141a703457 100644
--- a/usr.bin/ssh/ssh-keygen.c
+++ b/usr.bin/ssh/ssh-keygen.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keygen.c,v 1.300 2017/04/29 04:12:25 djm Exp $ */
+/* $OpenBSD: ssh-keygen.c,v 1.301 2017/04/30 23:10:43 djm Exp $ */
 /*
  * Author: Tatu Ylonen <ylo@cs.hut.fi>
  * Copyright (c) 1994 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -973,9 +973,6 @@ do_gen_all_hostkeys(struct passwd *pw)
 		char *path;
 	} key_types[] = {
 #ifdef WITH_OPENSSL
-#ifdef WITH_SSH1
-		{ "rsa1", "RSA1", _PATH_HOST_KEY_FILE },
-#endif /* WITH_SSH1 */
 		{ "rsa", "RSA" ,_PATH_HOST_RSA_KEY_FILE },
 		{ "dsa", "DSA", _PATH_HOST_DSA_KEY_FILE },
 		{ "ecdsa", "ECDSA",_PATH_HOST_ECDSA_KEY_FILE },
@@ -2230,11 +2227,7 @@ do_check_krl(struct passwd *pw, int argc, char **argv)
 }
 #endif
 
-#ifdef WITH_SSH1
-# define RSA1_USAGE " | rsa1"
-#else
 # define RSA1_USAGE ""
-#endif
 
 static void
 usage(void)
-- 
cgit v1.2.3-59-g8ed1b