diff options
author | markus <> | 2002-09-03 21:53:39 +0000 |
---|---|---|
committer | markus <> | 2002-09-03 21:53:39 +0000 |
commit | e4fd57152b3c9ab190f2b7a12404e78bdbbefb77 (patch) | |
tree | a8d49e1d6d3824b34dbdf22b90db265f867fa16a /src | |
parent | 807f310b065312b137e9eb85536bc668e67ee7b9 (diff) | |
download | openbsd-e4fd57152b3c9ab190f2b7a12404e78bdbbefb77.tar.gz openbsd-e4fd57152b3c9ab190f2b7a12404e78bdbbefb77.tar.bz2 openbsd-e4fd57152b3c9ab190f2b7a12404e78bdbbefb77.zip |
remove whitespace changes (keep diffs to 0.9.7-beta1 minimal)
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/des/fcrypt.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/des/read_pwd.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_init.c | 1 | ||||
-rw-r--r-- | src/lib/libcrypto/engine/eng_list.c | 2 | ||||
-rw-r--r-- | src/lib/libcrypto/hmac/hmac.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/fcrypt.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/des/read_pwd.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/engine/eng_init.c | 1 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/engine/eng_list.c | 2 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/hmac/hmac.c | 2 |
10 files changed, 8 insertions, 10 deletions
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) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | |||
95 | char *DES_fcrypt(const char *buf, const char *salt, char *ret) | 94 | char *DES_fcrypt(const char *buf, const char *salt, char *ret) |
96 | { | 95 | { |
97 | unsigned int i,j,x,y; | 96 | unsigned int i,j,x,y; |
@@ -163,3 +162,4 @@ r=(r+7)/8; | |||
163 | ret[13]='\0'; | 162 | ret[13]='\0'; |
164 | return(ret); | 163 | return(ret); |
165 | } | 164 | } |
165 | |||
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); | |||
207 | #ifdef SIGACTION | 207 | #ifdef SIGACTION |
208 | static struct sigaction savsig[NX509_SIG]; | 208 | static struct sigaction savsig[NX509_SIG]; |
209 | #else | 209 | #else |
210 | static void (*savsig[NX509_SIG])(int ); | 210 | static void (*savsig[NX509_SIG])(int ); |
211 | #endif | 211 | #endif |
212 | static jmp_buf save; | 212 | static jmp_buf save; |
213 | 213 | ||
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) | |||
155 | } | 155 | } |
156 | return to_return; | 156 | return to_return; |
157 | } | 157 | } |
158 | |||
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) | |||
348 | } | 348 | } |
349 | CRYPTO_r_lock(CRYPTO_LOCK_ENGINE); | 349 | CRYPTO_r_lock(CRYPTO_LOCK_ENGINE); |
350 | iterator = engine_list_head; | 350 | iterator = engine_list_head; |
351 | while(iterator && (strcmp(id, iterator->id) != 0)) | 351 | while(iterator && (strcmp(id, iterator->id) != 0)) |
352 | iterator = iterator->next; | 352 | iterator = iterator->next; |
353 | if(iterator) | 353 | if(iterator) |
354 | { | 354 | { |
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, | |||
72 | ctx->md=md; | 72 | ctx->md=md; |
73 | EVP_MD_CTX_init(&ctx->md_ctx); | 73 | EVP_MD_CTX_init(&ctx->md_ctx); |
74 | } | 74 | } |
75 | else | 75 | else |
76 | md=ctx->md; | 76 | md=ctx->md; |
77 | 77 | ||
78 | if (key != NULL) | 78 | 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) | |||
91 | } | 91 | } |
92 | 92 | ||
93 | 93 | ||
94 | |||
95 | char *DES_fcrypt(const char *buf, const char *salt, char *ret) | 94 | char *DES_fcrypt(const char *buf, const char *salt, char *ret) |
96 | { | 95 | { |
97 | unsigned int i,j,x,y; | 96 | unsigned int i,j,x,y; |
@@ -163,3 +162,4 @@ r=(r+7)/8; | |||
163 | ret[13]='\0'; | 162 | ret[13]='\0'; |
164 | return(ret); | 163 | return(ret); |
165 | } | 164 | } |
165 | |||
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); | |||
207 | #ifdef SIGACTION | 207 | #ifdef SIGACTION |
208 | static struct sigaction savsig[NX509_SIG]; | 208 | static struct sigaction savsig[NX509_SIG]; |
209 | #else | 209 | #else |
210 | static void (*savsig[NX509_SIG])(int ); | 210 | static void (*savsig[NX509_SIG])(int ); |
211 | #endif | 211 | #endif |
212 | static jmp_buf save; | 212 | static jmp_buf save; |
213 | 213 | ||
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) | |||
155 | } | 155 | } |
156 | return to_return; | 156 | return to_return; |
157 | } | 157 | } |
158 | |||
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) | |||
348 | } | 348 | } |
349 | CRYPTO_r_lock(CRYPTO_LOCK_ENGINE); | 349 | CRYPTO_r_lock(CRYPTO_LOCK_ENGINE); |
350 | iterator = engine_list_head; | 350 | iterator = engine_list_head; |
351 | while(iterator && (strcmp(id, iterator->id) != 0)) | 351 | while(iterator && (strcmp(id, iterator->id) != 0)) |
352 | iterator = iterator->next; | 352 | iterator = iterator->next; |
353 | if(iterator) | 353 | if(iterator) |
354 | { | 354 | { |
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, | |||
72 | ctx->md=md; | 72 | ctx->md=md; |
73 | EVP_MD_CTX_init(&ctx->md_ctx); | 73 | EVP_MD_CTX_init(&ctx->md_ctx); |
74 | } | 74 | } |
75 | else | 75 | else |
76 | md=ctx->md; | 76 | md=ctx->md; |
77 | 77 | ||
78 | if (key != NULL) | 78 | if (key != NULL) |