remove skey support

ok millert

3 files changed, 6 insertions, 51 deletions

diff --git a/usr.bin/telnet/Makefile b/usr.bin/telnet/Makefile
index a1a5810bd2b..feb58299a2d 100644
--- a/usr.bin/telnet/Makefile
+++ b/usr.bin/telnet/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.33 2014/07/20 05:29:39 guenther Exp $
+#	$OpenBSD: Makefile,v 1.34 2015/11/13 16:46:30 deraadt Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
 # All rights reserved.
@@ -32,7 +32,7 @@
 
 PROG=	telnet
 
-CFLAGS+=-DKLUDGELINEMODE -DSKEY
+CFLAGS+=-DKLUDGELINEMODE
 CFLAGS+= -Wall
 LDADD+=	-lcurses
 DPADD=	${LIBCURSES}
diff --git a/usr.bin/telnet/commands.c b/usr.bin/telnet/commands.c
index e2d1052f9c4..8cda8e57f70 100644
--- a/usr.bin/telnet/commands.c
+++ b/usr.bin/telnet/commands.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: commands.c,v 1.74 2015/10/26 00:33:03 jca Exp $	*/
+/*	$OpenBSD: commands.c,v 1.75 2015/11/13 16:46:30 deraadt Exp $	*/
 /*	$NetBSD: commands.c,v 1.14 1996/03/24 22:03:48 jtk Exp $	*/
 
 /*
@@ -33,6 +33,7 @@
 #include "telnet_locl.h"
 
 #include <sys/socket.h>
+#include <sys/wait.h>
 #include <netinet/in.h>
 #include <netinet/ip.h>
 #include <arpa/inet.h>
@@ -49,11 +50,6 @@
 #include <unistd.h>
 #include <limits.h>
 
-#ifdef SKEY
-#include <sys/wait.h>
-#define PATH_SKEY	"/usr/bin/skey"
-#endif
-
 char	*hostname;
 
 typedef struct {
@@ -68,33 +64,6 @@ static char saveline[256];
 static int margc;
 static char *margv[20];
 
-#ifdef SKEY
-int
-skey_calc(int argc, char **argv)
-{
-	int status;
-
-	if(argc != 3) {
-		printf("usage: %s sequence challenge\n", argv[0]);
-		return 0;
-	}
-
-	switch(fork()) {
-	case 0:
-		execv(PATH_SKEY, argv);
-		exit (1);
-	case -1:
-		err(1, "fork");
-		break;
-	default:
-		(void) wait(&status);
-		if (WIFEXITED(status))
-			return (WEXITSTATUS(status));
-		return (0);
-	}
-}
-#endif
-
 static void
 makeargv(void)
 {
@@ -2056,9 +2025,6 @@ static char
 	slchelp[] =	"change state of special charaters ('slc ?' for more)",
 	displayhelp[] =	"display operating parameters",
 	zhelp[] =	"suspend telnet",
-#ifdef SKEY
-	skeyhelp[] =	"compute response to s/key challenge",
-#endif
 	shellhelp[] =	"invoke a subshell",
 	envhelp[] =	"change environment variables ('environ ?' for more)",
 	modestring[] = "try to enter line or character mode ('mode ?' for more)";
@@ -2083,9 +2049,6 @@ static Command cmdtab[] = {
 	{ "!",		shellhelp,	shell,		0 },
 	{ "environ",	envhelp,	env_cmd,	0 },
 	{ "?",		helphelp,	help,		0 },
-#ifdef SKEY
-	{ "skey",	skeyhelp,	skey_calc,	0 },
-#endif		
 	{ 0,		0,		0,		0 }
 };
 
diff --git a/usr.bin/telnet/telnet.1 b/usr.bin/telnet/telnet.1
index fe26b95e3cd..20435b8c3f5 100644
--- a/usr.bin/telnet/telnet.1
+++ b/usr.bin/telnet/telnet.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: telnet.1,v 1.56 2015/10/25 14:12:55 jca Exp $
+.\"	$OpenBSD: telnet.1,v 1.57 2015/11/13 16:46:30 deraadt Exp $
 .\"	$NetBSD: telnet.1,v 1.5 1996/02/28 21:04:12 thorpej Exp $
 .\"
 .\" Copyright (c) 1983, 1990, 1993
@@ -30,7 +30,7 @@
 .\"
 .\"	from: @(#)telnet.1	8.4 (Berkeley) 2/3/94
 .\"
-.Dd $Mdocdate: October 25 2015 $
+.Dd $Mdocdate: November 13 2015 $
 .Dt TELNET 1
 .Os
 .Sh NAME
@@ -1018,13 +1018,6 @@ Displays the legal
 .Pq Ic unset
 commands.
 .El
-.It Ic skey Ar sequence challenge
-The
-.Ic skey
-command computes a response to the S/Key challenge.
-See
-.Xr skey 1
-for more information on the S/Key system.
 .It Ic slc Ar state
 The
 .Ic slc
@@ -1330,7 +1323,6 @@ option.
 user customized telnet startup values
 .El
 .Sh SEE ALSO
-.Xr skey 1 ,
 .Xr ssh 1 ,
 .Xr stty 1
 .Sh HISTORY