diff options
| author | Jeffrey Walton <noloader@gmail.com> | 2018-12-26 19:50:51 -0500 |
|---|---|---|
| committer | Jeffrey Walton <noloader@gmail.com> | 2018-12-26 19:50:51 -0500 |
| commit | 1fc26dc14c8fb4a51515b6f6a146baa59238cf90 (patch) | |
| tree | 8df6d357116215bd3b6b2cbe1abbee7751106a32 /xed25519.cpp | |
| parent | 5202b6312ff2629891509583394f69fba887144e (diff) | |
| download | cryptopp-git-1fc26dc14c8fb4a51515b6f6a146baa59238cf90.tar.gz | |
Cleanup Validate tests
Diffstat (limited to 'xed25519.cpp')
| -rw-r--r-- | xed25519.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/xed25519.cpp b/xed25519.cpp index 781d5ca1..d9eae90a 100644 --- a/xed25519.cpp +++ b/xed25519.cpp @@ -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;
|