From 1fc26dc14c8fb4a51515b6f6a146baa59238cf90 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 26 Dec 2018 19:50:51 -0500
Subject: [PATCH] Cleanup Validate tests

---
 xed25519.cpp | 16 ++++++++++------
 1 file 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;