Commit 93fd0fd6 authored by Ulf Möller's avatar Ulf Möller
Browse files

Don't #define _, and eliminate casts.

parent bebf2787

crypto/des/des.h

+2 −7
Original line number Diff line number Diff line
@@ -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

crypto/des/des_enc.c

+2 −2
Original line number Diff line number Diff line
@@ -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)

crypto/evp/evp.h

+2 −2
Original line number Diff line number Diff line
@@ -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

			{