diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-06-13 10:56:45 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2005-06-13 10:56:45 +0000 |
| commit | 45e4003896d1b9ac473da4a5a0c8f99f2cd30a31 (patch) | |
| tree | f9db49f2a88849b16b126ff8455f6cf96be25590 /sys | |
| parent | 39a8c4e02b46f307155c3b6c458ae09cfe125466 (diff) | |
get rid of ifdef MSDOS, no binary change
ok markus@
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/crypto/des.h | 4 | ||||
| -rw-r--r-- | sys/crypto/des_locl.h | 18 | ||||
| -rw-r--r-- | sys/crypto/ecb_enc.c | 16 |
3 files changed, 4 insertions, 34 deletions
diff --git a/sys/crypto/des.h b/sys/crypto/des.h index 407a8fdddf9..a3550801618 100644 --- a/sys/crypto/des.h +++ b/sys/crypto/des.h @@ -1,4 +1,4 @@ -/* $OpenBSD: des.h,v 1.2 2002/10/27 13:24:26 miod Exp $ */ +/* $OpenBSD: des.h,v 1.3 2005/06/13 10:56:44 hshoexer Exp $ */ /* lib/des/des.h */ /* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) @@ -117,7 +117,7 @@ extern int des_rw_mode; /* defaults to DES_PCBC_MODE */ /* The next line is used to disable full ANSI prototypes, if your * compiler has problems with the prototypes, make sure this line always * evaluates to true :-) */ -#if defined(MSDOS) || defined(__STDC__) +#if defined(__STDC__) #undef PROTO #define PROTO #endif diff --git a/sys/crypto/des_locl.h b/sys/crypto/des_locl.h index d6b729170e1..44c9289973f 100644 --- a/sys/crypto/des_locl.h +++ b/sys/crypto/des_locl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: des_locl.h,v 1.2 2002/10/27 13:24:26 miod Exp $ */ +/* $OpenBSD: des_locl.h,v 1.3 2005/06/13 10:56:44 hshoexer Exp $ */ /* lib/des/des_locl.h */ /* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) @@ -161,21 +161,6 @@ *(u_int32_t *)(des_SP+0x0400+((u>>16)&0xfc))+ \ *(u_int32_t *)(des_SP+0x0600+((u>>24)&0xfc)); } #else /* original version */ -#ifdef MSDOS -#define D_ENCRYPT(L,R,S) \ - U.l=R^s[S+1]; \ - T.s[0]=((U.s[0]>>4)|(U.s[1]<<12))&0x3f3f; \ - T.s[1]=((U.s[1]>>4)|(U.s[0]<<12))&0x3f3f; \ - U.l=(R^s[S ])&0x3f3f3f3fL; \ - L^= des_SPtrans[1][(T.c[0])]| \ - des_SPtrans[3][(T.c[1])]| \ - des_SPtrans[5][(T.c[2])]| \ - des_SPtrans[7][(T.c[3])]| \ - des_SPtrans[0][(U.c[0])]| \ - des_SPtrans[2][(U.c[1])]| \ - des_SPtrans[4][(U.c[2])]| \ - des_SPtrans[6][(U.c[3])]; -#else #define D_ENCRYPT(Q,R,S) {\ u=(R^s[S ]); \ t=R^s[S+1]; \ @@ -189,7 +174,6 @@ des_SPtrans[4][(u>>16L)&0x3f]| \ des_SPtrans[6][(u>>24L)&0x3f]; } #endif -#endif /* IP and FP * The problem is more of a geometric problem that random bit fiddling. diff --git a/sys/crypto/ecb_enc.c b/sys/crypto/ecb_enc.c index 384c263c6b5..b121edc488e 100644 --- a/sys/crypto/ecb_enc.c +++ b/sys/crypto/ecb_enc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecb_enc.c,v 1.2 2002/10/27 13:24:26 miod Exp $ */ +/* $OpenBSD: ecb_enc.c,v 1.3 2005/06/13 10:56:44 hshoexer Exp $ */ /* lib/des/ecb_enc.c */ /* Copyright (C) 1995 Eric Young (eay@mincom.oz.au) @@ -81,13 +81,6 @@ int encrypt; #ifdef DES_USE_PTR register unsigned char *des_SP=(unsigned char *)des_SPtrans; #endif -#ifdef MSDOS - union fudge { - u_int32_t l; - unsigned short s[2]; - unsigned char c[4]; - } U,T; -#endif register int i; register u_int32_t *s; @@ -148,13 +141,6 @@ int encrypt; #ifdef DES_USE_PTR register unsigned char *des_SP=(unsigned char *)des_SPtrans; #endif -#ifdef MSDOS - union fudge { - u_int32_t l; - unsigned short s[2]; - unsigned char c[4]; - } U,T; -#endif register int i; register u_int32_t *s; |