From e4fd57152b3c9ab190f2b7a12404e78bdbbefb77 Mon Sep 17 00:00:00 2001 From: markus <> Date: Tue, 3 Sep 2002 21:53:39 +0000 Subject: remove whitespace changes (keep diffs to 0.9.7-beta1 minimal) --- src/lib/libcrypto/des/fcrypt.c | 2 +- src/lib/libcrypto/des/read_pwd.c | 2 +- src/lib/libcrypto/engine/eng_init.c | 1 - src/lib/libcrypto/engine/eng_list.c | 2 +- src/lib/libcrypto/hmac/hmac.c | 2 +- src/lib/libssl/src/crypto/des/fcrypt.c | 2 +- src/lib/libssl/src/crypto/des/read_pwd.c | 2 +- src/lib/libssl/src/crypto/engine/eng_init.c | 1 - src/lib/libssl/src/crypto/engine/eng_list.c | 2 +- src/lib/libssl/src/crypto/hmac/hmac.c | 2 +- 10 files changed, 8 insertions(+), 10 deletions(-) (limited to 'src/lib') diff --git a/src/lib/libcrypto/des/fcrypt.c b/src/lib/libcrypto/des/fcrypt.c index d3d27de9f7..387d97f28d 100644 --- a/src/lib/libcrypto/des/fcrypt.c +++ b/src/lib/libcrypto/des/fcrypt.c @@ -91,7 +91,6 @@ char *DES_crypt(const char *buf, const char *salt) } - char *DES_fcrypt(const char *buf, const char *salt, char *ret) { unsigned int i,j,x,y; @@ -163,3 +162,4 @@ r=(r+7)/8; ret[13]='\0'; return(ret); } + diff --git a/src/lib/libcrypto/des/read_pwd.c b/src/lib/libcrypto/des/read_pwd.c index ae9aef620b..54e0e2e6b6 100644 --- a/src/lib/libcrypto/des/read_pwd.c +++ b/src/lib/libcrypto/des/read_pwd.c @@ -207,7 +207,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty); #ifdef SIGACTION static struct sigaction savsig[NX509_SIG]; #else - static void (*savsig[NX509_SIG])(int ); + static void (*savsig[NX509_SIG])(int ); #endif static jmp_buf save; diff --git a/src/lib/libcrypto/engine/eng_init.c b/src/lib/libcrypto/engine/eng_init.c index cc9396e863..170c1791b3 100644 --- a/src/lib/libcrypto/engine/eng_init.c +++ b/src/lib/libcrypto/engine/eng_init.c @@ -155,4 +155,3 @@ int ENGINE_finish(ENGINE *e) } return to_return; } - diff --git a/src/lib/libcrypto/engine/eng_list.c b/src/lib/libcrypto/engine/eng_list.c index ce48d2255a..0c220558e7 100644 --- a/src/lib/libcrypto/engine/eng_list.c +++ b/src/lib/libcrypto/engine/eng_list.c @@ -348,7 +348,7 @@ ENGINE *ENGINE_by_id(const char *id) } CRYPTO_r_lock(CRYPTO_LOCK_ENGINE); iterator = engine_list_head; - while(iterator && (strcmp(id, iterator->id) != 0)) + while(iterator && (strcmp(id, iterator->id) != 0)) iterator = iterator->next; if(iterator) { diff --git a/src/lib/libcrypto/hmac/hmac.c b/src/lib/libcrypto/hmac/hmac.c index 026dbe8f66..46480a4c95 100644 --- a/src/lib/libcrypto/hmac/hmac.c +++ b/src/lib/libcrypto/hmac/hmac.c @@ -72,7 +72,7 @@ void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, ctx->md=md; EVP_MD_CTX_init(&ctx->md_ctx); } - else + else md=ctx->md; if (key != NULL) diff --git a/src/lib/libssl/src/crypto/des/fcrypt.c b/src/lib/libssl/src/crypto/des/fcrypt.c index d3d27de9f7..387d97f28d 100644 --- a/src/lib/libssl/src/crypto/des/fcrypt.c +++ b/src/lib/libssl/src/crypto/des/fcrypt.c @@ -91,7 +91,6 @@ char *DES_crypt(const char *buf, const char *salt) } - char *DES_fcrypt(const char *buf, const char *salt, char *ret) { unsigned int i,j,x,y; @@ -163,3 +162,4 @@ r=(r+7)/8; ret[13]='\0'; return(ret); } + diff --git a/src/lib/libssl/src/crypto/des/read_pwd.c b/src/lib/libssl/src/crypto/des/read_pwd.c index ae9aef620b..54e0e2e6b6 100644 --- a/src/lib/libssl/src/crypto/des/read_pwd.c +++ b/src/lib/libssl/src/crypto/des/read_pwd.c @@ -207,7 +207,7 @@ static int noecho_fgets(char *buf, int size, FILE *tty); #ifdef SIGACTION static struct sigaction savsig[NX509_SIG]; #else - static void (*savsig[NX509_SIG])(int ); + static void (*savsig[NX509_SIG])(int ); #endif static jmp_buf save; diff --git a/src/lib/libssl/src/crypto/engine/eng_init.c b/src/lib/libssl/src/crypto/engine/eng_init.c index cc9396e863..170c1791b3 100644 --- a/src/lib/libssl/src/crypto/engine/eng_init.c +++ b/src/lib/libssl/src/crypto/engine/eng_init.c @@ -155,4 +155,3 @@ int ENGINE_finish(ENGINE *e) } return to_return; } - diff --git a/src/lib/libssl/src/crypto/engine/eng_list.c b/src/lib/libssl/src/crypto/engine/eng_list.c index ce48d2255a..0c220558e7 100644 --- a/src/lib/libssl/src/crypto/engine/eng_list.c +++ b/src/lib/libssl/src/crypto/engine/eng_list.c @@ -348,7 +348,7 @@ ENGINE *ENGINE_by_id(const char *id) } CRYPTO_r_lock(CRYPTO_LOCK_ENGINE); iterator = engine_list_head; - while(iterator && (strcmp(id, iterator->id) != 0)) + while(iterator && (strcmp(id, iterator->id) != 0)) iterator = iterator->next; if(iterator) { diff --git a/src/lib/libssl/src/crypto/hmac/hmac.c b/src/lib/libssl/src/crypto/hmac/hmac.c index 026dbe8f66..46480a4c95 100644 --- a/src/lib/libssl/src/crypto/hmac/hmac.c +++ b/src/lib/libssl/src/crypto/hmac/hmac.c @@ -72,7 +72,7 @@ void HMAC_Init_ex(HMAC_CTX *ctx, const void *key, int len, ctx->md=md; EVP_MD_CTX_init(&ctx->md_ctx); } - else + else md=ctx->md; if (key != NULL) -- cgit v1.2.3-55-g6feb