summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Makefile1
-rw-r--r--includes/BSHA1.h13
-rw-r--r--src/BSHA1.cc147
3 files changed, 5 insertions, 156 deletions
diff --git a/Makefile b/Makefile
index f5481e3..a3b36ec 100644
--- a/Makefile
+++ b/Makefile
@@ -71,7 +71,6 @@ json_reader.cpp \
json_writer.cpp \
json_value.cpp \
\
-BSHA1.cc \
Base64.cc \
\
BLua.cc \
diff --git a/includes/BSHA1.h b/includes/BSHA1.h
index f70f6b7..55710b2 100644
--- a/includes/BSHA1.h
+++ b/includes/BSHA1.h
@@ -1,24 +1,21 @@
#pragma once
#include <Exceptions.h>
+#include <tomcrypt.h>
namespace Balau {
class SHA1 {
public:
SHA1() { reset(); }
- void reset();
- void update(const uint8_t* data, const size_t len);
- void final(uint8_t * digest);
+ void reset() { sha1_init(&m_state); }
+ void update(const uint8_t* data, const size_t len) { sha1_process(&m_state, data, len); }
+ void final(uint8_t * digest) { sha1_done(&m_state, digest); }
enum { DIGEST_SIZE = 20 };
private:
- void transform(uint32_t state[5], const uint8_t buffer[64]);
-
- uint32_t m_state[5];
- uint32_t m_count[2];
- uint8_t m_buffer[64];
+ hash_state m_state;
};
};
diff --git a/src/BSHA1.cc b/src/BSHA1.cc
deleted file mode 100644
index 68c7853..0000000
--- a/src/BSHA1.cc
+++ /dev/null
@@ -1,147 +0,0 @@
-// based of public domain implementation found here: http://svn.ghostscript.com/jbig2dec/trunk/sha1.c
-
-/*
-Test Vectors (from FIPS PUB 180-1)
-"abc"
- A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
-"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
- 84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
-A million repetitions of "a"
- 34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
-*/
-
-#include "BSHA1.h"
-
-#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
-
-/* blk0() and blk() perform the initial expand. */
-/* I got the idea of expanding during the round function from SSLeay */
-/* FIXME: can we do this in an endian-proof way? */
-#ifdef WORDS_BIGENDIAN
-#define blk0(i) block->l[i]
-#else
-#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
- |(rol(block->l[i],8)&0x00FF00FF))
-#endif
-#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
- ^block->l[(i+2)&15]^block->l[i&15],1))
-
-/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
-#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
-#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
-#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
-#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
-
-/* Hash a single 512-bit block. This is the core of the algorithm. */
-void Balau::SHA1::transform(uint32_t state[5], const uint8_t buffer[64])
-{
- uint32_t a, b, c, d, e;
- typedef union {
- uint8_t c[64];
- uint32_t l[16];
- } CHAR64LONG16;
- CHAR64LONG16* block;
-
- block = (CHAR64LONG16*)buffer;
-
- /* Copy m_state[] to working vars */
- a = state[0];
- b = state[1];
- c = state[2];
- d = state[3];
- e = state[4];
-
- /* 4 rounds of 20 operations each. Loop unrolled. */
- R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
- R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
- R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
- R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
- R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
- R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
- R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
- R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
- R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
- R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
- R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
- R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
- R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
- R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
- R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
- R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
- R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
- R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
- R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
- R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
-
- /* Add the working vars back into context.state[] */
- state[0] += a;
- state[1] += b;
- state[2] += c;
- state[3] += d;
- state[4] += e;
-
- /* Wipe variables */
- a = b = c = d = e = 0;
-}
-
-/* SHA1Init - Initialize new context */
-void Balau::SHA1::reset()
-{
- /* SHA1 initialization constants */
- m_state[0] = 0x67452301;
- m_state[1] = 0xEFCDAB89;
- m_state[2] = 0x98BADCFE;
- m_state[3] = 0x10325476;
- m_state[4] = 0xC3D2E1F0;
- m_count[0] = m_count[1] = 0;
-}
-
-/* Run your data through this. */
-void Balau::SHA1::update(const uint8_t* data, const size_t len)
-{
- size_t i, j;
-
- j = (m_count[0] >> 3) & 63;
- if ((m_count[0] += len << 3) < (len << 3)) m_count[1]++;
- m_count[1] += (len >> 29);
- if ((j + len) > 63) {
- memcpy(&m_buffer[j], data, (i = 64-j));
- transform(m_state, m_buffer);
- for ( ; i + 63 < len; i += 64) {
- transform(m_state, data + i);
- }
- j = 0;
- }
- else i = 0;
- memcpy(&m_buffer[j], &data[i], len - i);
-
-}
-
-/* Add padding and return the message digest. */
-void Balau::SHA1::final(uint8_t * digest)
-{
- uint32_t i;
- uint8_t finalcount[8];
-
- for (i = 0; i < 8; i++) {
- finalcount[i] = (unsigned char)((m_count[(i >= 4 ? 0 : 1)]
- >> ((3-(i & 3)) * 8) ) & 255); /* Endian independent */
- }
- update((uint8_t *)"\200", 1);
- while ((m_count[0] & 504) != 448) {
- update((uint8_t *)"\0", 1);
- }
- update(finalcount, 8); /* Should cause a SHA1_Transform() */
- for (i = 0; i < DIGEST_SIZE; i++) {
- digest[i] = (uint8_t)
- ((m_state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
- }
-
- /* Wipe variables */
- i = 0;
- memset(m_buffer, 0, 64);
- memset(m_state, 0, 20);
- memset(m_count, 0, 8);
- memset(finalcount, 0, 8); /* SWR */
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-28 18:48:46 +0000