abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-05-07 00:46:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove warning of hashes

Browse Source
This commit is contained in:
Zhi Guan
2022-10-12 14:03:10 +08:00
parent 6ac8176da7
commit b6e4bc1309
5 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/gmssl/sha2.h
View File

@@ -32,7 +32,7 @@ typedef struct {
uint32_t state[SHA224_STATE_WORDS]; uint32_t state[SHA224_STATE_WORDS];
uint64_t nblocks; uint64_t nblocks;
uint8_t block[SHA224_BLOCK_SIZE]; uint8_t block[SHA224_BLOCK_SIZE];
int num; size_t num;
} SHA224_CTX; } SHA224_CTX;
void sha224_init(SHA224_CTX *ctx); void sha224_init(SHA224_CTX *ctx);
@@ -50,7 +50,7 @@ typedef struct {
uint32_t state[SHA256_STATE_WORDS]; uint32_t state[SHA256_STATE_WORDS];
uint64_t nblocks; uint64_t nblocks;
uint8_t block[SHA256_BLOCK_SIZE]; uint8_t block[SHA256_BLOCK_SIZE];
int num; size_t num;
} SHA256_CTX; } SHA256_CTX;
void sha256_init(SHA256_CTX *ctx); void sha256_init(SHA256_CTX *ctx);
@@ -68,7 +68,7 @@ typedef struct {
uint64_t state[SHA384_STATE_WORDS]; uint64_t state[SHA384_STATE_WORDS];
uint64_t nblocks; uint64_t nblocks;
uint8_t block[SHA384_BLOCK_SIZE]; uint8_t block[SHA384_BLOCK_SIZE];
int num; size_t num;
} SHA384_CTX; } SHA384_CTX;
void sha384_init(SHA384_CTX *ctx); void sha384_init(SHA384_CTX *ctx);
@@ -86,7 +86,7 @@ typedef struct {
uint64_t state[SHA512_STATE_WORDS]; uint64_t state[SHA512_STATE_WORDS];
uint64_t nblocks; uint64_t nblocks;
uint8_t block[SHA512_BLOCK_SIZE]; uint8_t block[SHA512_BLOCK_SIZE];
int num; size_t num;
} SHA512_CTX; } SHA512_CTX;
void sha512_init(SHA512_CTX *ctx); void sha512_init(SHA512_CTX *ctx);

12
src/sha1.c
View File

@@ -109,7 +109,7 @@ void sha1_update(SHA1_CTX *ctx, const unsigned char *data, size_t datalen)
ctx->num &= 0x3f; ctx->num &= 0x3f;
if (ctx->num) { if (ctx->num) {
unsigned int left = SHA1_BLOCK_SIZE - ctx->num; size_t left = SHA1_BLOCK_SIZE - ctx->num;
if (datalen < left) { if (datalen < left) {
memcpy(ctx->block + ctx->num, data, datalen); memcpy(ctx->block + ctx->num, data, datalen);
ctx->num += datalen; ctx->num += datalen;
@@ -124,10 +124,12 @@ void sha1_update(SHA1_CTX *ctx, const unsigned char *data, size_t datalen)
} }
blocks = datalen / SHA1_BLOCK_SIZE; blocks = datalen / SHA1_BLOCK_SIZE;
sha1_compress_blocks(ctx->state, data, blocks); if (blocks) {
ctx->nblocks += blocks; sha1_compress_blocks(ctx->state, data, blocks);
data += SHA1_BLOCK_SIZE * blocks; ctx->nblocks += blocks;
datalen -= SHA1_BLOCK_SIZE * blocks; data += SHA1_BLOCK_SIZE * blocks;
datalen -= SHA1_BLOCK_SIZE * blocks;
}
ctx->num = datalen; ctx->num = datalen;
if (datalen) { if (datalen) {

12
src/sha256.c
View File

@@ -117,7 +117,7 @@ void sha256_update(SHA256_CTX *ctx, const unsigned char *data, size_t datalen)
ctx->num &= 0x3f; ctx->num &= 0x3f;
if (ctx->num) { if (ctx->num) {
unsigned int left = SHA256_BLOCK_SIZE - ctx->num; size_t left = SHA256_BLOCK_SIZE - ctx->num;
if (datalen < left) { if (datalen < left) {
memcpy(ctx->block + ctx->num, data, datalen); memcpy(ctx->block + ctx->num, data, datalen);
ctx->num += datalen; ctx->num += datalen;
@@ -132,10 +132,12 @@ void sha256_update(SHA256_CTX *ctx, const unsigned char *data, size_t datalen)
} }
blocks = datalen / SHA256_BLOCK_SIZE; blocks = datalen / SHA256_BLOCK_SIZE;
sha256_compress_blocks(ctx->state, data, blocks); if (blocks) {
ctx->nblocks += blocks; sha256_compress_blocks(ctx->state, data, blocks);
data += SHA256_BLOCK_SIZE * blocks; ctx->nblocks += blocks;
datalen -= SHA256_BLOCK_SIZE * blocks; data += SHA256_BLOCK_SIZE * blocks;
datalen -= SHA256_BLOCK_SIZE * blocks;
}
ctx->num = datalen; ctx->num = datalen;
if (datalen) { if (datalen) {

12
src/sha512.c
View File

@@ -36,7 +36,7 @@ void sha512_update(SHA512_CTX *ctx, const unsigned char *data, size_t datalen)
size_t blocks; size_t blocks;
if (ctx->num) { if (ctx->num) {
unsigned int left = SHA512_BLOCK_SIZE - ctx->num; size_t left = SHA512_BLOCK_SIZE - ctx->num;
if (datalen < left) { if (datalen < left) {
memcpy(ctx->block + ctx->num, data, datalen); memcpy(ctx->block + ctx->num, data, datalen);
ctx->num += datalen; ctx->num += datalen;
@@ -51,10 +51,12 @@ void sha512_update(SHA512_CTX *ctx, const unsigned char *data, size_t datalen)
} }
blocks = datalen / SHA512_BLOCK_SIZE; blocks = datalen / SHA512_BLOCK_SIZE;
sha512_compress_blocks(ctx->state, data, blocks); if (blocks) {
ctx->nblocks += blocks; sha512_compress_blocks(ctx->state, data, blocks);
data += SHA512_BLOCK_SIZE * blocks; ctx->nblocks += blocks;
datalen -= SHA512_BLOCK_SIZE * blocks; data += SHA512_BLOCK_SIZE * blocks;
datalen -= SHA512_BLOCK_SIZE * blocks;
}
ctx->num = datalen; ctx->num = datalen;
if (datalen) { if (datalen) {

3
src/sm3.c
View File

@@ -312,10 +312,9 @@ void sm3_update(SM3_CTX *ctx, const uint8_t *data, size_t data_len)
{ {
size_t blocks; size_t blocks;
ctx->num &= 0x3f; ctx->num &= 0x3f;
if (ctx->num) { if (ctx->num) {
unsigned int left = SM3_BLOCK_SIZE - ctx->num; size_t left = SM3_BLOCK_SIZE - ctx->num;
if (data_len < left) { if (data_len < left) {
memcpy(ctx->block + ctx->num, data, data_len); memcpy(ctx->block + ctx->num, data, data_len);
ctx->num += data_len; ctx->num += data_len;