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>
This commit is contained in:
parent
2ee9fb4801
commit
1fc3dc2930
24
tests/sha1.c
24
tests/sha1.c
|
@ -23,7 +23,7 @@ A million repetitions of "a"
|
||||||
|
|
||||||
#include <stdio.h>
|
#include <stdio.h>
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <sys/types.h> /* for u_int*_t */
|
#include <stdint.h>
|
||||||
|
|
||||||
/* ================ sha1.h ================ */
|
/* ================ sha1.h ================ */
|
||||||
/*
|
/*
|
||||||
|
@ -33,14 +33,14 @@ By Steve Reid <steve@edmweb.com>
|
||||||
*/
|
*/
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
u_int32_t state[5];
|
uint32_t state[5];
|
||||||
u_int32_t count[2];
|
uint32_t count[2];
|
||||||
unsigned char buffer[64];
|
unsigned char buffer[64];
|
||||||
} SHA1_CTX;
|
} 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 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);
|
void SHA1Final(unsigned char digest[20], SHA1_CTX* context);
|
||||||
/* ================ end of sha1.h ================ */
|
/* ================ end of sha1.h ================ */
|
||||||
#include <endian.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. */
|
/* 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 {
|
typedef union {
|
||||||
unsigned char c[64];
|
unsigned char c[64];
|
||||||
u_int32_t l[16];
|
uint32_t l[16];
|
||||||
} CHAR64LONG16;
|
} CHAR64LONG16;
|
||||||
#ifdef SHA1HANDSOFF
|
#ifdef SHA1HANDSOFF
|
||||||
CHAR64LONG16 block[1]; /* use array to appear as a pointer */
|
CHAR64LONG16 block[1]; /* use array to appear as a pointer */
|
||||||
|
@ -145,10 +145,10 @@ void SHA1Init(SHA1_CTX* context)
|
||||||
|
|
||||||
/* Run your data through this. */
|
/* 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;
|
uint32_t i;
|
||||||
u_int32_t j;
|
uint32_t j;
|
||||||
|
|
||||||
j = context->count[0];
|
j = context->count[0];
|
||||||
if ((context->count[0] += len << 3) < j)
|
if ((context->count[0] += len << 3) < j)
|
||||||
|
@ -186,7 +186,7 @@ unsigned char c;
|
||||||
|
|
||||||
for (i = 0; i < 2; i++)
|
for (i = 0; i < 2; i++)
|
||||||
{
|
{
|
||||||
u_int32_t t = context->count[i];
|
uint32_t t = context->count[i];
|
||||||
int j;
|
int j;
|
||||||
|
|
||||||
for (j = 0; j < 4; t >>= 8, j++)
|
for (j = 0; j < 4; t >>= 8, j++)
|
||||||
|
|
Loading…
Reference in New Issue