aboutsummaryrefslogtreecommitdiff
path: root/contrib/pgcrypto/sha1.c
diff options
context:
space:
mode:
Diffstat (limited to 'contrib/pgcrypto/sha1.c')
-rw-r--r--contrib/pgcrypto/sha1.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/contrib/pgcrypto/sha1.c b/contrib/pgcrypto/sha1.c
index 28405d8fd90..eef72325e99 100644
--- a/contrib/pgcrypto/sha1.c
+++ b/contrib/pgcrypto/sha1.c
@@ -1,4 +1,5 @@
-/* $Id: sha1.c,v 1.2 2000/12/04 01:20:38 tgl Exp $ */
+/* $Id: sha1.c,v 1.3 2001/01/09 16:07:13 momjian Exp $ */
+/* $KAME: sha1.c,v 1.3 2000/02/22 14:01:18 itojun Exp $ */
/*
* Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -35,7 +36,6 @@
*/
#include <postgres.h>
-#include "pgcrypto.h"
#include "sha1.h"
@@ -49,7 +49,7 @@
#ifndef unsupported
/* constant table */
-static uint32_t _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
+static uint32 _K[] = { 0x5a827999, 0x6ed9eba1, 0x8f1bbcdc, 0xca62c1d6 };
#define K(t) _K[(t) / 20]
#define F0(b, c, d) (((b) & (c)) | ((~(b)) & (d)))
@@ -87,9 +87,9 @@ static void
sha1_step(ctxt)
struct sha1_ctxt *ctxt;
{
- uint32_t a, b, c, d, e;
+ uint32 a, b, c, d, e;
size_t t, s;
- uint32_t tmp;
+ uint32 tmp;
#if BYTE_ORDER == LITTLE_ENDIAN
struct sha1_ctxt tctxt;
@@ -221,13 +221,13 @@ sha1_loop(ctxt, input0, len)
const caddr_t input0;
size_t len;
{
- const uint8_t *input;
+ const uint8 *input;
size_t gaplen;
size_t gapstart;
size_t off;
size_t copysiz;
- input = (const uint8_t *)input0;
+ input = (const uint8 *)input0;
off = 0;
while (off < len) {
@@ -250,9 +250,9 @@ sha1_result(ctxt, digest0)
struct sha1_ctxt *ctxt;
caddr_t digest0;
{
- uint8_t *digest;
+ uint8 *digest;
- digest = (uint8_t *)digest0;
+ digest = (uint8 *)digest0;
sha1_pad(ctxt);
#if BYTE_ORDER == BIG_ENDIAN
bcopy(&ctxt->h.b8[0], digest, 20);