1
1
mirror of https://github.com/henrydcase/pqc.git synced 2024-11-22 15:39:07 +00:00

Fix SHAKE256 memory leak in Dilithium (#271)

This commit is contained in:
Thom Wiggers 2020-02-16 16:18:05 +01:00 committed by Kris Kwiatkowski
parent 07db9c1e60
commit b6b4c7d8ed
6 changed files with 12 additions and 0 deletions

View File

@ -201,6 +201,7 @@ int PQCLEAN_DILITHIUM2_AVX2_crypto_sign_signature(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
crh(rhoprime, key, SEEDBYTES + CRHBYTES); crh(rhoprime, key, SEEDBYTES + CRHBYTES);
@ -350,6 +351,7 @@ int PQCLEAN_DILITHIUM2_AVX2_crypto_sign_verify(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
/* Matrix-vector multiplication; compute Az - c2^dt1 */ /* Matrix-vector multiplication; compute Az - c2^dt1 */
PQCLEAN_DILITHIUM2_AVX2_expand_mat(mat, rho); PQCLEAN_DILITHIUM2_AVX2_expand_mat(mat, rho);

View File

@ -192,6 +192,7 @@ int PQCLEAN_DILITHIUM2_CLEAN_crypto_sign_signature(
shake256_inc_absorb(&state, msg, mlen); shake256_inc_absorb(&state, msg, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
crh(rhoprime, key, SEEDBYTES + CRHBYTES); crh(rhoprime, key, SEEDBYTES + CRHBYTES);
@ -341,6 +342,7 @@ int PQCLEAN_DILITHIUM2_CLEAN_crypto_sign_verify(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
/* Matrix-vector multiplication; compute Az - c2^dt1 */ /* Matrix-vector multiplication; compute Az - c2^dt1 */
PQCLEAN_DILITHIUM2_CLEAN_expand_mat(mat, rho); PQCLEAN_DILITHIUM2_CLEAN_expand_mat(mat, rho);

View File

@ -214,6 +214,7 @@ int PQCLEAN_DILITHIUM3_AVX2_crypto_sign_signature(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
crh(rhoprime, key, SEEDBYTES + CRHBYTES); crh(rhoprime, key, SEEDBYTES + CRHBYTES);
@ -363,6 +364,7 @@ int PQCLEAN_DILITHIUM3_AVX2_crypto_sign_verify(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
/* Matrix-vector multiplication; compute Az - c2^dt1 */ /* Matrix-vector multiplication; compute Az - c2^dt1 */
PQCLEAN_DILITHIUM3_AVX2_expand_mat(mat, rho); PQCLEAN_DILITHIUM3_AVX2_expand_mat(mat, rho);

View File

@ -192,6 +192,7 @@ int PQCLEAN_DILITHIUM3_CLEAN_crypto_sign_signature(
shake256_inc_absorb(&state, msg, mlen); shake256_inc_absorb(&state, msg, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
crh(rhoprime, key, SEEDBYTES + CRHBYTES); crh(rhoprime, key, SEEDBYTES + CRHBYTES);
@ -341,6 +342,7 @@ int PQCLEAN_DILITHIUM3_CLEAN_crypto_sign_verify(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
/* Matrix-vector multiplication; compute Az - c2^dt1 */ /* Matrix-vector multiplication; compute Az - c2^dt1 */
PQCLEAN_DILITHIUM3_CLEAN_expand_mat(mat, rho); PQCLEAN_DILITHIUM3_CLEAN_expand_mat(mat, rho);

View File

@ -230,6 +230,7 @@ int PQCLEAN_DILITHIUM4_AVX2_crypto_sign_signature(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
crh(rhoprime, key, SEEDBYTES + CRHBYTES); crh(rhoprime, key, SEEDBYTES + CRHBYTES);
@ -380,6 +381,7 @@ int PQCLEAN_DILITHIUM4_AVX2_crypto_sign_verify(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
/* Matrix-vector multiplication; compute Az - c2^dt1 */ /* Matrix-vector multiplication; compute Az - c2^dt1 */
PQCLEAN_DILITHIUM4_AVX2_expand_mat(mat, rho); PQCLEAN_DILITHIUM4_AVX2_expand_mat(mat, rho);

View File

@ -192,6 +192,7 @@ int PQCLEAN_DILITHIUM4_CLEAN_crypto_sign_signature(
shake256_inc_absorb(&state, msg, mlen); shake256_inc_absorb(&state, msg, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
crh(rhoprime, key, SEEDBYTES + CRHBYTES); crh(rhoprime, key, SEEDBYTES + CRHBYTES);
@ -341,6 +342,7 @@ int PQCLEAN_DILITHIUM4_CLEAN_crypto_sign_verify(
shake256_inc_absorb(&state, m, mlen); shake256_inc_absorb(&state, m, mlen);
shake256_inc_finalize(&state); shake256_inc_finalize(&state);
shake256_inc_squeeze(mu, CRHBYTES, &state); shake256_inc_squeeze(mu, CRHBYTES, &state);
shake256_inc_ctx_release(&state);
/* Matrix-vector multiplication; compute Az - c2^dt1 */ /* Matrix-vector multiplication; compute Az - c2^dt1 */
PQCLEAN_DILITHIUM4_CLEAN_expand_mat(mat, rho); PQCLEAN_DILITHIUM4_CLEAN_expand_mat(mat, rho);