generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't #define _, and eliminate casts.

Browse Source
This commit is contained in:
Ulf Möller 1999-06-08 15:52:47 +00:00
parent bebf2787ea
commit 93fd0fd61f
3 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
crypto/des/des.h
View File

@ -87,15 +87,11 @@ typedef /* const */ unsigned char const_des_cblock[8];
typedef struct des_ks_struct typedef struct des_ks_struct
{ {
union { union {
des_cblock _; des_cblock cblock;
/* make sure things are correct size on machines with /* make sure things are correct size on machines with
* 8 byte longs */ * 8 byte longs */
DES_LONG pad[2]; DES_LONG deslong[2];
} ks; } ks;
#if defined _
# error "_ is defined, but some strange definition the DES library cannot handle that."
#endif
#define _ ks._
int weak_key; int weak_key;
} des_key_schedule[16]; } 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) \ #define des_ede2_ofb64_encrypt(i,o,l,k1,k2,iv,n) \
des_ede3_ofb64_encrypt((i),(o),(l),(k1),(k2),(k1),(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 #define Key_schedule des_key_schedule
#ifdef KERBEROS #ifdef KERBEROS
#define ENCRYPT DES_ENCRYPT #define ENCRYPT DES_ENCRYPT

4
crypto/des/des_enc.c
View File

@ -84,7 +84,7 @@ void des_encrypt(DES_LONG *data, des_key_schedule ks, int enc)
r=ROTATE(r,29)&0xffffffffL; r=ROTATE(r,29)&0xffffffffL;
l=ROTATE(l,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 /* I don't know if it is worth the effort of loop unrolling the
* inner loop */ * inner loop */
if (enc) if (enc)
@ -180,7 +180,7 @@ void des_encrypt2(DES_LONG *data, des_key_schedule ks, int enc)
r=ROTATE(r,29)&0xffffffffL; r=ROTATE(r,29)&0xffffffffL;
l=ROTATE(l,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 /* I don't know if it is worth the effort of loop unrolling the
* inner loop */ * inner loop */
if (enc) if (enc)

4
crypto/evp/evp.h
View File

@ -355,8 +355,8 @@ typedef struct evp_cipher_ctx_st
struct struct
{ {
des_key_schedule ks;/* key schedule */ des_key_schedule ks;/* key schedule */
C_Block inw; des_cblock inw;
C_Block outw; des_cblock outw;
} desx_cbc; } desx_cbc;
struct struct
{ {