Cleaned up header files and source code, brg_* headers are removed.

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>

6 files changed, 309 insertions, 489 deletions

diff --git a/brg_endian.h b/brg_endian.h
deleted file mode 100644
index e3c1402..0000000
--- a/brg_endian.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/*

- ---------------------------------------------------------------------------

- Copyright (c) 2003, Dr Brian Gladman, Worcester, UK.   All rights reserved.

-

- LICENSE TERMS

-

- The free distribution and use of this software in both source and binary

- form is allowed (with or without changes) provided that:

-

-   1. distributions of this source code include the above copyright

-      notice, this list of conditions and the following disclaimer;

-

-   2. distributions in binary form include the above copyright

-      notice, this list of conditions and the following disclaimer

-      in the documentation and/or other associated materials;

-

-   3. the copyright holder's name is not used to endorse products

-      built using this software without specific written permission.

-

- ALTERNATIVELY, provided that this notice is retained in full, this product

- may be distributed under the terms of the GNU General Public License (GPL),

- in which case the provisions of the GPL apply INSTEAD OF those given above.

-

- DISCLAIMER

-

- This software is provided 'as is' with no explicit or implied warranties

- in respect of its properties, including, but not limited to, correctness

- and/or fitness for purpose.

- ---------------------------------------------------------------------------

- Issue 20/10/2006

-*/

-

-#ifndef BRG_ENDIAN_H

-#define BRG_ENDIAN_H

-

-#if defined(HAVE_CONFIG_H)

-#  include "config.h"

-#endif

-

-#define IS_BIG_ENDIAN      4321 /* byte 0 is most significant (mc68k) */

-#define IS_LITTLE_ENDIAN   1234 /* byte 0 is least significant (i386) */

-

-#if defined(WORDS_BIGENDIAN)

-#  define PLATFORM_BYTE_ORDER IS_BIG_ENDIAN

-#else

-#  define PLATFORM_BYTE_ORDER IS_LITTLE_ENDIAN

-#endif

-

-#endif

diff --git a/brg_types.h b/brg_types.h
deleted file mode 100644
index 99b4874..0000000
--- a/brg_types.h
+++ /dev/null
@@ -1,106 +0,0 @@
-/*

- ---------------------------------------------------------------------------

- Copyright (c) 1998-2006, Brian Gladman, Worcester, UK. All rights reserved.

-

- LICENSE TERMS

-

- The free distribution and use of this software in both source and binary

- form is allowed (with or without changes) provided that:

-

-   1. distributions of this source code include the above copyright

-      notice, this list of conditions and the following disclaimer;

-

-   2. distributions in binary form include the above copyright

-      notice, this list of conditions and the following disclaimer

-      in the documentation and/or other associated materials;

-

-   3. the copyright holder's name is not used to endorse products

-      built using this software without specific written permission.

-

- ALTERNATIVELY, provided that this notice is retained in full, this product

- may be distributed under the terms of the GNU General Public License (GPL),

- in which case the provisions of the GPL apply INSTEAD OF those given above.

-

- DISCLAIMER

-

- This software is provided 'as is' with no explicit or implied warranties

- in respect of its properties, including, but not limited to, correctness

- and/or fitness for purpose.

-*/

-

-#ifndef BRG_TYPES_H

-#define BRG_TYPES_H

-

-#if defined(__cplusplus)

-extern "C" {

-#endif

-#if 0

-}

-#endif

-

-#if defined(HAVE_CONFIG_H)

-#  include "config.h"

-#endif

-

-#if defined(HAVE_STDINT_H)

-#  include <stdint.h>

-#endif

-

-#if defined(_WIN32)

-#  if defined( DLL_EXPORT )

-#    if defined( _MSC_VER ) || defined ( __INTEL_COMPILER )

-#      define VOID_RETURN    __declspec( dllexport ) void __stdcall

-#      define INT_RETURN     __declspec( dllexport ) int  __stdcall

-#    elif defined( __GNUC__ )

-#      define VOID_RETURN    __declspec( __dllexport__ ) void

-#      define INT_RETURN     __declspec( __dllexport__ ) int

-#    else

-#      error Use of the DLL is only available on the Microsoft, Intel and GCC compilers

-#    endif

-#  elif defined( DLL_IMPORT )

-#    if defined( _MSC_VER ) || defined ( __INTEL_COMPILER )

-#      define VOID_RETURN    __declspec( dllimport ) void __stdcall

-#      define INT_RETURN     __declspec( dllimport ) int  __stdcall

-#    elif defined( __GNUC__ )

-#      define VOID_RETURN    __declspec( __dllimport__ ) void

-#      define INT_RETURN     __declspec( __dllimport__ ) int

-#    else

-#      error Use of the DLL is only available on the Microsoft, Intel and GCC compilers

-#    endif

-#  endif

-#endif

-#if defined( __WATCOMC__ )

-#  define VOID_RETURN  void __cdecl

-#  define INT_RETURN   int  __cdecl

-#endif

-#if !defined(VOID_RETURN)

-#  define VOID_RETURN  void

-#  define INT_RETURN   int

-#endif

-

-/*  These defines are used to declare buffers in a way that allows

-    faster operations on longer variables to be used.  In all these

-    defines 'size' must be a power of 2 and >= 8

-

-    dec_unit_type(size,x)       declares a variable 'x' of length 

-                                'size' bits

-

-    dec_bufr_type(size,bsize,x) declares a buffer 'x' of length 'bsize' 

-                                bytes defined as an array of variables

-                                each of 'size' bits (bsize must be a 

-                                multiple of size / 8)

-

-    ptr_cast(x,size)            casts a pointer to a pointer to a 

-                                varaiable of length 'size' bits

-*/

-

-#define ui_type(size)               uint_##size##t

-#define dec_unit_type(size,x)       typedef ui_type(size) x

-#define dec_bufr_type(size,bsize,x) typedef ui_type(size) x[bsize / (size >> 3)]

-#define ptr_cast(x,size)            ((ui_type(size)*)(x))

-

-#if defined(__cplusplus)

-}

-#endif

-

-#endif

diff --git a/config.h.in b/config.h.in
index dfbef83..46ee9c6 100644
--- a/config.h.in
+++ b/config.h.in
@@ -63,9 +63,6 @@
    #define below would cause a syntax error. */
 #undef _UINT32_T
 
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
-
 /* Define to the type of an unsigned integer type of width exactly 32 bits if
    such a type exists and the standard includes do not define it. */
 #undef uint32_t
diff --git a/configure.ac b/configure.ac
index b9de82c..c88f19c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,6 @@ AC_PROG_LIBTOOL
 AC_CHECK_HEADERS([stdint.h string.h])
 
 AC_C_BIGENDIAN
-AC_C_CONST
 
 AC_TYPE_UINT32_T
 
diff --git a/sha1.c b/sha1.c
index 8aac426..48bef2b 100644
--- a/sha1.c
+++ b/sha1.c
@@ -1,258 +1,242 @@
-/*

- ---------------------------------------------------------------------------

- Copyright (c) 2002, Dr Brian Gladman, Worcester, UK.   All rights reserved.

-

- LICENSE TERMS

-

- The free distribution and use of this software in both source and binary

- form is allowed (with or without changes) provided that:

-

-   1. distributions of this source code include the above copyright

-      notice, this list of conditions and the following disclaimer;

-

-   2. distributions in binary form include the above copyright

-      notice, this list of conditions and the following disclaimer

-      in the documentation and/or other associated materials;

-

-   3. the copyright holder's name is not used to endorse products

-      built using this software without specific written permission.

-

- ALTERNATIVELY, provided that this notice is retained in full, this product

- may be distributed under the terms of the GNU General Public License (GPL),

- in which case the provisions of the GPL apply INSTEAD OF those given above.

-

- DISCLAIMER

-

- This software is provided 'as is' with no explicit or implied warranties

- in respect of its properties, including, but not limited to, correctness

- and/or fitness for purpose.

- ---------------------------------------------------------------------------

- Issue Date: 01/08/2005

-

- This is a byte oriented version of SHA1 that operates on arrays of bytes

- stored in memory.

-*/

-

-#include <string.h>     /* for memcpy() etc.        */

-

-#include "sha1.h"

-#include "brg_endian.h"

-

-#if defined(__cplusplus)

-extern "C"

-{

-#endif

-

-#if defined( _MSC_VER ) && ( _MSC_VER > 800 )

-#pragma intrinsic(memcpy)

-#endif

-

-#if 0 && defined(_MSC_VER)

-#define rotl32  _lrotl

-#define rotr32  _lrotr

-#else

-#define rotl32(x,n)   (((x) << n) | ((x) >> (32 - n)))

-#define rotr32(x,n)   (((x) >> n) | ((x) << (32 - n)))

-#endif

-

-#if !defined(bswap_32)

-#define bswap_32(x) ((rotr32((x), 24) & 0x00ff00ff) | (rotr32((x), 8) & 0xff00ff00))

-#endif

-

-#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)

-#define SWAP_BYTES

-#else

-#undef  SWAP_BYTES

-#endif

-

-#if defined(SWAP_BYTES)

-#define bsw_32(p,n) \

-    { int _i = (n); while(_i--) ((uint32_t*)p)[_i] = bswap_32(((uint32_t*)p)[_i]); }

-#else

-#define bsw_32(p,n)

-#endif

-

-#define SHA1_MASK   (SHA1_BLOCK_SIZE - 1)

-

-#if 0

-

-#define ch(x,y,z)       (((x) & (y)) ^ (~(x) & (z)))

-#define parity(x,y,z)   ((x) ^ (y) ^ (z))

-#define maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))

-

-#else   /* Discovered by Rich Schroeppel and Colin Plumb   */

-

-#define ch(x,y,z)       ((z) ^ ((x) & ((y) ^ (z))))

-#define parity(x,y,z)   ((x) ^ (y) ^ (z))

-#define maj(x,y,z)      (((x) & (y)) | ((z) & ((x) ^ (y))))

-

-#endif

-

-/* Compile 64 bytes of hash data into SHA1 context. Note    */

-/* that this routine assumes that the byte order in the     */

-/* ctx->wbuf[] at this point is in such an order that low   */

-/* address bytes in the ORIGINAL byte stream will go in     */

-/* this buffer to the high end of 32-bit words on BOTH big  */

-/* and little endian systems                                */

-

-#ifdef ARRAY

-#define q(v,n)  v[n]

-#else

-#define q(v,n)  v##n

-#endif

-

-#define one_cycle(v,a,b,c,d,e,f,k,h)            \

-    q(v,e) += rotr32(q(v,a),27) +               \

-              f(q(v,b),q(v,c),q(v,d)) + k + h;  \

-    q(v,b)  = rotr32(q(v,b), 2)

-

-#define five_cycle(v,f,k,i)                 \

-    one_cycle(v, 0,1,2,3,4, f,k,hf(i  ));   \

-    one_cycle(v, 4,0,1,2,3, f,k,hf(i+1));   \

-    one_cycle(v, 3,4,0,1,2, f,k,hf(i+2));   \

-    one_cycle(v, 2,3,4,0,1, f,k,hf(i+3));   \

-    one_cycle(v, 1,2,3,4,0, f,k,hf(i+4))

-

-VOID_RETURN sha1_compile(sha1_ctx ctx[1])

-{   uint32_t    *w = ctx->wbuf;

-

-#ifdef ARRAY

-    uint32_t    v[5];

-    memcpy(v, ctx->hash, 5 * sizeof(uint32_t));

-#else

-    uint32_t    v0, v1, v2, v3, v4;

-    v0 = ctx->hash[0]; v1 = ctx->hash[1];

-    v2 = ctx->hash[2]; v3 = ctx->hash[3];

-    v4 = ctx->hash[4];

-#endif

-

-#define hf(i)   w[i]

-

-    five_cycle(v, ch, 0x5a827999,  0);

-    five_cycle(v, ch, 0x5a827999,  5);

-    five_cycle(v, ch, 0x5a827999, 10);

-    one_cycle(v,0,1,2,3,4, ch, 0x5a827999, hf(15)); \

-

-#undef  hf

-#define hf(i) (w[(i) & 15] = rotl32(                    \

-                 w[((i) + 13) & 15] ^ w[((i) + 8) & 15] \

-               ^ w[((i) +  2) & 15] ^ w[(i) & 15], 1))

-

-    one_cycle(v,4,0,1,2,3, ch, 0x5a827999, hf(16));

-    one_cycle(v,3,4,0,1,2, ch, 0x5a827999, hf(17));

-    one_cycle(v,2,3,4,0,1, ch, 0x5a827999, hf(18));

-    one_cycle(v,1,2,3,4,0, ch, 0x5a827999, hf(19));

-

-    five_cycle(v, parity, 0x6ed9eba1,  20);

-    five_cycle(v, parity, 0x6ed9eba1,  25);

-    five_cycle(v, parity, 0x6ed9eba1,  30);

-    five_cycle(v, parity, 0x6ed9eba1,  35);

-

-    five_cycle(v, maj, 0x8f1bbcdc,  40);

-    five_cycle(v, maj, 0x8f1bbcdc,  45);

-    five_cycle(v, maj, 0x8f1bbcdc,  50);

-    five_cycle(v, maj, 0x8f1bbcdc,  55);

-

-    five_cycle(v, parity, 0xca62c1d6,  60);

-    five_cycle(v, parity, 0xca62c1d6,  65);

-    five_cycle(v, parity, 0xca62c1d6,  70);

-    five_cycle(v, parity, 0xca62c1d6,  75);

-

-#ifdef ARRAY

-    ctx->hash[0] += v[0]; ctx->hash[1] += v[1];

-    ctx->hash[2] += v[2]; ctx->hash[3] += v[3];

-    ctx->hash[4] += v[4];

-#else

-    ctx->hash[0] += v0; ctx->hash[1] += v1;

-    ctx->hash[2] += v2; ctx->hash[3] += v3;

-    ctx->hash[4] += v4;

-#endif

-}

-

-VOID_RETURN sha1_begin(sha1_ctx ctx[1])

-{

-    ctx->count[0] = ctx->count[1] = 0;

-    ctx->hash[0] = 0x67452301;

-    ctx->hash[1] = 0xefcdab89;

-    ctx->hash[2] = 0x98badcfe;

-    ctx->hash[3] = 0x10325476;

-    ctx->hash[4] = 0xc3d2e1f0;

-}

-

-/* SHA1 hash data in an array of bytes into hash buffer and */

-/* call the hash_compile function as required.              */

-

-VOID_RETURN sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1])

-{   uint32_t pos = (uint32_t)(ctx->count[0] & SHA1_MASK),

-            space = SHA1_BLOCK_SIZE - pos;

-    const unsigned char *sp = data;

-

-    if((ctx->count[0] += len) < len)

-        ++(ctx->count[1]);

-

-    while(len >= space)     /* tranfer whole blocks if possible  */

-    {

-        memcpy(((unsigned char*)ctx->wbuf) + pos, sp, space);

-        sp += space; len -= space; space = SHA1_BLOCK_SIZE; pos = 0;

-        bsw_32(ctx->wbuf, SHA1_BLOCK_SIZE >> 2);

-        sha1_compile(ctx);

-    }

-

-    memcpy(((unsigned char*)ctx->wbuf) + pos, sp, len);

-}

-

-/* SHA1 final padding and digest calculation  */

-

-VOID_RETURN sha1_end(unsigned char hval[], sha1_ctx ctx[1])

-{   uint32_t    i = (uint32_t)(ctx->count[0] & SHA1_MASK);

-

-    /* put bytes in the buffer in an order in which references to   */

-    /* 32-bit words will put bytes with lower addresses into the    */

-    /* top of 32 bit words on BOTH big and little endian machines   */

-    bsw_32(ctx->wbuf, (i + 3) >> 2);

-

-    /* we now need to mask valid bytes and add the padding which is */

-    /* a single 1 bit and as many zero bits as necessary. Note that */

-    /* we can always add the first padding byte here because the    */

-    /* buffer always has at least one empty slot                    */

-    ctx->wbuf[i >> 2] &= 0xffffff80 << 8 * (~i & 3);

-    ctx->wbuf[i >> 2] |= 0x00000080 << 8 * (~i & 3);

-

-    /* we need 9 or more empty positions, one for the padding byte  */

-    /* (above) and eight for the length count. If there is not      */

-    /* enough space, pad and empty the buffer                       */

-    if(i > SHA1_BLOCK_SIZE - 9)

-    {

-        if(i < 60) ctx->wbuf[15] = 0;

-        sha1_compile(ctx);

-        i = 0;

-    }

-    else    /* compute a word index for the empty buffer positions  */

-        i = (i >> 2) + 1;

-

-    while(i < 14) /* and zero pad all but last two positions        */

-        ctx->wbuf[i++] = 0;

-

-    /* the following 32-bit length fields are assembled in the      */

-    /* wrong byte order on little endian machines but this is       */

-    /* corrected later since they are only ever used as 32-bit      */

-    /* word values.                                                 */

-    ctx->wbuf[14] = (ctx->count[1] << 3) | (ctx->count[0] >> 29);

-    ctx->wbuf[15] = ctx->count[0] << 3;

-    sha1_compile(ctx);

-

-    /* extract the hash value as bytes in case the hash buffer is   */

-    /* misaligned for 32-bit words                                  */

-    for(i = 0; i < SHA1_DIGEST_SIZE; ++i)

-        hval[i] = (unsigned char)(ctx->hash[i >> 2] >> (8 * (~i & 3)));

-}

-

-VOID_RETURN sha1(unsigned char hval[], const unsigned char data[], unsigned long len)

-{   sha1_ctx    cx[1];

-

-    sha1_begin(cx); sha1_hash(data, len, cx); sha1_end(hval, cx);

-}

-

-#if defined(__cplusplus)

-}

-#endif

+/*
+ ---------------------------------------------------------------------------
+ Copyright (c) 2002, Dr Brian Gladman, Worcester, UK.   All rights reserved.
+
+ LICENSE TERMS
+
+ The free distribution and use of this software in both source and binary
+ form is allowed (with or without changes) provided that:
+
+   1. distributions of this source code include the above copyright
+      notice, this list of conditions and the following disclaimer;
+
+   2. distributions in binary form include the above copyright
+      notice, this list of conditions and the following disclaimer
+      in the documentation and/or other associated materials;
+
+   3. the copyright holder's name is not used to endorse products
+      built using this software without specific written permission.
+
+ ALTERNATIVELY, provided that this notice is retained in full, this product
+ may be distributed under the terms of the GNU General Public License (GPL),
+ in which case the provisions of the GPL apply INSTEAD OF those given above.
+
+ DISCLAIMER
+
+ This software is provided 'as is' with no explicit or implied warranties
+ in respect of its properties, including, but not limited to, correctness
+ and/or fitness for purpose.
+ ---------------------------------------------------------------------------
+ Issue Date: 01/08/2005
+
+ This is a byte oriented version of SHA1 that operates on arrays of bytes
+ stored in memory.
+*/
+
+#include <string.h>     /* for memcpy() etc.        */
+
+#include "sha1.h"
+
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+
+#define SHA1_BLOCK_SIZE  64
+
+#define rotl32(x,n)   (((x) << n) | ((x) >> (32 - n)))
+#define rotr32(x,n)   (((x) >> n) | ((x) << (32 - n)))
+
+#define bswap_32(x) ((rotr32((x), 24) & 0x00ff00ff) | (rotr32((x), 8) & 0xff00ff00))
+
+#if (PLATFORM_BYTE_ORDER == IS_LITTLE_ENDIAN)
+#define bsw_32(p,n) \
+    { int _i = (n); while(_i--) ((uint32_t*)p)[_i] = bswap_32(((uint32_t*)p)[_i]); }
+#else
+#define bsw_32(p,n)
+#endif
+
+#define SHA1_MASK   (SHA1_BLOCK_SIZE - 1)
+
+#if 0
+
+#define ch(x,y,z)       (((x) & (y)) ^ (~(x) & (z)))
+#define parity(x,y,z)   ((x) ^ (y) ^ (z))
+#define maj(x,y,z)      (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z)))
+
+#else   /* Discovered by Rich Schroeppel and Colin Plumb   */
+
+#define ch(x,y,z)       ((z) ^ ((x) & ((y) ^ (z))))
+#define parity(x,y,z)   ((x) ^ (y) ^ (z))
+#define maj(x,y,z)      (((x) & (y)) | ((z) & ((x) ^ (y))))
+
+#endif
+
+/* Compile 64 bytes of hash data into SHA1 context. Note    */
+/* that this routine assumes that the byte order in the     */
+/* ctx->wbuf[] at this point is in such an order that low   */
+/* address bytes in the ORIGINAL byte stream will go in     */
+/* this buffer to the high end of 32-bit words on BOTH big  */
+/* and little endian systems                                */
+
+#ifdef ARRAY
+#define q(v,n)  v[n]
+#else
+#define q(v,n)  v##n
+#endif
+
+#define one_cycle(v,a,b,c,d,e,f,k,h)            \
+    q(v,e) += rotr32(q(v,a),27) +               \
+              f(q(v,b),q(v,c),q(v,d)) + k + h;  \
+    q(v,b)  = rotr32(q(v,b), 2)
+
+#define five_cycle(v,f,k,i)                 \
+    one_cycle(v, 0,1,2,3,4, f,k,hf(i  ));   \
+    one_cycle(v, 4,0,1,2,3, f,k,hf(i+1));   \
+    one_cycle(v, 3,4,0,1,2, f,k,hf(i+2));   \
+    one_cycle(v, 2,3,4,0,1, f,k,hf(i+3));   \
+    one_cycle(v, 1,2,3,4,0, f,k,hf(i+4))
+
+static void sha1_compile(sha1_ctx ctx[1])
+{   uint32_t    *w = ctx->wbuf;
+
+#ifdef ARRAY
+    uint32_t    v[5];
+    memcpy(v, ctx->hash, 5 * sizeof(uint32_t));
+#else
+    uint32_t    v0, v1, v2, v3, v4;
+    v0 = ctx->hash[0]; v1 = ctx->hash[1];
+    v2 = ctx->hash[2]; v3 = ctx->hash[3];
+    v4 = ctx->hash[4];
+#endif
+
+#define hf(i)   w[i]
+
+    five_cycle(v, ch, 0x5a827999,  0);
+    five_cycle(v, ch, 0x5a827999,  5);
+    five_cycle(v, ch, 0x5a827999, 10);
+    one_cycle(v,0,1,2,3,4, ch, 0x5a827999, hf(15)); \
+
+#undef  hf
+#define hf(i) (w[(i) & 15] = rotl32(                    \
+                 w[((i) + 13) & 15] ^ w[((i) + 8) & 15] \
+               ^ w[((i) +  2) & 15] ^ w[(i) & 15], 1))
+
+    one_cycle(v,4,0,1,2,3, ch, 0x5a827999, hf(16));
+    one_cycle(v,3,4,0,1,2, ch, 0x5a827999, hf(17));
+    one_cycle(v,2,3,4,0,1, ch, 0x5a827999, hf(18));
+    one_cycle(v,1,2,3,4,0, ch, 0x5a827999, hf(19));
+
+    five_cycle(v, parity, 0x6ed9eba1,  20);
+    five_cycle(v, parity, 0x6ed9eba1,  25);
+    five_cycle(v, parity, 0x6ed9eba1,  30);
+    five_cycle(v, parity, 0x6ed9eba1,  35);
+
+    five_cycle(v, maj, 0x8f1bbcdc,  40);
+    five_cycle(v, maj, 0x8f1bbcdc,  45);
+    five_cycle(v, maj, 0x8f1bbcdc,  50);
+    five_cycle(v, maj, 0x8f1bbcdc,  55);
+
+    five_cycle(v, parity, 0xca62c1d6,  60);
+    five_cycle(v, parity, 0xca62c1d6,  65);
+    five_cycle(v, parity, 0xca62c1d6,  70);
+    five_cycle(v, parity, 0xca62c1d6,  75);
+
+#ifdef ARRAY
+    ctx->hash[0] += v[0]; ctx->hash[1] += v[1];
+    ctx->hash[2] += v[2]; ctx->hash[3] += v[3];
+    ctx->hash[4] += v[4];
+#else
+    ctx->hash[0] += v0; ctx->hash[1] += v1;
+    ctx->hash[2] += v2; ctx->hash[3] += v3;
+    ctx->hash[4] += v4;
+#endif
+}
+
+void sha1_begin(sha1_ctx ctx[1])
+{
+    ctx->count[0] = ctx->count[1] = 0;
+    ctx->hash[0] = 0x67452301;
+    ctx->hash[1] = 0xefcdab89;
+    ctx->hash[2] = 0x98badcfe;
+    ctx->hash[3] = 0x10325476;
+    ctx->hash[4] = 0xc3d2e1f0;
+}
+
+/* SHA1 hash data in an array of bytes into hash buffer and */
+/* call the hash_compile function as required.              */
+
+void sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1])
+{   uint32_t pos = (uint32_t)(ctx->count[0] & SHA1_MASK),
+            space = SHA1_BLOCK_SIZE - pos;
+    const unsigned char *sp = data;
+
+    if((ctx->count[0] += len) < len)
+        ++(ctx->count[1]);
+
+    while(len >= space)     /* tranfer whole blocks if possible  */
+    {
+        memcpy(((unsigned char*)ctx->wbuf) + pos, sp, space);
+        sp += space; len -= space; space = SHA1_BLOCK_SIZE; pos = 0;
+        bsw_32(ctx->wbuf, SHA1_BLOCK_SIZE >> 2);
+        sha1_compile(ctx);
+    }
+
+    memcpy(((unsigned char*)ctx->wbuf) + pos, sp, len);
+}
+
+/* SHA1 final padding and digest calculation  */
+
+void sha1_end(unsigned char hval[], sha1_ctx ctx[1])
+{   uint32_t    i = (uint32_t)(ctx->count[0] & SHA1_MASK);
+
+    /* put bytes in the buffer in an order in which references to   */
+    /* 32-bit words will put bytes with lower addresses into the    */
+    /* top of 32 bit words on BOTH big and little endian machines   */
+    bsw_32(ctx->wbuf, (i + 3) >> 2);
+
+    /* we now need to mask valid bytes and add the padding which is */
+    /* a single 1 bit and as many zero bits as necessary. Note that */
+    /* we can always add the first padding byte here because the    */
+    /* buffer always has at least one empty slot                    */
+    ctx->wbuf[i >> 2] &= 0xffffff80 << 8 * (~i & 3);
+    ctx->wbuf[i >> 2] |= 0x00000080 << 8 * (~i & 3);
+
+    /* we need 9 or more empty positions, one for the padding byte  */
+    /* (above) and eight for the length count. If there is not      */
+    /* enough space, pad and empty the buffer                       */
+    if(i > SHA1_BLOCK_SIZE - 9)
+    {
+        if(i < 60) ctx->wbuf[15] = 0;
+        sha1_compile(ctx);
+        i = 0;
+    }
+    else    /* compute a word index for the empty buffer positions  */
+        i = (i >> 2) + 1;
+
+    while(i < 14) /* and zero pad all but last two positions        */
+        ctx->wbuf[i++] = 0;
+
+    /* the following 32-bit length fields are assembled in the      */
+    /* wrong byte order on little endian machines but this is       */
+    /* corrected later since they are only ever used as 32-bit      */
+    /* word values.                                                 */
+    ctx->wbuf[14] = (ctx->count[1] << 3) | (ctx->count[0] >> 29);
+    ctx->wbuf[15] = ctx->count[0] << 3;
+    sha1_compile(ctx);
+
+    /* extract the hash value as bytes in case the hash buffer is   */
+    /* misaligned for 32-bit words                                  */
+    for(i = 0; i < SHA1_DIGEST_SIZE; ++i)
+        hval[i] = (unsigned char)(ctx->hash[i >> 2] >> (8 * (~i & 3)));
+}
+
+void sha1(unsigned char hval[], const unsigned char data[], unsigned long len)
+{   sha1_ctx    cx[1];
+
+    sha1_begin(cx); sha1_hash(data, len, cx); sha1_end(hval, cx);
+}
+
+#if defined(__cplusplus)
+}
+#endif
diff --git a/sha1.h b/sha1.h
index bad2657..b4dca93 100644
--- a/sha1.h
+++ b/sha1.h
@@ -1,72 +1,67 @@
-/*

- ---------------------------------------------------------------------------

- Copyright (c) 2002, Dr Brian Gladman, Worcester, UK.   All rights reserved.

-

- LICENSE TERMS

-

- The free distribution and use of this software in both source and binary

- form is allowed (with or without changes) provided that:

-

-   1. distributions of this source code include the above copyright

-      notice, this list of conditions and the following disclaimer;

-

-   2. distributions in binary form include the above copyright

-      notice, this list of conditions and the following disclaimer

-      in the documentation and/or other associated materials;

-

-   3. the copyright holder's name is not used to endorse products

-      built using this software without specific written permission.

-

- ALTERNATIVELY, provided that this notice is retained in full, this product

- may be distributed under the terms of the GNU General Public License (GPL),

- in which case the provisions of the GPL apply INSTEAD OF those given above.

-

- DISCLAIMER

-

- This software is provided 'as is' with no explicit or implied warranties

- in respect of its properties, including, but not limited to, correctness

- and/or fitness for purpose.

- ---------------------------------------------------------------------------

- Issue Date: 01/08/2005

-*/

-

-#ifndef _SHA1_H

-#define _SHA1_H

-

-#include "brg_types.h"

-

-#define SHA1_BLOCK_SIZE  64

-#define SHA1_DIGEST_SIZE 20

-

-#if defined(__cplusplus)

-extern "C"

-{

-#endif

-

-/* type to hold the SHA256 context  */

-

-typedef struct

-{   uint32_t count[2];

-    uint32_t hash[5];

-    uint32_t wbuf[16];

-} sha1_ctx;

-

-/* Note that these prototypes are the same for both bit and */

-/* byte oriented implementations. However the length fields */

-/* are in bytes or bits as appropriate for the version used */

-/* and bit sequences are input as arrays of bytes in which  */

-/* bit sequences run from the most to the least significant */

-/* end of each byte                                         */

-

-VOID_RETURN sha1_compile(sha1_ctx ctx[1]);

-

-VOID_RETURN sha1_begin(sha1_ctx ctx[1]);

-VOID_RETURN sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1]);

-VOID_RETURN sha1_end(unsigned char hval[], sha1_ctx ctx[1]);

-VOID_RETURN sha1(unsigned char hval[], const unsigned char data[], unsigned long len);

-

-#if defined(__cplusplus)

-}

-#endif

-

-#endif

+/*
+ ---------------------------------------------------------------------------
+ Copyright (c) 2002, Dr Brian Gladman, Worcester, UK.   All rights reserved.
+
+ LICENSE TERMS
+
+ The free distribution and use of this software in both source and binary
+ form is allowed (with or without changes) provided that:
+
+   1. distributions of this source code include the above copyright
+      notice, this list of conditions and the following disclaimer;
+
+   2. distributions in binary form include the above copyright
+      notice, this list of conditions and the following disclaimer
+      in the documentation and/or other associated materials;
+
+   3. the copyright holder's name is not used to endorse products
+      built using this software without specific written permission.
+
+ ALTERNATIVELY, provided that this notice is retained in full, this product
+ may be distributed under the terms of the GNU General Public License (GPL),
+ in which case the provisions of the GPL apply INSTEAD OF those given above.
+
+ DISCLAIMER
+
+ This software is provided 'as is' with no explicit or implied warranties
+ in respect of its properties, including, but not limited to, correctness
+ and/or fitness for purpose.
+ ---------------------------------------------------------------------------
+ Issue Date: 01/08/2005
+*/
+
+#ifndef _SHA1_H
+#define _SHA1_H
+
+#if defined(__cplusplus)
+extern "C"
+{
+#endif
+#if 0
+} /* Appleasing Emacs */
+#endif
+
+#include <stdint.h>
+
+/* Size of SHA1 digest */
+
+#define SHA1_DIGEST_SIZE 20
+
+/* type to hold the SHA1 context  */
+
+typedef struct
+{   uint32_t count[2];
+    uint32_t hash[5];
+    uint32_t wbuf[16];
+} sha1_ctx;
+
+void sha1_begin(sha1_ctx ctx[1]);
+void sha1_hash(const unsigned char data[], unsigned long len, sha1_ctx ctx[1]);
+void sha1_end(unsigned char hval[], sha1_ctx ctx[1]);
+void sha1(unsigned char hval[], const unsigned char data[], unsigned long len);
+
+#if defined(__cplusplus)
+}
+#endif
+
+#endif