From 2277c5d7bbe1f9595fad512d8f790708473a9bf1 Mon Sep 17 00:00:00 2001 From: rsc Date: Sun, 21 Mar 2004 04:33:13 +0000 Subject: Small tweaks Lots of new code imported. --- src/libsec/port/sha1.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) (limited to 'src/libsec/port/sha1.c') diff --git a/src/libsec/port/sha1.c b/src/libsec/port/sha1.c index dabe75f0..946f0283 100644 --- a/src/libsec/port/sha1.c +++ b/src/libsec/port/sha1.c @@ -1,5 +1,4 @@ -#include -#include +#include "os.h" #include static void encode(uchar*, u32int*, ulong); @@ -11,8 +10,6 @@ extern void _sha1block(uchar*, ulong, u32int*); * the last call. There must be room in the input buffer * to pad. */ -ulong lastlen; - SHA1state* sha1(uchar *p, ulong len, uchar *digest, SHA1state *s) { @@ -21,15 +18,12 @@ sha1(uchar *p, ulong len, uchar *digest, SHA1state *s) int i; uchar *e; -lastlen = len; if(s == nil){ s = malloc(sizeof(*s)); if(s == nil) return nil; memset(s, 0, sizeof(*s)); s->malloced = 1; - assert(!s->seeded); - assert(!s->blen); } if(s->seeded == 0){ @@ -42,11 +36,8 @@ lastlen = len; s->seeded = 1; } -assert(len < 100000); - /* fill out the partial 64 byte block from previous calls */ if(s->blen){ -assert(s); i = 64 - s->blen; if(len < i) i = len; @@ -61,11 +52,9 @@ assert(s); } } -assert(len < 1000000); /* do 64 byte blocks */ i = len & ~0x3f; if(i){ -assert(i < 1000000); _sha1block(p, i, s->state); s->len += i; len -= i; -- cgit v1.2.3