Update SM4 AEAD

This commit is contained in:
Zhi Guan
2023-02-14 09:06:59 +08:00
parent 828da359dc
commit acd50a83d0
3 changed files with 91 additions and 59 deletions

View File

@@ -272,6 +272,15 @@ int sm4_ctr_sm3_hmac_decrypt_finish(SM4_CTR_SM3_HMAC_CTX *ctx, uint8_t *out, siz
return 1;
}
static void ctr_incr(uint8_t a[16])
{
int i;
for (i = 15; i >= 0; i--) {
a[i]++;
if (a[i]) break;
}
}
int sm4_gcm_encrypt_init(SM4_GCM_CTX *ctx,
const uint8_t key[SM4_KEY_SIZE], const uint8_t *iv, size_t ivlen,
const uint8_t *aad, size_t aadlen, size_t taglen)
@@ -304,10 +313,11 @@ int sm4_gcm_encrypt_init(SM4_GCM_CTX *ctx,
ghash(H, NULL, 0, iv, ivlen, Y);
}
memcpy(ctx->enc_ctx.ctr, Y, 16);
sm4_encrypt(&ctx->enc_ctx.sm4_key, Y, ctx->Y);
ctr_incr(Y);
memcpy(ctx->enc_ctx.ctr, Y, 16);
gmssl_secure_clear(H, sizeof(H));
gmssl_secure_clear(Y, sizeof(Y));
return 1;
@@ -423,37 +433,3 @@ int sm4_gcm_decrypt_finish(SM4_GCM_CTX *ctx, uint8_t *out, size_t *outlen)
ctx->maclen = 0;
return 1;
}
int zuc_with_mac_encrypt_init(ZUC_WITH_MAC_CTX *ctx,
const uint8_t key[ZUC_KEY_SIZE], const uint8_t iv[ZUC_IV_SIZE],
const uint8_t *aad, size_t aadlen)
{
return -1;
}
int zuc_with_mac_encrypt_update(ZUC_WITH_MAC_CTX *ctx, const uint8_t *in, size_t inlen, uint8_t *out, size_t *outlen)
{
return -1;
}
int zuc_with_mac_encrypt_finish(ZUC_WITH_MAC_CTX *ctx, uint8_t *out, size_t *outlen)
{
return -1;
}
int zuc_with_mac_decrypt_init(ZUC_WITH_MAC_CTX *ctx,
const uint8_t key[ZUC_KEY_SIZE], const uint8_t iv[ZUC_IV_SIZE],
const uint8_t *aad, size_t aadlen)
{
return -1;
}
int zuc_with_mac_decrypt_update(ZUC_WITH_MAC_CTX *ctx, const uint8_t *in, size_t inlen, uint8_t *out, size_t *outlen)
{
return -1;
}
int zuc_with_mac_decrypt_finish(ZUC_WITH_MAC_CTX *ctx, uint8_t *out, size_t *outlen)
{
return -1;
}