From 93fd0fd61fee2f0499625cde8237db58ca7a35c6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Ulf=20M=C3=B6ller?= Date: Tue, 8 Jun 1999 15:52:47 +0000 Subject: [PATCH] Don't #define _, and eliminate casts. --- crypto/des/des.h | 9 ++------- crypto/des/des_enc.c | 4 ++-- crypto/evp/evp.h | 4 ++-- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/crypto/des/des.h b/crypto/des/des.h index 8d3ca11567..c2aae6595e 100644 --- a/crypto/des/des.h +++ b/crypto/des/des.h @@ -87,15 +87,11 @@ typedef /* const */ unsigned char const_des_cblock[8]; typedef struct des_ks_struct { union { - des_cblock _; + des_cblock cblock; /* make sure things are correct size on machines with * 8 byte longs */ - DES_LONG pad[2]; + DES_LONG deslong[2]; } ks; -#if defined _ -# error "_ is defined, but some strange definition the DES library cannot handle that." -#endif -#define _ ks._ int weak_key; } des_key_schedule[16]; @@ -120,7 +116,6 @@ typedef struct des_ks_struct #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \ des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(iv),(n)) -#define C_Block des_cblock #define Key_schedule des_key_schedule #ifdef KERBEROS #define ENCRYPT DES_ENCRYPT diff --git a/crypto/des/des_enc.c b/crypto/des/des_enc.c index 3a30e64e56..f47d2a02da 100644 --- a/crypto/des/des_enc.c +++ b/crypto/des/des_enc.c @@ -84,7 +84,7 @@ void des_encrypt(DES_LONG *data, des_key_schedule ks, int enc) r=ROTATE(r,29)&0xffffffffL; l=ROTATE(l,29)&0xffffffffL; - s=(DES_LONG *)ks; + s=ks->ks.deslong; /* I don't know if it is worth the effort of loop unrolling the * inner loop */ if (enc) @@ -180,7 +180,7 @@ void des_encrypt2(DES_LONG *data, des_key_schedule ks, int enc) r=ROTATE(r,29)&0xffffffffL; l=ROTATE(l,29)&0xffffffffL; - s=(DES_LONG *)ks; + s=ks->ks.deslong; /* I don't know if it is worth the effort of loop unrolling the * inner loop */ if (enc) diff --git a/crypto/evp/evp.h b/crypto/evp/evp.h index b38ea6e999..28814c8073 100644 --- a/crypto/evp/evp.h +++ b/crypto/evp/evp.h @@ -355,8 +355,8 @@ typedef struct evp_cipher_ctx_st struct { des_key_schedule ks;/* key schedule */ - C_Block inw; - C_Block outw; + des_cblock inw; + des_cblock outw; } desx_cbc; struct { -- 2.25.1