Cleanup Validate tests

pull/769/head
Jeffrey Walton 2018-12-26 19:50:51 -05:00
parent 5202b6312f
commit 1fc26dc14c
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 10 additions and 6 deletions

View File

@ -268,10 +268,12 @@ bool x25519::Validate(RandomNumberGenerator &rng, unsigned int level) const
{
SecByteBlock sk(m_sk, SECRET_KEYLENGTH), pk(PUBLIC_KEYLENGTH);
ClampKeys(pk, sk);
if (VerifyBufsEqual(pk, m_pk, PUBLIC_KEYLENGTH) == false || VerifyBufsEqual(sk, m_sk, SECRET_KEYLENGTH) == false)
{
bool equal = true;
equal &= VerifyBufsEqual(pk, m_pk, PUBLIC_KEYLENGTH);
equal &= VerifyBufsEqual(sk, m_sk, SECRET_KEYLENGTH);
if (equal == false)
return false;
}
}
return true;
@ -393,10 +395,12 @@ bool ed25519PrivateKey::Validate(RandomNumberGenerator &rng, unsigned int level)
{
SecByteBlock sk(m_sk, SECRET_KEYLENGTH), pk(PUBLIC_KEYLENGTH);
ClampKeys(pk, sk);
if (VerifyBufsEqual(pk, m_pk, PUBLIC_KEYLENGTH) == false || VerifyBufsEqual(sk, m_sk, SECRET_KEYLENGTH) == false)
{
bool equal = true;
equal &= VerifyBufsEqual(pk, m_pk, PUBLIC_KEYLENGTH);
equal &= VerifyBufsEqual(sk, m_sk, SECRET_KEYLENGTH);
if (equal == false)
return false;
}
}
return true;