diff options
| -rw-r--r-- | include/des.h | 8 | ||||
| -rw-r--r-- | lib/libdes/Makefile | 8 | ||||
| -rw-r--r-- | lib/libdes/VERSION | 4 | ||||
| -rw-r--r-- | lib/libdes/shlib_version | 2 |
4 files changed, 7 insertions, 15 deletions
diff --git a/include/des.h b/include/des.h index 2de2ede53d9..a27ff784b20 100644 --- a/include/des.h +++ b/include/des.h @@ -1,4 +1,4 @@ -/* $OpenBSD: des.h,v 1.3 1998/08/16 16:38:55 art Exp $ */ +/* $OpenBSD: des.h,v 1.4 2002/03/04 22:00:13 deraadt Exp $ */ /* crypto/des/des.h */ /* Copyright (C) 1995-1997 Eric Young (eay@mincom.oz.au) @@ -67,11 +67,7 @@ extern "C" { #include <stdio.h> -/* If this is set to 'unsigned int' on a DEC Alpha, this gives about a - * %20 speed up (longs are 8 bytes, int's are 4). */ -#ifndef DES_LONG -#define DES_LONG unsigned long -#endif +#define DES_LONG unsigned int typedef unsigned char des_cblock[8]; typedef struct des_ks_struct diff --git a/lib/libdes/Makefile b/lib/libdes/Makefile index 8c97cec3445..979aa795eeb 100644 --- a/lib/libdes/Makefile +++ b/lib/libdes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.3 1998/08/29 21:12:17 deraadt Exp $ +# $OpenBSD: Makefile,v 1.4 2002/03/04 22:00:13 deraadt Exp $ LIB= des SRCS= cbc_cksm.c cbc_enc.c cbc3_enc.c cfb_enc.c cfb64ede.c cfb64enc.c \ @@ -7,12 +7,6 @@ SRCS= cbc_cksm.c cbc_enc.c cbc3_enc.c cfb_enc.c cfb64ede.c cfb64enc.c \ qud_cksm.c rand_key.c read_pwd.c rnd_keys.c rpc_enc.c set_key.c \ str2key.c supp.c xcbc_enc.c -# If you are on a DEC Alpha, edit des.h and change the DES_LONG -# define to 'unsigned int'. I have seen this give a %20 speedup. -.if ${MACHINE} == "alpha" -CFLAGS+= -DDES_LONG=u_int -.endif - #.if ${MACHINE} == "i386" #OBJS+= asm/dx86-out.o #.else diff --git a/lib/libdes/VERSION b/lib/libdes/VERSION index bb00c3eb12a..f95aded2bf1 100644 --- a/lib/libdes/VERSION +++ b/lib/libdes/VERSION @@ -55,7 +55,9 @@ Version 3.24 20/04/96 Version 3.23 11/04/96 Added DES_LONG. If defined to 'unsigned int' on the DEC Alpha, - it gives a %20 speedup :-) + it gives a %20 speedup :-) [Theo adds: Yeah, real clever, and + if you do NOT add it on 64 bit architectures, the code crashes. + Very very clever.] Fixed the problem with des.pl under perl5. The patches were sent by Ed Kubaitis (ejk@uiuc.edu). if fcrypt.c, changed values to handle illegal salt values the way diff --git a/lib/libdes/shlib_version b/lib/libdes/shlib_version index 9c1551636c5..5b844bbf422 100644 --- a/lib/libdes/shlib_version +++ b/lib/libdes/shlib_version @@ -1,2 +1,2 @@ -major=6 +major=7 minor=0 |