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

Clean code

Browse Source
This commit is contained in:
Zhi Guan
2024-06-13 12:18:40 +08:00
parent ed6b7f926e
commit 18ac39ebe3
3 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/sm4_cbc.c
View File

@@ -117,7 +117,6 @@ int sm4_cbc_encrypt_update(SM4_CBC_CTX *ctx,
} }
memcpy(ctx->block + ctx->block_nbytes, in, left); memcpy(ctx->block + ctx->block_nbytes, in, left);
sm4_cbc_encrypt_blocks(&ctx->sm4_key, ctx->iv, ctx->block, 1, out); sm4_cbc_encrypt_blocks(&ctx->sm4_key, ctx->iv, ctx->block, 1, out);
//memcpy(ctx->iv, out, SM4_BLOCK_SIZE);
in += left; in += left;
inlen -= left; inlen -= left;
out += SM4_BLOCK_SIZE; out += SM4_BLOCK_SIZE;
@@ -127,10 +126,8 @@ int sm4_cbc_encrypt_update(SM4_CBC_CTX *ctx,
nblocks = inlen / SM4_BLOCK_SIZE; nblocks = inlen / SM4_BLOCK_SIZE;
len = nblocks * SM4_BLOCK_SIZE; len = nblocks * SM4_BLOCK_SIZE;
sm4_cbc_encrypt_blocks(&ctx->sm4_key, ctx->iv, in, nblocks, out); sm4_cbc_encrypt_blocks(&ctx->sm4_key, ctx->iv, in, nblocks, out);
//memcpy(ctx->iv, out + len - SM4_BLOCK_SIZE, SM4_BLOCK_SIZE);
in += len; in += len;
inlen -= len; inlen -= len;
out += len;
*outlen += len; *outlen += len;
} }
if (inlen) { if (inlen) {
@@ -214,7 +211,6 @@ int sm4_cbc_decrypt_update(SM4_CBC_CTX *ctx,
sm4_cbc_decrypt_blocks(&ctx->sm4_key, ctx->iv, in, nblocks, out); sm4_cbc_decrypt_blocks(&ctx->sm4_key, ctx->iv, in, nblocks, out);
in += len; in += len;
inlen -= len; inlen -= len;
out += len;
*outlen += len; *outlen += len;
} }
memcpy(ctx->block, in, inlen); memcpy(ctx->block, in, inlen);

2
src/sm4_ctr.c
View File

@@ -103,7 +103,6 @@ int sm4_ctr_encrypt_update(SM4_CTR_CTX *ctx,
sm4_ctr_encrypt_blocks(&ctx->sm4_key, ctx->ctr, in, nblocks, out); sm4_ctr_encrypt_blocks(&ctx->sm4_key, ctx->ctr, in, nblocks, out);
in += len; in += len;
inlen -= len; inlen -= len;
out += len;
*outlen += len; *outlen += len;
} }
if (inlen) { if (inlen) {
@@ -187,7 +186,6 @@ int sm4_ctr32_encrypt_update(SM4_CTR_CTX *ctx,
sm4_ctr32_encrypt_blocks(&ctx->sm4_key, ctx->ctr, in, nblocks, out); sm4_ctr32_encrypt_blocks(&ctx->sm4_key, ctx->ctr, in, nblocks, out);
in += len; in += len;
inlen -= len; inlen -= len;
out += len;
*outlen += len; *outlen += len;
} }
if (inlen) { if (inlen) {

7
tests/sm4_gcmtest.c
View File

@@ -342,13 +342,12 @@ static int speed_sm4_gcm_encrypt(void)
return 1; return 1;
} }
int main(void) int main(void)
{ {
// if (test_sm4_gcm() != 1) goto err; if (test_sm4_gcm() != 1) goto err;
// if (test_sm4_gcm_gbt36624_1() != 1) goto err; if (test_sm4_gcm_gbt36624_1() != 1) goto err;
if (test_sm4_gcm_gbt36624_2() != 1) goto err; if (test_sm4_gcm_gbt36624_2() != 1) goto err;
// if (test_sm4_gcm_ctx() != 1) goto err; if (test_sm4_gcm_ctx() != 1) goto err;
#if ENABLE_TEST_SPEED #if ENABLE_TEST_SPEED
if (speed_sm4_gcm_encrypt() != 1) goto err; if (speed_sm4_gcm_encrypt() != 1) goto err;
#endif #endif