remove skipjack and cast from the libc; ok deraadt

3 files changed, 3 insertions, 43 deletions

diff --git a/include/Makefile b/include/Makefile
index 9b095c17eb6..bc46796c7b2 100644
--- a/include/Makefile
+++ b/include/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.156 2010/10/17 08:44:15 djm Exp $
+#	$OpenBSD: Makefile,v 1.157 2010/10/28 08:34:37 mikeb Exp $
 #	$NetBSD: Makefile,v 1.59 1996/05/15 21:36:43 jtc Exp $
 
 #	@(#)Makefile	5.45.1.1 (Berkeley) 5/6/91
@@ -10,7 +10,7 @@
 .include <bsd.own.mk>
 
 # Missing: mp.h
-FILES=	a.out.h ar.h assert.h bitstring.h blf.h bm.h bsd_auth.h cast.h \
+FILES=	a.out.h ar.h assert.h bitstring.h blf.h bm.h bsd_auth.h \
 	complex.h cpio.h ctype.h curses.h db.h dbm.h des.h dirent.h disktab.h \
 	dlfcn.h elf_abi.h err.h errno.h fnmatch.h fstab.h fts.h ftw.h getopt.h \
 	glob.h grp.h ifaddrs.h inttypes.h iso646.h kvm.h langinfo.h \
@@ -18,7 +18,7 @@ FILES=	a.out.h ar.h assert.h bitstring.h blf.h bm.h bsd_auth.h cast.h \
 	md5.h memory.h mpool.h ndbm.h netdb.h netgroup.h nlist.h nl_types.h \
 	ohash.h paths.h poll.h pwd.h ranlib.h re_comp.h \
 	readpassphrase.h regex.h resolv.h rmd160.h search.h setjmp.h \
-	sgtty.h sha1.h sha2.h skipjack.h signal.h sndio.h stab.h \
+	sgtty.h sha1.h sha2.h signal.h sndio.h stab.h \
 	stdbool.h stddef.h stdio.h stdlib.h \
 	string.h strings.h struct.h sysexits.h tar.h \
 	time.h ttyent.h tzfile.h unistd.h utime.h utmp.h vis.h \
diff --git a/include/cast.h b/include/cast.h
deleted file mode 100644
index f1bf783934c..00000000000
--- a/include/cast.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*      $OpenBSD: cast.h,v 1.2 1998/07/21 22:42:01 provos Exp $       */
-/*
- *	CAST-128 in C
- *	Written by Steve Reid <sreid@sea-to-sky.net>
- *	100% Public Domain - no warranty
- *	Released 1997.10.11
- */
-
-#ifndef _CAST_H_
-#define _CAST_H_
-
-typedef struct {
-	u_int32_t xkey[32];	/* Key, after expansion */
-	int rounds;		/* Number of rounds to use, 12 or 16 */
-} cast_key;
-
-void cast_setkey(cast_key* key, u_int8_t* rawkey, int keybytes);
-void cast_encrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock);
-void cast_decrypt(cast_key* key, u_int8_t* inblock, u_int8_t* outblock);
-
-#endif /* ifndef _CAST_H_ */
-
diff --git a/include/skipjack.h b/include/skipjack.h
deleted file mode 100644
index f9489c36264..00000000000
--- a/include/skipjack.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*	$OpenBSD: skipjack.h,v 1.4 2006/03/23 15:32:28 mickey Exp $	*/
-
-/* 
- * Further optimized test implementation of SKIPJACK algorithm 
- * Mark Tillotson <markt@chaos.org.uk>, 25 June 98
- * Optimizations suit RISC (lots of registers) machine best.
- *
- * based on unoptimized implementation of
- * Panu Rissanen <bande@lut.fi> 960624
- *
- * SKIPJACK and KEA Algorithm Specifications 
- * Version 2.0 
- * 29 May 1998
-*/
-
-extern void skipjack_forwards(u_int8_t *plain, u_int8_t *cipher, u_int8_t **key);
-extern void skipjack_backwards(u_int8_t *cipher, u_int8_t *plain, u_int8_t **key);
-extern void subkey_table_gen(u_int8_t *key, u_int8_t **key_tables);