Stowage/pycryptodome
2
0
Fork 0
mirror of https://github.com/Legrandin/pycryptodome.git synced 2025-12-08 05:19:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Clean up SHA1 code

Browse source
This commit is contained in:
Helder Eijs 2018-02-24 16:53:48 +01:00
parent 4d3808047e
commit 9ed077d752
2 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/Crypto/Hash/SHA1.py
View file

@ -28,13 +28,15 @@ from Crypto.Util._raw_api import (load_pycryptodome_raw_lib,
_raw_sha1_lib = load_pycryptodome_raw_lib("Crypto.Hash._SHA1", _raw_sha1_lib = load_pycryptodome_raw_lib("Crypto.Hash._SHA1",
""" """
#define SHA1_DIGEST_SIZE 20
int SHA1_init(void **shaState); int SHA1_init(void **shaState);
int SHA1_destroy(void *shaState); int SHA1_destroy(void *shaState);
int SHA1_update(void *hs, int SHA1_update(void *hs,
const uint8_t *buf, const uint8_t *buf,
size_t len); size_t len);
int SHA1_digest(const void *shaState, int SHA1_digest(const void *shaState,
uint8_t digest[16]); uint8_t digest[SHA1_DIGEST_SIZE]);
int SHA1_copy(const void *src, void *dst); int SHA1_copy(const void *src, void *dst);
""") """)

35
src/SHA1.c
View file

@ -105,6 +105,25 @@ FAKE_INIT(SHA1)
#define MIN(a,b) (a<b?a:b) #define MIN(a,b) (a<b?a:b)
static inline uint32_t get_be_32(const uint8_t *p)
{
uint32_t result;
result = p[3] |
((uint32_t)p[2] << 8) |
((uint32_t)p[1] << 16) |
((uint32_t)p[0] << 24);
return result;
}
static inline void put_be_32(uint32_t number, uint8_t *p)
{
p[3] = (uint8_t)(number);
p[2] = (uint8_t)(number >> 8);
p[1] = (uint8_t)(number >> 16);
p[0] = (uint8_t)(number >> 24);
}
typedef struct t_hash_state { typedef struct t_hash_state {
uint32_t h[5]; uint32_t h[5];
uint8_t buf[BLOCK_SIZE]; /** 64 bytes == 512 bits == sixteen 32-bit words **/ uint8_t buf[BLOCK_SIZE]; /** 64 bytes == 512 bits == sixteen 32-bit words **/
@ -124,13 +143,10 @@ static void sha_compress(hash_state * hs)
uint32_t a, b, c, d, e; uint32_t a, b, c, d, e;
uint32_t W[16]; uint32_t W[16];
int i; int i;
uint8_t *p;
/** Words flow in in big-endian mode **/ /** Words flow in in big-endian mode **/
p = &hs->buf[0];
for (i=0; i<16; i++) { for (i=0; i<16; i++) {
W[i] = ((uint32_t)p[0] << 24) | ((uint32_t)p[1] << 16) | ((uint32_t)p[2] << 8) | (uint32_t)p[3]; W[i] = get_be_32(&hs->buf[i*4]);
p += 4;
} }
a = hs->h[0]; a = hs->h[0];
@ -318,19 +334,16 @@ static int sha_finalize(hash_state *hs, uint8_t *hash /** [DIGEST_SIZE] **/)
**/ **/
left = BLOCK_SIZE - hs->curlen; left = BLOCK_SIZE - hs->curlen;
memset(&hs->buf[hs->curlen], 0, left); memset(&hs->buf[hs->curlen], 0, left);
for (i=7; i>=0; i--) { put_be_32((uint32_t)(hs->totbits >> 32), &hs->buf[BLOCK_SIZE-8]);
hs->buf[BLOCK_SIZE-i-1] = 0xFF & (hs->totbits >> (i*8)); put_be_32((uint32_t)hs->totbits, &hs->buf[BLOCK_SIZE-4]);
}
/** compress one last time **/ /** compress one last time **/
sha_compress(hs); sha_compress(hs);
/** create final hash **/ /** create final hash **/
for (i=0; i<5; i++) { for (i=0; i<5; i++) {
*hash++ = hs->h[i] >> 24; put_be_32(hs->h[i], hash);
*hash++ = hs->h[i] >> 16; hash += 4;
*hash++ = hs->h[i] >> 8;
*hash++ = hs->h[i];
} }
return 0; return 0;