diff options
| -rw-r--r-- | cipher/ChangeLog | 9 | ||||
| -rw-r--r-- | cipher/bithelp.h | 2 | ||||
| -rw-r--r-- | cipher/blowfish.c | 29 | ||||
| -rw-r--r-- | cipher/cast5.c | 19 | ||||
| -rw-r--r-- | cipher/des.c | 5 | ||||
| -rw-r--r-- | cipher/elgamal.c | 22 | ||||
| -rw-r--r-- | cipher/idea-stub.c | 7 | ||||
| -rw-r--r-- | cipher/md5.c | 19 | ||||
| -rw-r--r-- | cipher/random.c | 62 | ||||
| -rw-r--r-- | cipher/rijndael.c | 25 | ||||
| -rw-r--r-- | cipher/rmd160.c | 29 | ||||
| -rw-r--r-- | cipher/rmd160test.c | 7 | ||||
| -rw-r--r-- | cipher/rndlinux.c | 16 | ||||
| -rw-r--r-- | cipher/rndunix.c | 40 | ||||
| -rw-r--r-- | cipher/rndw32.c | 9 | ||||
| -rw-r--r-- | cipher/rsa.c | 9 | ||||
| -rw-r--r-- | cipher/sha1.c | 19 | ||||
| -rw-r--r-- | cipher/sha256.c | 13 | ||||
| -rw-r--r-- | cipher/sha512.c | 12 | ||||
| -rw-r--r-- | cipher/tiger.c | 22 |
20 files changed, 179 insertions, 196 deletions
diff --git a/cipher/ChangeLog b/cipher/ChangeLog index f4fd2f301..b3b483dc6 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,12 @@ +2003-05-24 David Shaw <[email protected]> + + * bithelp.h, des.c, random.c, rndlinux.c, sha1.c, blowfish.c, + elgamal.c, rijndael.c, rndunix.c, sha256.c, cast5.c, idea-stub.c, + rmd160.c, rndw32.c, sha512.c, md5.c, rmd160test.c, rsa.c, tiger.c: + Edit all preprocessor instructions to remove whitespace before the + '#'. This is not required by C89, but there are some compilers + out there that don't like it. + 2003-05-15 David Shaw <[email protected]> * cipher.c (setup_cipher_table): #ifdef IDEA. diff --git a/cipher/bithelp.h b/cipher/bithelp.h index 188db168a..d6eae8edf 100644 --- a/cipher/bithelp.h +++ b/cipher/bithelp.h @@ -34,7 +34,7 @@ rol( u32 x, int n) return x; } #else - #define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) +#define rol(x,n) ( ((x) << (n)) | ((x) >> (32-(n))) ) #endif diff --git a/cipher/blowfish.c b/cipher/blowfish.c index 7c9f952e9..409194c52 100644 --- a/cipher/blowfish.c +++ b/cipher/blowfish.c @@ -253,27 +253,27 @@ function_F( BLOWFISH_context *bc, u32 x ) { u16 a, b, c, d; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST a = ((byte*)&x)[0]; b = ((byte*)&x)[1]; c = ((byte*)&x)[2]; d = ((byte*)&x)[3]; - #else +#else a = ((byte*)&x)[3]; b = ((byte*)&x)[2]; c = ((byte*)&x)[1]; d = ((byte*)&x)[0]; - #endif +#endif return ((bc->s0[a] + bc->s1[b]) ^ bc->s2[c] ) + bc->s3[d]; } #endif #ifdef BIG_ENDIAN_HOST - #define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]]) \ +#define F(x) ((( s0[((byte*)&x)[0]] + s1[((byte*)&x)[1]]) \ ^ s2[((byte*)&x)[2]]) + s3[((byte*)&x)[3]] ) #else - #define F(x) ((( s0[((byte*)&x)[3]] + s1[((byte*)&x)[2]]) \ +#define F(x) ((( s0[((byte*)&x)[3]] + s1[((byte*)&x)[2]]) \ ^ s2[((byte*)&x)[1]]) + s3[((byte*)&x)[0]] ) #endif #define R(l,r,i) do { l ^= p[i]; r ^= F(l); } while(0) @@ -293,7 +293,7 @@ burn_stack (int bytes) static void do_encrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) { - #if BLOWFISH_ROUNDS == 16 +#if BLOWFISH_ROUNDS == 16 u32 xl, xr, *s0, *s1, *s2, *s3, *p; xl = *ret_xl; @@ -327,7 +327,7 @@ do_encrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) *ret_xl = xr; *ret_xr = xl; - #else +#else u32 xl, xr, temp, *p; int i; @@ -351,14 +351,14 @@ do_encrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) *ret_xl = xl; *ret_xr = xr; - #endif +#endif } static void decrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) { - #if BLOWFISH_ROUNDS == 16 +#if BLOWFISH_ROUNDS == 16 u32 xl, xr, *s0, *s1, *s2, *s3, *p; xl = *ret_xl; @@ -392,7 +392,7 @@ decrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) *ret_xl = xr; *ret_xr = xl; - #else +#else u32 xl, xr, temp, *p; int i; @@ -417,7 +417,7 @@ decrypt( BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr ) *ret_xl = xl; *ret_xr = xr; - #endif +#endif } #undef F @@ -534,17 +534,17 @@ do_bf_setkey( BLOWFISH_context *c, byte *key, unsigned keylen ) } for(i=j=0; i < BLOWFISH_ROUNDS+2; i++ ) { - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST ((byte*)&data)[0] = key[j]; ((byte*)&data)[1] = key[(j+1)%keylen]; ((byte*)&data)[2] = key[(j+2)%keylen]; ((byte*)&data)[3] = key[(j+3)%keylen]; - #else +#else ((byte*)&data)[3] = key[j]; ((byte*)&data)[2] = key[(j+1)%keylen]; ((byte*)&data)[1] = key[(j+2)%keylen]; ((byte*)&data)[0] = key[(j+3)%keylen]; - #endif +#endif c->p[i] ^= data; j = (j+4) % keylen; } @@ -630,4 +630,3 @@ blowfish_get_info( int algo, size_t *keylen, return "BLOWFISH"; return NULL; } - diff --git a/cipher/cast5.c b/cipher/cast5.c index 5ecfcc646..a986f9f45 100644 --- a/cipher/cast5.c +++ b/cipher/cast5.c @@ -345,7 +345,7 @@ rol(int n, u32 x) return x; } #else - #define rol(n,x) ( ((x) << (n)) | ((x) >> (32-(n))) ) +#define rol(n,x) ( ((x) << (n)) | ((x) >> (32-(n))) ) #endif #define F1(D,m,r) ( (I = ((m) + (D))), (I=rol((r),I)), \ @@ -495,7 +495,7 @@ selftest(void) if( memcmp( buffer, plain, 8 ) ) return "2"; - #if 0 /* full maintenance test */ +#if 0 /* full maintenance test */ { int i; byte a0[16] = { 0x01,0x23,0x45,0x67,0x12,0x34,0x56,0x78, @@ -519,7 +519,7 @@ selftest(void) return "3"; } - #endif +#endif return NULL; } @@ -528,8 +528,8 @@ static void key_schedule( u32 *x, u32 *z, u32 *k ) { - #define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) - #define zi(i) ((z[(i)/4] >> (8*(3-((i)%4)))) & 0xff) +#define xi(i) ((x[(i)/4] >> (8*(3-((i)%4)))) & 0xff) +#define zi(i) ((z[(i)/4] >> (8*(3-((i)%4)))) & 0xff) z[0] = x[0] ^ s5[xi(13)]^s6[xi(15)]^s7[xi(12)]^s8[xi(14)]^s7[xi( 8)]; z[1] = x[2] ^ s5[zi( 0)]^s6[zi( 2)]^s7[zi( 1)]^s8[zi( 3)]^s8[xi(10)]; @@ -567,8 +567,8 @@ key_schedule( u32 *x, u32 *z, u32 *k ) k[14]= s5[xi(12)]^s6[xi(13)]^s7[xi( 3)]^s8[xi( 2)]^s7[xi( 8)]; k[15]= s5[xi(14)]^s6[xi(15)]^s7[xi( 1)]^s8[xi( 0)]^s8[xi(13)]; - #undef xi - #undef zi +#undef xi +#undef zi } @@ -610,8 +610,8 @@ do_cast_setkey( CAST5_context *c, byte *key, unsigned keylen ) memset(&z,0, sizeof z); memset(&k,0, sizeof k); - #undef xi - #undef zi +#undef xi +#undef zi return 0; } @@ -652,4 +652,3 @@ cast5_get_info( int algo, size_t *keylen, return "CAST5"; return NULL; } - diff --git a/cipher/des.c b/cipher/des.c index 5c0e49645..f918ae642 100644 --- a/cipher/des.c +++ b/cipher/des.c @@ -141,9 +141,9 @@ working_memcmp( const char *a, const char *b, size_t n ) /* Some defines/checks to support standalone modules */ #ifndef CIPHER_ALGO_3DES - #define CIPHER_ALGO_3DES 2 +#define CIPHER_ALGO_3DES 2 #elif CIPHER_ALGO_3DES != 2 - #error CIPHER_ALGO_3DES is defined to a wrong value. +#error CIPHER_ALGO_3DES is defined to a wrong value. #endif @@ -1022,4 +1022,3 @@ des_get_info( int algo, size_t *keylen, } return NULL; } - diff --git a/cipher/elgamal.c b/cipher/elgamal.c index b4563cd58..63f210c65 100644 --- a/cipher/elgamal.c +++ b/cipher/elgamal.c @@ -356,7 +356,7 @@ do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey ) */ mpi_powm( b, pkey->y, k, pkey->p ); mpi_mulm( b, b, input, pkey->p ); - #if 0 +#if 0 if( DBG_CIPHER ) { log_mpidump("elg encrypted y= ", pkey->y); log_mpidump("elg encrypted p= ", pkey->p); @@ -365,7 +365,7 @@ do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey ) log_mpidump("elg encrypted a= ", a); log_mpidump("elg encrypted b= ", b); } - #endif +#endif mpi_free(k); } @@ -381,7 +381,7 @@ decrypt(MPI output, MPI a, MPI b, ELG_secret_key *skey ) mpi_powm( t1, a, skey->x, skey->p ); mpi_invm( t1, t1, skey->p ); mpi_mulm( output, b, t1, skey->p ); - #if 0 +#if 0 if( DBG_CIPHER ) { log_mpidump("elg decrypted x= ", skey->x); log_mpidump("elg decrypted p= ", skey->p); @@ -389,7 +389,7 @@ decrypt(MPI output, MPI a, MPI b, ELG_secret_key *skey ) log_mpidump("elg decrypted b= ", b); log_mpidump("elg decrypted M= ", output); } - #endif +#endif mpi_free(t1); } @@ -424,7 +424,7 @@ sign(MPI a, MPI b, MPI input, ELG_secret_key *skey ) mpi_invm(inv, k, p_1 ); mpi_mulm(b, t, inv, p_1 ); - #if 0 +#if 0 if( DBG_CIPHER ) { log_mpidump("elg sign p= ", skey->p); log_mpidump("elg sign g= ", skey->g); @@ -435,7 +435,7 @@ sign(MPI a, MPI b, MPI input, ELG_secret_key *skey ) log_mpidump("elg sign a= ", a); log_mpidump("elg sign b= ", b); } - #endif +#endif mpi_free(k); mpi_free(t); mpi_free(inv); @@ -461,7 +461,7 @@ verify(MPI a, MPI b, MPI input, ELG_public_key *pkey ) t1 = mpi_alloc( mpi_get_nlimbs(a) ); t2 = mpi_alloc( mpi_get_nlimbs(a) ); - #if 0 +#if 0 /* t1 = (y^a mod p) * (a^b mod p) mod p */ mpi_powm( t1, pkey->y, a, pkey->p ); mpi_powm( t2, a, b, pkey->p ); @@ -471,7 +471,7 @@ verify(MPI a, MPI b, MPI input, ELG_public_key *pkey ) mpi_powm( t2, pkey->g, input, pkey->p ); rc = !mpi_cmp( t1, t2 ); - #elif 0 +#elif 0 /* t1 = (y^a mod p) * (a^b mod p) mod p */ base[0] = pkey->y; exp[0] = a; base[1] = a; exp[1] = b; @@ -482,7 +482,7 @@ verify(MPI a, MPI b, MPI input, ELG_public_key *pkey ) mpi_powm( t2, pkey->g, input, pkey->p ); rc = !mpi_cmp( t1, t2 ); - #else +#else /* t1 = g ^ - input * y ^ a * a ^ b mod p */ mpi_invm(t2, pkey->g, pkey->p ); base[0] = t2 ; exp[0] = input; @@ -492,7 +492,7 @@ verify(MPI a, MPI b, MPI input, ELG_public_key *pkey ) mpi_mulpowm( t1, base, exp, pkey->p ); rc = !mpi_cmp_ui( t1, 1 ); - #endif +#endif mpi_free(t1); mpi_free(t2); @@ -662,5 +662,3 @@ elg_get_info( int algo, int *npkey, int *nskey, int *nenc, int *nsig, default: *use = 0; return NULL; } } - - diff --git a/cipher/idea-stub.c b/cipher/idea-stub.c index 1f40b18d7..05581ae90 100644 --- a/cipher/idea-stub.c +++ b/cipher/idea-stub.c @@ -39,16 +39,16 @@ #include <string.h> #include <unistd.h> #ifdef HAVE_DL_DLOPEN - #include <dlfcn.h> +#include <dlfcn.h> #endif #ifdef __MINGW32__ - #include <windows.h> +#include <windows.h> #endif #include "util.h" #include "algorithms.h" #ifndef RTLD_NOW - #define RTLD_NOW 1 +#define RTLD_NOW 1 #endif @@ -193,4 +193,3 @@ idea_get_info( int algo, size_t *keylen, return rstr; return NULL; } - diff --git a/cipher/md5.c b/cipher/md5.c index 1d1f76134..631df17eb 100644 --- a/cipher/md5.c +++ b/cipher/md5.c @@ -100,7 +100,7 @@ transform( MD5_CONTEXT *ctx, byte *data ) u32 D = ctx->D; u32 *cwp = correct_words; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST { int i; byte *p2, *p1; for(i=0, p1=data, p2=(byte*)correct_words; i < 16; i++, p2 += 4 ) { @@ -110,9 +110,9 @@ transform( MD5_CONTEXT *ctx, byte *data ) p2[0] = *p1++; } } - #else +#else memcpy( correct_words, data, 64 ); - #endif +#endif #define OP(a, b, c, d, s, T) \ @@ -311,17 +311,17 @@ md5_final( MD5_CONTEXT *hd ) burn_stack (80+6*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *p++ = hd-> a ; *p++ = hd-> a >> 8; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *p++ = hd-> a ; *p++ = hd-> a >> 8; \ *p++ = hd-> a >> 16; *p++ = hd-> a >> 24; } while(0) - #else /* little endian */ - #define X(a) do { *(u32*)p = hd-> a ; p += 4; } while(0) - #endif +#else /* little endian */ +#define X(a) do { *(u32*)p = hd-> a ; p += 4; } while(0) +#endif X(A); X(B); X(C); X(D); - #undef X +#undef X } @@ -364,4 +364,3 @@ md5_get_info( int algo, size_t *contextsize, return "MD5"; } - diff --git a/cipher/random.c b/cipher/random.c index 95d30a77d..c6f748fbb 100644 --- a/cipher/random.c +++ b/cipher/random.c @@ -39,19 +39,19 @@ #include <unistd.h> #include <fcntl.h> #ifdef HAVE_GETHRTIME - #include <sys/times.h> +#include <sys/times.h> #endif #ifdef HAVE_GETTIMEOFDAY - #include <sys/times.h> +#include <sys/times.h> #endif #ifdef HAVE_TIMES - #include <sys/times.h> +#include <sys/times.h> #endif #ifdef HAVE_GETRUSAGE - #include <sys/resource.h> +#include <sys/resource.h> #endif #ifdef __MINGW32__ - #include <process.h> +#include <process.h> #endif #include "util.h" #include "rmd.h" @@ -62,16 +62,16 @@ #include "algorithms.h" #ifndef RAND_MAX /* for SunOS */ - #define RAND_MAX 32767 +#define RAND_MAX 32767 #endif #if SIZEOF_UNSIGNED_LONG == 8 - #define ADD_VALUE 0xa5a5a5a5a5a5a5a5 +#define ADD_VALUE 0xa5a5a5a5a5a5a5a5 #elif SIZEOF_UNSIGNED_LONG == 4 - #define ADD_VALUE 0xa5a5a5a5 +#define ADD_VALUE 0xa5a5a5a5 #else - #error weird size for an unsigned long +#error weird size for an unsigned long #endif #define BLOCKLEN 64 /* hash this amount of bytes */ @@ -84,7 +84,7 @@ #define POOLBLOCKS 30 #define POOLSIZE (POOLBLOCKS*DIGESTLEN) #if (POOLSIZE % SIZEOF_UNSIGNED_LONG) - #error Please make sure that poolsize is a multiple of ulong +#error Please make sure that poolsize is a multiple of ulong #endif #define POOLWORDS (POOLSIZE / SIZEOF_UNSIGNED_LONG) @@ -315,7 +315,7 @@ mix_pool(byte *pool) rmd160_init( &md ); #if DIGESTLEN != 20 - #error must have a digest length of 20 for ripe-md-160 +#error must have a digest length of 20 for ripe-md-160 #endif /* loop over the pool */ pend = pool + POOLSIZE; @@ -632,40 +632,40 @@ fast_random_poll() } /* fall back to the generic function */ - #if defined(HAVE_GETHRTIME) && !defined(HAVE_BROKEN_GETHRTIME) +#if defined(HAVE_GETHRTIME) && !defined(HAVE_BROKEN_GETHRTIME) { hrtime_t tv; /* On some Solaris and HPUX system gethrtime raises an SIGILL, but we * checked this with configure */ tv = gethrtime(); add_randomness( &tv, sizeof(tv), 1 ); } - #elif defined (HAVE_GETTIMEOFDAY) +#elif defined (HAVE_GETTIMEOFDAY) { struct timeval tv; if( gettimeofday( &tv, NULL ) ) BUG(); add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 ); add_randomness( &tv.tv_usec, sizeof(tv.tv_usec), 1 ); } - #elif defined (HAVE_CLOCK_GETTIME) +#elif defined (HAVE_CLOCK_GETTIME) { struct timespec tv; if( clock_gettime( CLOCK_REALTIME, &tv ) == -1 ) BUG(); add_randomness( &tv.tv_sec, sizeof(tv.tv_sec), 1 ); add_randomness( &tv.tv_nsec, sizeof(tv.tv_nsec), 1 ); } - #elif defined (HAVE_TIMES) +#elif defined (HAVE_TIMES) { struct tms buf; if( times( &buf ) == -1 ) BUG(); add_randomness( &buf, sizeof buf, 1 ); } - #endif - #ifdef HAVE_GETRUSAGE - #ifndef RUSAGE_SELF - #ifdef __GCC__ - #warning There is no RUSAGE_SELF on this system - #endif - #else +#endif +#ifdef HAVE_GETRUSAGE +#ifndef RUSAGE_SELF +#ifdef __GCC__ +#warning There is no RUSAGE_SELF on this system +#endif +#else { struct rusage buf; /* QNX/Neutrino does return ENOSYS - so we just ignore it and * add whatever is in buf. In a chroot environment it might not @@ -677,8 +677,8 @@ fast_random_poll() add_randomness( &buf, sizeof buf, 1 ); wipememory( &buf, sizeof buf ); } - #endif - #endif +#endif +#endif /* time and clock are available on all systems - so * we better do it just in case one of the above functions * didn't work */ @@ -727,25 +727,23 @@ gather_faked( void (*add)(const void*, size_t, int), int requester, "it run - it is in no way a strong RNG!\n\n" "DON'T USE ANY DATA GENERATED BY THIS PROGRAM!!\n\n")); initialized=1; - #ifdef HAVE_RAND +#ifdef HAVE_RAND srand(make_timestamp()*getpid()); - #else +#else srandom(make_timestamp()*getpid()); - #endif +#endif } p = buffer = m_alloc( length ); n = length; - #ifdef HAVE_RAND +#ifdef HAVE_RAND while( n-- ) *p++ = ((unsigned)(1 + (int) (256.0*rand()/(RAND_MAX+1.0)))-1); - #else +#else while( n-- ) *p++ = ((unsigned)(1 + (int) (256.0*random()/(RAND_MAX+1.0)))-1); - #endif +#endif add_randomness( buffer, length, requester ); m_free(buffer); return 0; /* okay */ } - - diff --git a/cipher/rijndael.c b/cipher/rijndael.c index a30cd5fee..c9eecbe95 100644 --- a/cipher/rijndael.c +++ b/cipher/rijndael.c @@ -1764,7 +1764,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen) for (i = 0; i < keylen; i++) { k[i >> 2][i & 3] = key[i]; } - #define W (ctx->keySched) +#define W (ctx->keySched) for (j = KC-1; j >= 0; j--) { *((u32*)tk[j]) = *((u32*)k[j]); @@ -1819,7 +1819,7 @@ do_setkey (RIJNDAEL_context *ctx, const byte *key, const unsigned keylen) } } - #undef W +#undef W return 0; } @@ -1844,7 +1844,7 @@ prepare_decryption( RIJNDAEL_context *ctx ) *((u32*)ctx->keySched2[r][2]) = *((u32*)ctx->keySched[r][2]); *((u32*)ctx->keySched2[r][3]) = *((u32*)ctx->keySched[r][3]); } - #define W (ctx->keySched2) +#define W (ctx->keySched2) for (r = 1; r < ctx->ROUNDS; r++) { w = W[r][0]; *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) @@ -1862,7 +1862,7 @@ prepare_decryption( RIJNDAEL_context *ctx ) *((u32*)w) = *((u32*)U1[w[0]]) ^ *((u32*)U2[w[1]]) ^ *((u32*)U3[w[2]]) ^ *((u32*)U4[w[3]]); } - #undef W +#undef W } @@ -1874,7 +1874,7 @@ do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a) int r; byte temp[4][4]; int ROUNDS = ctx->ROUNDS; - #define rk (ctx->keySched) +#define rk (ctx->keySched) *((u32*)temp[0]) = *((u32*)(a )) ^ *((u32*)rk[0][0]); *((u32*)temp[1]) = *((u32*)(a+ 4)) ^ *((u32*)rk[0][1]); @@ -1944,7 +1944,7 @@ do_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a) *((u32*)(b+ 4)) ^= *((u32*)rk[ROUNDS][1]); *((u32*)(b+ 8)) ^= *((u32*)rk[ROUNDS][2]); *((u32*)(b+12)) ^= *((u32*)rk[ROUNDS][3]); - #undef rk +#undef rk } static void @@ -1959,7 +1959,7 @@ rijndael_encrypt (const RIJNDAEL_context *ctx, byte *b, const byte *a) static void do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a) { - #define rk (ctx->keySched2) +#define rk (ctx->keySched2) int ROUNDS = ctx->ROUNDS; int r; byte temp[4][4]; @@ -2038,7 +2038,7 @@ do_decrypt (RIJNDAEL_context *ctx, byte *b, const byte *a) *((u32*)(b+ 4)) ^= *((u32*)rk[0][1]); *((u32*)(b+ 8)) ^= *((u32*)rk[0][2]); *((u32*)(b+12)) ^= *((u32*)rk[0][3]); - #undef rk +#undef rk } static void @@ -2223,12 +2223,3 @@ gnupgext_enum_func ( int what, int *sequence, int *class, int *vers ) return ret; } #endif - - - - - - - - - diff --git a/cipher/rmd160.c b/cipher/rmd160.c index d8e8584a3..6f4f5664c 100644 --- a/cipher/rmd160.c +++ b/cipher/rmd160.c @@ -175,7 +175,7 @@ static void transform( RMD160_CONTEXT *hd, byte *data ) { u32 a,b,c,d,e,aa,bb,cc,dd,ee,t; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST u32 x[16]; { int i; byte *p2, *p1; @@ -186,10 +186,10 @@ transform( RMD160_CONTEXT *hd, byte *data ) p2[0] = *p1++; } } - #else - #if 0 +#else +#if 0 u32 *x =(u32*)data; - #else +#else /* this version is better because it is always aligned; * The performance penalty on a 586-100 is about 6% which * is acceptable - because the data is more local it might @@ -199,8 +199,8 @@ transform( RMD160_CONTEXT *hd, byte *data ) * [measured with a 4MB data and "gpgm --print-md rmd160"] */ u32 x[16]; memcpy( x, data, 64 ); - #endif - #endif +#endif +#endif #define K0 0x00000000 @@ -454,13 +454,13 @@ rmd160_mixblock( RMD160_CONTEXT *hd, char *buffer ) { char *p = buffer; transform( hd, buffer ); - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) X(0); X(1); X(2); X(3); X(4); - #undef X +#undef X } @@ -514,18 +514,18 @@ rmd160_final( RMD160_CONTEXT *hd ) burn_stack (108+5*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *p++ = hd->h##a ; *p++ = hd->h##a >> 8; \ *p++ = hd->h##a >> 16; *p++ = hd->h##a >> 24; } while(0) - #else /* little endian */ - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) - #endif +#else /* little endian */ +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#endif X(0); X(1); X(2); X(3); X(4); - #undef X +#undef X } static byte * @@ -585,4 +585,3 @@ rmd160_get_info( int algo, size_t *contextsize, return "RIPEMD160"; } - diff --git a/cipher/rmd160test.c b/cipher/rmd160test.c index 14afb435b..49f948989 100644 --- a/cipher/rmd160test.c +++ b/cipher/rmd160test.c @@ -45,13 +45,13 @@ main(int argc, char **argv) usage(); rmdhd = rmd160_open(0); - #if 1 +#if 1 while( (n = fread( buf, 1, 100, stdin )) > 0 ) rmd160_write(rmdhd, buf, n); - #else +#else for(i=0; i < 1000000; i++ ) rmd160_putchar(rmdhd, 'a'); - #endif +#endif p = rmd160_final(rmdhd); for(i=0; i < 20; i++, p++ ) printf("%02x", *p ); @@ -60,4 +60,3 @@ main(int argc, char **argv) rmd160_close(rmdhd); return 0; } - diff --git a/cipher/rndlinux.c b/cipher/rndlinux.c index 2b28e4b6a..1284bc7ee 100644 --- a/cipher/rndlinux.c +++ b/cipher/rndlinux.c @@ -31,15 +31,15 @@ #include <sys/types.h> #include <sys/stat.h> #ifdef HAVE_GETTIMEOFDAY - #include <sys/times.h> +#include <sys/times.h> #endif #include <string.h> #include <unistd.h> #include <fcntl.h> #if 0 - #include <sys/ioctl.h> - #include <asm/types.h> - #include <linux/random.h> +#include <sys/ioctl.h> +#include <asm/types.h> +#include <linux/random.h> #endif #include "types.h" #include "util.h" @@ -114,11 +114,11 @@ rndlinux_gather_random( void (*add)(const void*, size_t, int), int requester, fd = fd_urandom; } - #if 0 - #ifdef HAVE_DEV_RANDOM_IOCTL +#if 0 +#ifdef HAVE_DEV_RANDOM_IOCTL g10_log_info("entropy count of %d is %lu\n", fd, get_entropy_count(fd) ); - #endif - #endif +#endif +#endif while( length ) { fd_set rfds; struct timeval tv; diff --git a/cipher/rndunix.c b/cipher/rndunix.c index 4c8aeaefa..7156c739c 100644 --- a/cipher/rndunix.c +++ b/cipher/rndunix.c @@ -328,9 +328,9 @@ typedef struct { pid_t waitpid(pid_t pid, int *statptr, int options) { - #ifdef HAVE_WAIT4 +#ifdef HAVE_WAIT4 return wait4(pid, statptr, options, NULL); - #else +#else /* If wait4 is also not available, try wait3 for SVR3 variants */ /* Less ideal because can't actually request a specific pid */ /* For that reason, first check to see if pid is for an */ @@ -346,7 +346,7 @@ waitpid(pid_t pid, int *statptr, int options) (tmp_pid != -1) && (tmp_pid != 0) && (pid != -1)) ; return tmp_pid; - #endif +#endif } #endif @@ -494,11 +494,11 @@ slow_poll(FILE *dbgfp, int dbgall, size_t *nbytes ) int moreSources; struct timeval tv; fd_set fds; - #if defined( __hpux ) +#if defined( __hpux ) size_t maxFD = 0; - #else +#else int maxFD = 0; - #endif /* OS-specific brokenness */ +#endif /* OS-specific brokenness */ int bufPos, i, usefulness = 0; @@ -521,9 +521,9 @@ slow_poll(FILE *dbgfp, int dbgall, size_t *nbytes ) dataSources[i].pipeFD = fileno(dataSources[i].pipe); if (dataSources[i].pipeFD > maxFD) maxFD = dataSources[i].pipeFD; - #ifdef O_NONBLOCK /* Ohhh what a hack (used for Atari) */ +#ifdef O_NONBLOCK /* Ohhh what a hack (used for Atari) */ fcntl(dataSources[i].pipeFD, F_SETFL, O_NONBLOCK); - #endif +#endif FD_SET(dataSources[i].pipeFD, &fds); dataSources[i].length = 0; @@ -550,11 +550,11 @@ slow_poll(FILE *dbgfp, int dbgall, size_t *nbytes ) tv.tv_sec = 10; tv.tv_usec = 0; - #if defined( __hpux ) && ( OS_VERSION == 9 ) +#if defined( __hpux ) && ( OS_VERSION == 9 ) if (select(maxFD + 1, (int *)&fds, NULL, NULL, &tv) == -1) - #else /* */ +#else /* */ if (select(maxFD + 1, &fds, NULL, NULL, &tv) == -1) - #endif /* __hpux */ +#endif /* __hpux */ break; /* One of the sources has data available, read it into the buffer */ @@ -684,27 +684,27 @@ start_gatherer( int pipefd ) * return an error, so the read data won't be added to the randomness * pool. There are two types of SIGC(H)LD naming, the SysV SIGCLD and * the BSD/Posix SIGCHLD, so we need to handle either possibility */ - #ifdef SIGCLD +#ifdef SIGCLD signal(SIGCLD, SIG_DFL); - #else +#else signal(SIGCHLD, SIG_DFL); - #endif +#endif fflush (stderr); /* Arrghh!! It's Stuart code!! */ /* (close all files but the ones we need) */ { int nmax, n1, i; - #ifdef _SC_OPEN_MAX +#ifdef _SC_OPEN_MAX if( (nmax=sysconf( _SC_OPEN_MAX )) < 0 ) { - #ifdef _POSIX_OPEN_MAX +#ifdef _POSIX_OPEN_MAX nmax = _POSIX_OPEN_MAX; - #else +#else nmax = 20; /* assume a reasonable value */ - #endif +#endif } - #else +#else nmax = 20; /* assume a reasonable value */ - #endif +#endif { int fd; if ((fd = open ("/dev/null", O_RDWR)) != -1) { diff --git a/cipher/rndw32.c b/cipher/rndw32.c index 4ed4f772f..5e42353aa 100644 --- a/cipher/rndw32.c +++ b/cipher/rndw32.c @@ -433,7 +433,7 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) CloseHandle (hDevice); } - #if 0 /* we don't need this in GnuPG */ +#if 0 /* we don't need this in GnuPG */ /* Wait for any async keyset driver binding to complete. You may be * wondering what this call is doing here... the reason it's necessary is * because RegQueryValueEx() will hang indefinitely if the async driver @@ -453,7 +453,7 @@ slow_gatherer_windowsNT( void (*add)(const void*, size_t, int), int requester ) * this, we have to wait until any async driver bind has completed * before we can call RegQueryValueEx() */ waitSemaphore (SEMAPHORE_DRIVERBIND); - #endif +#endif /* Get information from the system performance counters. This can take * a few seconds to do. In some environments the call to @@ -587,7 +587,7 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester * events in input queue, and milliseconds since Windows was started */ { byte buffer[20*sizeof(ulong)], *bufptr; bufptr = buffer; - #define ADD(f) do { ulong along = (ulong)(f); \ +#define ADD(f) do { ulong along = (ulong)(f); \ memcpy (bufptr, &along, sizeof (along) ); \ bufptr += sizeof (along); } while (0) ADD ( GetActiveWindow ()); @@ -611,7 +611,7 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester assert ( bufptr-buffer < sizeof (buffer) ); (*add) ( buffer, bufptr-buffer, requester ); - #undef ADD +#undef ADD } /* Get multiword system information: Current caret position, current @@ -699,5 +699,4 @@ rndw32_gather_random_fast( void (*add)(const void*, size_t, int), int requester return 0; } - #endif /*USE_RNDW32*/ diff --git a/cipher/rsa.c b/cipher/rsa.c index e438b39cf..3ae530c55 100644 --- a/cipher/rsa.c +++ b/cipher/rsa.c @@ -301,9 +301,9 @@ stronger_key_check ( RSA_secret_key *skey ) static void secret(MPI output, MPI input, RSA_secret_key *skey ) { - #if 0 +#if 0 mpi_powm( output, input, skey->d, skey->n ); - #else +#else MPI m1 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); MPI m2 = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); MPI h = mpi_alloc_secure( mpi_get_nlimbs(skey->n)+1 ); @@ -329,7 +329,7 @@ secret(MPI output, MPI input, RSA_secret_key *skey ) mpi_free ( h ); mpi_free ( m1 ); mpi_free ( m2 ); - #endif +#endif } @@ -489,6 +489,3 @@ rsa_get_info( int algo, default:*r_usage = 0; return NULL; } } - - - diff --git a/cipher/sha1.c b/cipher/sha1.c index 149c4c170..f5f223feb 100644 --- a/cipher/sha1.c +++ b/cipher/sha1.c @@ -90,9 +90,9 @@ transform( SHA1_CONTEXT *hd, byte *data ) d = hd->h3; e = hd->h4; - #ifdef BIG_ENDIAN_HOST +#ifdef BIG_ENDIAN_HOST memcpy( x, data, 64 ); - #else +#else { int i; byte *p2; for(i=0, p2=(byte*)x; i < 16; i++, p2 += 4 ) { @@ -102,7 +102,7 @@ transform( SHA1_CONTEXT *hd, byte *data ) p2[0] = *data++; } } - #endif +#endif #define K1 0x5A827999L @@ -304,19 +304,18 @@ sha1_final(SHA1_CONTEXT *hd) burn_stack (88+4*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) - #endif +#endif X(0); X(1); X(2); X(3); X(4); - #undef X - +#undef X } static byte * diff --git a/cipher/sha256.c b/cipher/sha256.c index 73f211844..b71025ecb 100644 --- a/cipher/sha256.c +++ b/cipher/sha256.c @@ -256,12 +256,12 @@ sha256_final(SHA256_CONTEXT *hd) burn_stack (328); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) - #endif +#endif X(0); X(1); X(2); @@ -270,8 +270,7 @@ sha256_final(SHA256_CONTEXT *hd) X(5); X(6); X(7); - #undef X - +#undef X } static byte * diff --git a/cipher/sha512.c b/cipher/sha512.c index 7249e922a..ed67fe45a 100644 --- a/cipher/sha512.c +++ b/cipher/sha512.c @@ -331,14 +331,14 @@ sha512_final(SHA512_CONTEXT *hd) burn_stack (768); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u64*)p = hd->h##a ; p += 8; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd->h##a >> 56; *p++ = hd->h##a >> 48; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u64*)p = hd->h##a ; p += 8; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd->h##a >> 56; *p++ = hd->h##a >> 48; \ *p++ = hd->h##a >> 40; *p++ = hd->h##a >> 32; \ *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) - #endif +#endif X(0); X(1); X(2); @@ -349,7 +349,7 @@ sha512_final(SHA512_CONTEXT *hd) We just ignore them. */ X(6); X(7); - #undef X +#undef X } static byte * diff --git a/cipher/tiger.c b/cipher/tiger.c index 66cd1049f..2a8a8351f 100644 --- a/cipher/tiger.c +++ b/cipher/tiger.c @@ -723,8 +723,8 @@ transform( TIGER_CONTEXT *hd, byte *data ) { u64 a,b,c,aa,bb,cc; u64 x[8]; - #ifdef BIG_ENDIAN_HOST - #define MKWORD(d,n) \ +#ifdef BIG_ENDIAN_HOST +#define MKWORD(d,n) \ ( ((u64)(d)[8*(n)+7]) << 56 | ((u64)(d)[8*(n)+6]) << 48 \ | ((u64)(d)[8*(n)+5]) << 40 | ((u64)(d)[8*(n)+4]) << 32 \ | ((u64)(d)[8*(n)+3]) << 24 | ((u64)(d)[8*(n)+2]) << 16 \ @@ -737,10 +737,10 @@ transform( TIGER_CONTEXT *hd, byte *data ) x[5] = MKWORD(data, 5); x[6] = MKWORD(data, 6); x[7] = MKWORD(data, 7); - #undef MKWORD - #else +#undef MKWORD +#else memcpy( &x[0], data, 64 ); - #endif +#endif /* save */ a = aa = hd->a; @@ -857,18 +857,18 @@ tiger_final( TIGER_CONTEXT *hd ) burn_stack (21*8+11*sizeof(void*)); p = hd->buf; - #ifdef BIG_ENDIAN_HOST - #define X(a) do { *(u64*)p = hd-> a ; p += 8; } while(0) - #else /* little endian */ - #define X(a) do { *p++ = hd-> a >> 56; *p++ = hd-> a >> 48; \ +#ifdef BIG_ENDIAN_HOST +#define X(a) do { *(u64*)p = hd-> a ; p += 8; } while(0) +#else /* little endian */ +#define X(a) do { *p++ = hd-> a >> 56; *p++ = hd-> a >> 48; \ *p++ = hd-> a >> 40; *p++ = hd-> a >> 32; \ *p++ = hd-> a >> 24; *p++ = hd-> a >> 16; \ *p++ = hd-> a >> 8; *p++ = hd-> a; } while(0) - #endif +#endif X(a); X(b); X(c); - #undef X +#undef X } static byte * |