diff --git a/src/sm4_cbc.c b/src/sm4_cbc.c index 2349153c..3a833f7a 100644 --- a/src/sm4_cbc.c +++ b/src/sm4_cbc.c @@ -117,7 +117,6 @@ int sm4_cbc_encrypt_update(SM4_CBC_CTX *ctx, } memcpy(ctx->block + ctx->block_nbytes, in, left); sm4_cbc_encrypt_blocks(&ctx->sm4_key, ctx->iv, ctx->block, 1, out); - //memcpy(ctx->iv, out, SM4_BLOCK_SIZE); in += left; inlen -= left; out += SM4_BLOCK_SIZE; @@ -127,10 +126,8 @@ int sm4_cbc_encrypt_update(SM4_CBC_CTX *ctx, nblocks = inlen / SM4_BLOCK_SIZE; len = nblocks * SM4_BLOCK_SIZE; 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; inlen -= len; - out += len; *outlen += len; } 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); in += len; inlen -= len; - out += len; *outlen += len; } memcpy(ctx->block, in, inlen); diff --git a/src/sm4_ctr.c b/src/sm4_ctr.c index d4a312a1..e0a0f9fa 100644 --- a/src/sm4_ctr.c +++ b/src/sm4_ctr.c @@ -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); in += len; inlen -= len; - out += len; *outlen += len; } 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); in += len; inlen -= len; - out += len; *outlen += len; } if (inlen) { diff --git a/tests/sm4_gcmtest.c b/tests/sm4_gcmtest.c index ffba235b..b55ad54a 100644 --- a/tests/sm4_gcmtest.c +++ b/tests/sm4_gcmtest.c @@ -342,13 +342,12 @@ static int speed_sm4_gcm_encrypt(void) return 1; } - int main(void) { -// if (test_sm4_gcm() != 1) goto err; -// if (test_sm4_gcm_gbt36624_1() != 1) goto err; + if (test_sm4_gcm() != 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_ctx() != 1) goto err; + if (test_sm4_gcm_ctx() != 1) goto err; #if ENABLE_TEST_SPEED if (speed_sm4_gcm_encrypt() != 1) goto err; #endif