GpgFrontend/vmime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed type size.

Browse Source
This commit is contained in:
Vincent Richard 2010-05-20 09:57:51 +00:00
parent 9196d5c342
commit ac1da379eb
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/security/digest/sha1/sha1MessageDigest.cpp
View File

@ -135,7 +135,7 @@ void sha1MessageDigest::update(const byte_t* buffer, const unsigned long len)
void sha1MessageDigest::finalize() void sha1MessageDigest::finalize()
{ {
unsigned long i, j; unsigned int i, j;
unsigned char finalcount[8]; unsigned char finalcount[8];
for (i = 0 ; i < 8 ; i++) for (i = 0 ; i < 8 ; i++)
@ -162,8 +162,8 @@ void sha1MessageDigest::finalize()
i = j = 0; i = j = 0;
std::memset(m_buffer, 0, 64); std::memset(m_buffer, 0, 64);
std::memset(m_state, 0, 5 * sizeof(unsigned long)); std::memset(m_state, 0, 5 * sizeof(unsigned int));
std::memset(m_count, 0, 2 * sizeof(unsigned long)); std::memset(m_count, 0, 2 * sizeof(unsigned int));
std::memset(&finalcount, 0, 8); std::memset(&finalcount, 0, 8);
} }
@ -192,17 +192,17 @@ void sha1MessageDigest::finalize(const byte_t* buffer,
* This is the core of the algorithm. * This is the core of the algorithm.
*/ */
void sha1MessageDigest::transform void sha1MessageDigest::transform
(unsigned long state[5], const unsigned char buffer[64]) (unsigned int state[5], const unsigned char buffer[64])
{ {
unsigned long a, b, c, d, e; unsigned int a, b, c, d, e;
typedef union typedef union
{ {
unsigned char c[64]; unsigned char c[64];
unsigned long l[16]; unsigned int l[16];
} CHAR64LONG16; } CHAR64LONG16;
assert(sizeof(unsigned long) == 4); assert(sizeof(unsigned int) == 4);
CHAR64LONG16* block; CHAR64LONG16* block;
static unsigned char workspace[64]; static unsigned char workspace[64];

6
vmime/security/digest/sha1/sha1MessageDigest.hpp
View File

@ -59,10 +59,10 @@ protected:
void init(); void init();
static void transform(unsigned long state[5], const byte_t buffer[64]); static void transform(unsigned int state[5], const byte_t buffer[64]);
unsigned long m_state[5]; unsigned int m_state[5];
unsigned long m_count[2]; unsigned int m_count[2];
byte_t m_buffer[64]; byte_t m_buffer[64];
byte_t m_digest[20]; byte_t m_digest[20];