summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeffrey Walton <noloader@gmail.com>2021-03-21 08:06:10 -0400
committerJeffrey Walton <noloader@gmail.com>2021-03-21 08:06:10 -0400
commitce8d243bf1e79078c8fde1a107c0a99ae2ebbd79 (patch)
tree1bc25b7fd461b3a2aab29e49af01ac73a4d0f51f
parentd8ccda751207cdea23e78fd17782e801e4a478d0 (diff)
downloadcryptopp-git-ce8d243bf1e79078c8fde1a107c0a99ae2ebbd79.tar.gz
Clear Clang warnings
-rw-r--r--strciphr.cpp2
-rw-r--r--validat8.cpp12
2 files changed, 10 insertions, 4 deletions
diff --git a/strciphr.cpp b/strciphr.cpp
index 9fd834b2..e43bc884 100644
--- a/strciphr.cpp
+++ b/strciphr.cpp
@@ -123,6 +123,7 @@ void AdditiveCipherTemplate<S>::ProcessData(byte *outString, const byte *inStrin
const unsigned int alignment = policy.GetAlignment();
const bool inAligned = IsAlignedOn(inString, alignment);
const bool outAligned = IsAlignedOn(outString, alignment);
+ CRYPTOPP_UNUSED(inAligned); CRYPTOPP_UNUSED(outAligned);
if (policy.CanOperateKeystream() && length >= bytesPerIteration)
{
@@ -266,6 +267,7 @@ void CFB_CipherTemplate<BASE>::ProcessData(byte *outString, const byte *inString
const unsigned int alignment = policy.GetAlignment();
const bool inAligned = IsAlignedOn(inString, alignment);
const bool outAligned = IsAlignedOn(outString, alignment);
+ CRYPTOPP_UNUSED(inAligned); CRYPTOPP_UNUSED(outAligned);
if (policy.CanIterate() && length >= bytesPerIteration && outAligned)
{
diff --git a/validat8.cpp b/validat8.cpp
index ef4bd389..0e7d2047 100644
--- a/validat8.cpp
+++ b/validat8.cpp
@@ -173,13 +173,15 @@ bool ValidateRSA_Encrypt()
RSAES_PKCS1v15_Decryptor rsaPriv(keys);
RSAES_PKCS1v15_Encryptor rsaPub(rsaPriv);
- pass = CryptoSystemValidate(rsaPriv, rsaPub) && pass;
+ fail = !CryptoSystemValidate(rsaPriv, rsaPub);
+ pass = pass && !fail;
}
{
RSAES<OAEP<SHA1> >::Decryptor rsaPriv(GlobalRNG(), 512);
RSAES<OAEP<SHA1> >::Encryptor rsaPub(rsaPriv);
- pass = CryptoSystemValidate(rsaPriv, rsaPub) && pass;
+ fail = !CryptoSystemValidate(rsaPriv, rsaPub);
+ pass = pass && !fail;
}
{
const byte plain[] =
@@ -287,7 +289,8 @@ bool ValidateLUC_Encrypt()
LUCES_OAEP_SHA_Decryptor priv(GlobalRNG(), 512);
LUCES_OAEP_SHA_Encryptor pub(priv);
- pass = CryptoSystemValidate(priv, pub) && pass;
+ fail = !CryptoSystemValidate(priv, pub);
+ pass = pass && !fail;
return pass;
}
@@ -375,7 +378,8 @@ bool ValidateRabin_Encrypt()
FileSource f(DataDir("TestData/rabi1024.dat").c_str(), true, new HexDecoder);
RabinES<OAEP<SHA1> >::Decryptor priv(f);
RabinES<OAEP<SHA1> >::Encryptor pub(priv);
- pass = CryptoSystemValidate(priv, pub) && pass;
+ fail = !CryptoSystemValidate(priv, pub);
+ pass = pass && !fail;
return pass;
}