diff options
| author | Stefan Weil <weil@mail.berlios.de> | 2010-07-22 22:15:22 +0200 |
|---|---|---|
| committer | Aurelien Jarno <aurelien@aurel32.net> | 2010-07-25 16:59:40 +0200 |
| commit | 1fc3dc29305cfdadc6e57bb21516799dddf9b91e (patch) | |
| tree | efc94cd911c8c3981b69d16664d4b6bc59097328 /tests | |
| parent | 2ee9fb4801128117e979178d9f603a70eb098f51 (diff) | |
| download | focaccia-qemu-1fc3dc29305cfdadc6e57bb21516799dddf9b91e.tar.gz focaccia-qemu-1fc3dc29305cfdadc6e57bb21516799dddf9b91e.zip | |
tests: Replace u_int8_t, u_int16_t, u_int32_t, u_int64_t by standard int types
There is no need to have a second set of integral types. Replace them by the standard types from stdint.h. Signed-off-by: Stefan Weil <weil@mail.berlios.de> Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/sha1.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tests/sha1.c b/tests/sha1.c index 3a76555825..93b7c8e808 100644 --- a/tests/sha1.c +++ b/tests/sha1.c @@ -23,7 +23,7 @@ A million repetitions of "a" #include <stdio.h> #include <string.h> -#include <sys/types.h> /* for u_int*_t */ +#include <stdint.h> /* ================ sha1.h ================ */ /* @@ -33,14 +33,14 @@ By Steve Reid <steve@edmweb.com> */ typedef struct { - u_int32_t state[5]; - u_int32_t count[2]; + uint32_t state[5]; + uint32_t count[2]; unsigned char buffer[64]; } SHA1_CTX; -void SHA1Transform(u_int32_t state[5], const unsigned char buffer[64]); +void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]); void SHA1Init(SHA1_CTX* context); -void SHA1Update(SHA1_CTX* context, const unsigned char* data, u_int32_t len); +void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len); void SHA1Final(unsigned char digest[20], SHA1_CTX* context); /* ================ end of sha1.h ================ */ #include <endian.h> @@ -70,12 +70,12 @@ void SHA1Final(unsigned char digest[20], SHA1_CTX* context); /* Hash a single 512-bit block. This is the core of the algorithm. */ -void SHA1Transform(u_int32_t state[5], const unsigned char buffer[64]) +void SHA1Transform(uint32_t state[5], const unsigned char buffer[64]) { -u_int32_t a, b, c, d, e; +uint32_t a, b, c, d, e; typedef union { unsigned char c[64]; - u_int32_t l[16]; + uint32_t l[16]; } CHAR64LONG16; #ifdef SHA1HANDSOFF CHAR64LONG16 block[1]; /* use array to appear as a pointer */ @@ -145,10 +145,10 @@ void SHA1Init(SHA1_CTX* context) /* Run your data through this. */ -void SHA1Update(SHA1_CTX* context, const unsigned char* data, u_int32_t len) +void SHA1Update(SHA1_CTX* context, const unsigned char* data, uint32_t len) { -u_int32_t i; -u_int32_t j; +uint32_t i; +uint32_t j; j = context->count[0]; if ((context->count[0] += len << 3) < j) @@ -186,7 +186,7 @@ unsigned char c; for (i = 0; i < 2; i++) { - u_int32_t t = context->count[i]; + uint32_t t = context->count[i]; int j; for (j = 0; j < 4; t >>= 8, j++) |