The big crypt removal - make libtelnet exportable.

Securedist can be sorted out later - getting these bits exportable
is top priority.
The libtelnet with encryption has been moved to src/secure/lib.
It will either become part of libsecure, or or be made available
under another name, once the securedist strategy has been completely
worked out.
Submitted by:	Geoff Rehmet

2 files changed, 4 insertions, 28 deletions

diff --git a/lib/libtelnet/Makefile b/lib/libtelnet/Makefile
index 3578c5e5e06e..9c32ec9cdb70 100644
--- a/lib/libtelnet/Makefile
+++ b/lib/libtelnet/Makefile
@@ -1,33 +1,12 @@
 #	From: @(#)Makefile	8.2 (Berkeley) 12/15/93
-#	$Id$
+#	$Id: Makefile,v 1.2 1994/08/05 02:02:36 wollman Exp $
 
 LIB=	telnet
-SRCS=	auth.c encrypt.c genget.c getent.c misc.c
-SRCS+=	kerberos.c enc_des.c
+SRCS=	genget.c getent.c misc.c
+#SRCS+=	auth.c encrypt.c 
+#SRCS+=	kerberos.c enc_des.c
 #SRCS+=	kerberos5.c
 CFLAGS+= -DHAS_CGETENT
 
-# These are the sources that have encryption stuff in them.
-CRYPT_SRC= auth.c enc-proto.h enc_des.c encrypt.c
-CRYPT_SRC+= encrypt.h kerberos.c kerberos5.c krb4encpwd.c
-CRYPT_SRC+= misc.c spx.c Makefile
-NOCRYPT_DIR=${.CURDIR}/Nocrypt
-
 .include <bsd.lib.mk>
 
-nocrypt:
-#ifdef	ENCRYPTION
-	@for i in ${CRYPT_SRC}; do \
-	    if [ ! -d ${NOCRYPT_DIR} ]; then \
-		echo Creating subdirectory ${NOCRYPT_DIR}; \
-		mkdir ${NOCRYPT_DIR}; \
-	    fi; \
-	    echo ${NOCRYPT_DIR}/$$i; \
-	    unifdef -UENCRYPTION ${.CURDIR}/$$i | \
-		sed "s/ || defined(ENCRYPTION)//" > ${NOCRYPT_DIR}/$$i; \
-	done
-
-placeholder:
-#else	/* ENCRYPTION */
-	@echo "Encryption code already removed."
-#endif	/* ENCRYPTION */
diff --git a/lib/libtelnet/misc.c b/lib/libtelnet/misc.c
index 9565900a391e..241c88a21e2b 100644
--- a/lib/libtelnet/misc.c
+++ b/lib/libtelnet/misc.c
@@ -54,9 +54,6 @@ auth_encrypt_init(local, remote, name, server)
 #if	defined(AUTHENTICATION)
 	auth_init(name, server);
 #endif
-#ifdef	ENCRYPTION
-	encrypt_init(name, server);
-#endif	/* ENCRYPTION */
 	if (UserNameRequested) {
 		free(UserNameRequested);
 		UserNameRequested = 0;