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

Remove ZUC warnings

Browse Source
This commit is contained in:
Zhi Guan
2022-10-12 15:26:52 +08:00
parent 68e4207b25
commit 50cefed24a
3 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gmssl/zuc.h
View File

@@ -112,7 +112,7 @@ typedef struct ZUC256_MAC_CTX_st {
ZUC_UINT32 T[4]; ZUC_UINT32 T[4];
ZUC_UINT32 K0[4]; ZUC_UINT32 K0[4];
uint8_t buf[4]; uint8_t buf[4];
int buflen; size_t buflen;
int macbits; int macbits;
} ZUC256_MAC_CTX; } ZUC256_MAC_CTX;

28
src/zuc.c
View File

@@ -88,20 +88,20 @@ static const uint8_t S1[256] = {
{int j; for (j=0; j<15;j++) LFSR[j]=LFSR[j+1];} \ {int j; for (j=0; j<15;j++) LFSR[j]=LFSR[j+1];} \
LFSR[15] = V LFSR[15] = V
#define LFSRWithWorkMode() \ #define LFSRWithWorkMode() \
{ \ { \
int j; \ int j; \
uint64_t a = LFSR[0]; \ uint64_t a = LFSR[0]; \
a += ((uint64_t)LFSR[0]) << 8; \ a += ((uint64_t)LFSR[0]) << 8; \
a += ((uint64_t)LFSR[4]) << 20; \ a += ((uint64_t)LFSR[4]) << 20; \
a += ((uint64_t)LFSR[10]) << 21; \ a += ((uint64_t)LFSR[10]) << 21; \
a += ((uint64_t)LFSR[13]) << 17; \ a += ((uint64_t)LFSR[13]) << 17; \
a += ((uint64_t)LFSR[15]) << 15; \ a += ((uint64_t)LFSR[15]) << 15; \
a = (a & 0x7fffffff) + (a >> 31); \ a = (a & 0x7fffffff) + (a >> 31); \
V = (a & 0x7fffffff) + (a >> 31); \ V = (uint32_t)((a & 0x7fffffff) + (a >> 31)); \
for (j = 0; j < 15; j++) \ for (j = 0; j < 15; j++) \
LFSR[j] = LFSR[j+1]; \ LFSR[j] = LFSR[j+1]; \
LFSR[15] = V; \ LFSR[15] = V; \
} }
#define BitReconstruction2(X1,X2) \ #define BitReconstruction2(X1,X2) \

1
src/zuc_modes.c
View File

@@ -131,7 +131,6 @@ int zuc_encrypt_update(ZUC_CTX *ctx, const uint8_t *in, size_t inlen, uint8_t *o
int zuc_encrypt_finish(ZUC_CTX *ctx, uint8_t *out, size_t *outlen) int zuc_encrypt_finish(ZUC_CTX *ctx, uint8_t *out, size_t *outlen)
{ {
size_t left;
if (ctx->block_nbytes >= ZUC_BLOCK_SIZE) { if (ctx->block_nbytes >= ZUC_BLOCK_SIZE) {
error_print(); error_print();
return -1; return -1;