Some cleanup.

crypto/des/Makefile.ssl

@@ -88,10 +88,10 @@ asm/dx86bsdi.o: asm/dx86unix.cpp
 asm/yx86bsdi.o: asm/yx86unix.cpp
 	$(CPP) -DBSDI asm/yx86unix.cpp | sed 's/ :/:/' | as -o asm/yx86bsdi.o
 
-asm/dx86unix.cpp:
+asm/dx86unix.cpp: asm/des-586.pl
 	(cd asm; perl des-586.pl cpp >dx86unix.cpp)
 
-asm/yx86unix.cpp:
+asm/yx86unix.cpp: asm/crypt586.pl
 	(cd asm; perl crypt586.pl cpp >yx86unix.cpp)
 
 files:

crypto/des/asm/cx86unix.cpp

-
-#define TYPE(a,b)	.type	a,b
-#define SIZE(a,b)	.size	a,b
-
-#ifdef OUT
-#define OK		1
-#define des_SPtrans	_des_SPtrans
-#define fcrypt_body	_fcrypt_body
-#define ALIGN		4
-#endif
-
-#ifdef BSDI
-#define OK		1
-#define des_SPtrans	_des_SPtrans
-#define fcrypt_body	_fcrypt_body
-#define ALIGN		4
-#undef SIZE
-#undef TYPE
-#endif
-
-#if defined(ELF) || defined(SOL)
-#define OK		1
-#define ALIGN		16
-#endif
-
-#ifndef OK
-You need to define one of
-ELF - elf systems - linux-elf, NetBSD and DG-UX
-OUT - a.out systems - linux-a.out and FreeBSD
-SOL - solaris systems, which are elf with strange comment lines
-BSDI - a.out with a very primative version of as.
-#endif
-
-#include "cx86-cpp.s" 
-

crypto/des/asm/des-586.pl

@@ -187,6 +187,8 @@ sub R_PERM_OP
 	&mov(	$tt,		$a		);
 	&xor(	$a,		$b		);
 	&and(	$a,		$mask		);
+	# This can never succeed, and besides it is difficult to see what the
+	# idea was - Ben 13 Feb 99
 	if (!$last eq $b)
 		{
 		&xor(	$b,		$a		);

crypto/des/des.c

@@ -357,7 +357,7 @@ void usage()
 "-3         : encrypt using tripple DES encryption.  This uses 2 keys",
 "             generated from the input key.  If the input key is less",
 "             than 8 characters long, this is equivelent to normal",
-"             encryption.  Default is tripple cbc, -b makes it tripple ecb.",
+"             encryption.  Default is triple cbc, -b makes it triple ecb.",
 NULL
 };
 	for (u=(char **)Usage; *u; u++)