Skip to content

Commit 7a4cc54

Browse files
tglsfdctglsfdc
committed
Eliminate some of the more blatant platform-dependencies ... it builds here now, anyway ...
1 parent 2bf2ee7 commit 7a4cc54

File tree

4 files changed

+50
-50
lines changed

4 files changed

+50
-50
lines changed

‎contrib/pgcrypto/md5.c

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $KAME: md5.c,v 1.3 2000/02/22 14:01:17 itojun Exp $ */
1+
/* $Id: md5.c,v 1.2 2000/12/04 01:20:38 tgl Exp $ */
22

33
/*
44
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -91,7 +91,7 @@
9191
#define MD5_D0 0x10325476
9292

9393
/* Integer part of 4294967296 times abs(sin(i)), where i is in radians. */
94-
static const u_int32_t T[65] = {
94+
static const uint32_t T[65] = {
9595
0,
9696
0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,
9797
0xf57c0faf, 0x4787c62a, 0xa8304613, 0xfd469501,
@@ -114,7 +114,7 @@ static const u_int32_t T[65] = {
114114
0xf7537e82, 0xbd3af235, 0x2ad7d2bb, 0xeb86d391,
115115
};
116116

117-
static const u_int8_t md5_paddat[MD5_BUFLEN] = {
117+
static const uint8_t md5_paddat[MD5_BUFLEN] = {
118118
0x80, 0, 0, 0, 0, 0, 0, 0,
119119
0, 0, 0, 0, 0, 0, 0, 0,
120120
0, 0, 0, 0, 0, 0, 0, 0,
@@ -125,7 +125,7 @@ static const u_int8_t md5_paddat[MD5_BUFLEN] = {
125125
0, 0, 0, 0, 0, 0, 0, 0,
126126
};
127127

128-
static void md5_calc __P((u_int8_t *, md5_ctxt *));
128+
static void md5_calc (uint8_t *, md5_ctxt *);
129129

130130
void md5_init(ctxt)
131131
md5_ctxt *ctxt;
@@ -141,10 +141,10 @@ void md5_init(ctxt)
141141

142142
void md5_loop(ctxt, input, len)
143143
md5_ctxt *ctxt;
144-
u_int8_t *input;
145-
u_int len; /* number of bytes */
144+
uint8_t *input;
145+
unsigned int len; /* number of bytes */
146146
{
147-
u_int gap, i;
147+
unsigned int gap, i;
148148

149149
ctxt->md5_n += len * 8; /* byte to bit */
150150
gap = MD5_BUFLEN - ctxt->md5_i;
@@ -155,7 +155,7 @@ void md5_loop(ctxt, input, len)
155155
md5_calc(ctxt->md5_buf, ctxt);
156156

157157
for (i = gap; i + MD5_BUFLEN <= len; i += MD5_BUFLEN) {
158-
md5_calc((u_int8_t *)(input + i), ctxt);
158+
md5_calc((uint8_t *)(input + i), ctxt);
159159
}
160160

161161
ctxt->md5_i = len - i;
@@ -170,7 +170,7 @@ void md5_loop(ctxt, input, len)
170170
void md5_pad(ctxt)
171171
md5_ctxt *ctxt;
172172
{
173-
u_int gap;
173+
unsigned int gap;
174174

175175
/* Don't count up padding. Keep md5_n. */
176176
gap = MD5_BUFLEN - ctxt->md5_i;
@@ -207,7 +207,7 @@ void md5_pad(ctxt)
207207
}
208208

209209
void md5_result(digest, ctxt)
210-
u_int8_t *digest;
210+
uint8_t *digest;
211211
md5_ctxt *ctxt;
212212
{
213213
/* 4 byte words */
@@ -227,24 +227,24 @@ void md5_result(digest, ctxt)
227227
}
228228

229229
#if BYTE_ORDER == BIG_ENDIAN
230-
u_int32_t X[16];
230+
uint32_t X[16];
231231
#endif
232232

233233
static void md5_calc(b64, ctxt)
234-
u_int8_t *b64;
234+
uint8_t *b64;
235235
md5_ctxt *ctxt;
236236
{
237-
u_int32_t A = ctxt->md5_sta;
238-
u_int32_t B = ctxt->md5_stb;
239-
u_int32_t C = ctxt->md5_stc;
240-
u_int32_t D = ctxt->md5_std;
237+
uint32_t A = ctxt->md5_sta;
238+
uint32_t B = ctxt->md5_stb;
239+
uint32_t C = ctxt->md5_stc;
240+
uint32_t D = ctxt->md5_std;
241241
#if BYTE_ORDER == LITTLE_ENDIAN
242-
u_int32_t *X = (u_int32_t *)b64;
242+
uint32_t *X = (uint32_t *)b64;
243243
#endif
244244
#if BYTE_ORDER == BIG_ENDIAN
245245
/* 4 byte words */
246246
/* what a brute force but fast! */
247-
u_int8_t *y = (u_int8_t *)X;
247+
uint8_t *y = (uint8_t *)X;
248248
y[ 0] = b64[ 3]; y[ 1] = b64[ 2]; y[ 2] = b64[ 1]; y[ 3] = b64[ 0];
249249
y[ 4] = b64[ 7]; y[ 5] = b64[ 6]; y[ 6] = b64[ 5]; y[ 7] = b64[ 4];
250250
y[ 8] = b64[11]; y[ 9] = b64[10]; y[10] = b64[ 9]; y[11] = b64[ 8];

‎contrib/pgcrypto/md5.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $KAME: md5.h,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
1+
/* $Id: md5.h,v 1.2 2000/12/04 01:20:38 tgl Exp $ */
22

33
/*
44
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -36,8 +36,8 @@
3636

3737
typedef struct {
3838
union {
39-
u_int32_t md5_state32[4];
40-
u_int8_t md5_state8[16];
39+
uint32_t md5_state32[4];
40+
uint8_t md5_state8[16];
4141
} md5_st;
4242

4343
#define md5_sta md5_st.md5_state32[0]
@@ -47,20 +47,20 @@ typedef struct {
4747
#define md5_st8 md5_st.md5_state8
4848

4949
union {
50-
u_int64_t md5_count64;
51-
u_int8_t md5_count8[8];
50+
uint64_t md5_count64;
51+
uint8_t md5_count8[8];
5252
} md5_count;
5353
#define md5_n md5_count.md5_count64
5454
#define md5_n8 md5_count.md5_count8
5555

56-
u_int md5_i;
57-
u_int8_t md5_buf[MD5_BUFLEN];
56+
unsigned int md5_i;
57+
uint8_t md5_buf[MD5_BUFLEN];
5858
} md5_ctxt;
5959

60-
extern void md5_init __P((md5_ctxt *));
61-
extern void md5_loop __P((md5_ctxt *, u_int8_t *, u_int));
62-
extern void md5_pad __P((md5_ctxt *));
63-
extern void md5_result __P((u_int8_t *, md5_ctxt *));
60+
extern void md5_init (md5_ctxt *);
61+
extern void md5_loop (md5_ctxt *, uint8_t *, unsigned int);
62+
extern void md5_pad (md5_ctxt *);
63+
extern void md5_result (uint8_t *, md5_ctxt *);
6464

6565
/* compatibility */
6666
#define MD5_CTX md5_ctxt

‎contrib/pgcrypto/sha1.c

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
1+
/* $Id: sha1.c,v 1.2 2000/12/04 01:20:38 tgl Exp $ */
22

33
/*
44
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -49,7 +49,7 @@
4949
#ifndef unsupported
5050

5151
/* constant table */
52-
static u_int32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
52+
static uint32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
5353
#define K(t) _K[(t) / 20]
5454

5555
#define F0(b, c, d) (((b) & (c)) | ((~(b)) & (d)))
@@ -81,15 +81,15 @@ static u_int32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
8181
sha1_step(ctxt); \
8282
}
8383

84-
static void sha1_step __P((struct sha1_ctxt *));
84+
static void sha1_step (struct sha1_ctxt *);
8585

8686
static void
8787
sha1_step(ctxt)
8888
struct sha1_ctxt *ctxt;
8989
{
90-
u_int32_t a, b, c, d, e;
90+
uint32_t a, b, c, d, e;
9191
size_t t, s;
92-
u_int32_t tmp;
92+
uint32_t tmp;
9393

9494
#if BYTE_ORDER == LITTLE_ENDIAN
9595
struct sha1_ctxt tctxt;
@@ -221,13 +221,13 @@ sha1_loop(ctxt, input0, len)
221221
const caddr_t input0;
222222
size_t len;
223223
{
224-
const u_int8_t *input;
224+
const uint8_t *input;
225225
size_t gaplen;
226226
size_t gapstart;
227227
size_t off;
228228
size_t copysiz;
229229

230-
input = (const u_int8_t *)input0;
230+
input = (const uint8_t *)input0;
231231
off = 0;
232232

233233
while (off < len) {
@@ -250,9 +250,9 @@ sha1_result(ctxt, digest0)
250250
struct sha1_ctxt *ctxt;
251251
caddr_t digest0;
252252
{
253-
u_int8_t *digest;
253+
uint8_t *digest;
254254

255-
digest = (u_int8_t *)digest0;
255+
digest = (uint8_t *)digest0;
256256
sha1_pad(ctxt);
257257
#if BYTE_ORDER == BIG_ENDIAN
258258
bcopy(&ctxt->h.b8[0], digest, 20);

‎contrib/pgcrypto/sha1.h

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $KAME: sha1.h,v 1.4 2000/02/22 14:01:18 itojun Exp $ */
1+
/* $Id: sha1.h,v 1.2 2000/12/04 01:20:38 tgl Exp $ */
22

33
/*
44
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -39,24 +39,24 @@
3939

4040
struct sha1_ctxt {
4141
union {
42-
u_int8_t b8[20];
43-
u_int32_t b32[5];
42+
uint8_t b8[20];
43+
uint32_t b32[5];
4444
} h;
4545
union {
46-
u_int8_t b8[8];
47-
u_int64_t b64[1];
46+
uint8_t b8[8];
47+
uint64_t b64[1];
4848
} c;
4949
union {
50-
u_int8_t b8[64];
51-
u_int32_t b32[16];
50+
uint8_t b8[64];
51+
uint32_t b32[16];
5252
} m;
53-
u_int8_t count;
53+
uint8_t count;
5454
};
5555

56-
extern void sha1_init __P((struct sha1_ctxt *));
57-
extern void sha1_pad __P((struct sha1_ctxt *));
58-
extern void sha1_loop __P((struct sha1_ctxt *, const caddr_t, size_t));
59-
extern void sha1_result __P((struct sha1_ctxt *, caddr_t));
56+
extern void sha1_init (struct sha1_ctxt *);
57+
extern void sha1_pad (struct sha1_ctxt *);
58+
extern void sha1_loop (struct sha1_ctxt *, const caddr_t, size_t);
59+
extern void sha1_result (struct sha1_ctxt *, caddr_t);
6060

6161
/* compatibilty with other SHA1 source codes */
6262
typedef struct sha1_ctxt SHA1_CTX;

0 commit comments

Comments
 (0)