Skip to content

Commit 7f05ffa

Browse files
robntonyhutter
authored andcommitted
gcm_avx_init: zero the ghash state after hashing the IV
IVs != 96 bits get hashed with GHASH to bring them to 96 bits. Any call to GHASH will mix the ghash state in gcm_ghash. This is expected to be zero at first use in an encrypt or decrypt operation, so it needs to be zeroed after using GHASH in setup. gcm_init() does this, but gcm_avx_init() zeroed it before setup, not after, resulting in incorrect encrypt/decrypt results when using AVX GCM with an IV != 96 bits. OpenZFS _always_ uses a 96 bit IV (ZIO_DATA_IV_LEN) so this will never have been hit in any real-world use, which is extremely fortunate, as we would have incorrectly-encrypted data on-disk. Still, as long as we have this code here we should make sure it's correct. Thanks-to: Joel Low <[email protected]> Sponsored-by: https://despairlabs.com/sponsor/ Signed-off-by: Rob Norris <[email protected]> Reviewed-by: Tony Hutter <[email protected]> Reviewed-by: Tino Reichardt <[email protected]> Reviewed-by: Attila Fülöp <[email protected]>
1 parent 88b0594 commit 7f05ffa

File tree

1 file changed

+2
-1
lines changed
  • module/icp/algs/modes

1 file changed

+2
-1
lines changed

module/icp/algs/modes/gcm.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1426,7 +1426,6 @@ gcm_init_avx(gcm_ctx_t *ctx, const uint8_t *iv, size_t iv_len,
14261426
B_FALSE);
14271427

14281428
/* Init H (encrypt zero block) and create the initial counter block. */
1429-
memset(ctx->gcm_ghash, 0, sizeof (ctx->gcm_ghash));
14301429
memset(H, 0, sizeof (ctx->gcm_H));
14311430
kfpu_begin();
14321431
aes_encrypt_intel(keysched, aes_rounds,
@@ -1455,6 +1454,8 @@ gcm_init_avx(gcm_ctx_t *ctx, const uint8_t *iv, size_t iv_len,
14551454
kfpu_begin();
14561455
}
14571456

1457+
memset(ctx->gcm_ghash, 0, sizeof (ctx->gcm_ghash));
1458+
14581459
/* Openssl post increments the counter, adjust for that. */
14591460
gcm_incr_counter_block(ctx);
14601461

0 commit comments

Comments
 (0)