From: Micah Elizabeth Scott Date: Wed, 24 May 2023 20:20:58 +0000 (-0700) Subject: hashx: minor, another logical operator change X-Git-Tag: tor-0.4.8.1-alpha~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=941613c663785aaa401b723671bb8023cbb29eab;p=thirdparty%2Ftor.git hashx: minor, another logical operator change The code style in equix and hashx sometimes uses bitwise operators in place of logical ones in cases where it doesn't really matter either way. This sometimes annoys our static analyzer tools. Signed-off-by: Micah Elizabeth Scott --- diff --git a/src/ext/equix/hashx/src/program.c b/src/ext/equix/hashx/src/program.c index f144ce14a0..b44bdb855a 100644 --- a/src/ext/equix/hashx/src/program.c +++ b/src/ext/equix/hashx/src/program.c @@ -712,8 +712,8 @@ bool hashx_program_generate(const siphash_state* key, hashx_program* program) { /* reject programs that don't meet the uniform complexity requirements */ /* this happens in less than 1 seed out of 10000 */ return - (program->code_size == REQUIREMENT_SIZE) & - (ctx.mul_count == REQUIREMENT_MUL_COUNT) & + (program->code_size == REQUIREMENT_SIZE) && + (ctx.mul_count == REQUIREMENT_MUL_COUNT) && (ctx.latency == REQUIREMENT_LATENCY - 1); /* cycles are numbered from 0 */ }