mirror of
https://github.com/jedisct1/libsodium.git
synced 2024-12-19 18:15:18 -07:00
(p1 - p2 == 0) => (p1 == p2)
No binary changes on supported platforms except on gcc/armv7l where the control flow remains identical but permutative statements get switched.
This commit is contained in:
parent
4a0e7cfc57
commit
f61e179d8e
@ -6,6 +6,6 @@ int crypto_auth_verify(const unsigned char *h,const unsigned char *in,unsigned l
|
||||
{
|
||||
unsigned char correct[32];
|
||||
crypto_auth(correct,in,inlen,k);
|
||||
return crypto_verify_32(h,correct) | (-(h - correct == 0)) |
|
||||
return crypto_verify_32(h,correct) | (-(h == correct)) |
|
||||
sodium_memcmp(correct,h,32);
|
||||
}
|
||||
|
@ -7,6 +7,6 @@ int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
|
||||
{
|
||||
unsigned char correct[64];
|
||||
crypto_auth(correct,in,inlen,k);
|
||||
return crypto_verify_64(h,correct) | (-(h - correct == 0)) |
|
||||
return crypto_verify_64(h,correct) | (-(h == correct)) |
|
||||
sodium_memcmp(correct,h,64);
|
||||
}
|
||||
|
@ -7,6 +7,6 @@ int crypto_auth_verify(const unsigned char *h, const unsigned char *in,
|
||||
{
|
||||
unsigned char correct[32];
|
||||
crypto_auth(correct,in,inlen,k);
|
||||
return crypto_verify_32(h,correct) | (-(h - correct == 0)) |
|
||||
return crypto_verify_32(h,correct) | (-(h == correct)) |
|
||||
sodium_memcmp(correct,h,32);
|
||||
}
|
||||
|
@ -43,7 +43,7 @@ crypto_sign_verify_detached(const unsigned char *sig, const unsigned char *m,
|
||||
ge_double_scalarmult_vartime(&R, h, &A, sig + 32);
|
||||
ge_tobytes(rcheck, &R);
|
||||
|
||||
return crypto_verify_32(rcheck, sig) | (-(rcheck - sig == 0)) |
|
||||
return crypto_verify_32(rcheck, sig) | (-(rcheck == sig)) |
|
||||
sodium_memcmp(sig, rcheck, 32);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user