From eaafd4206e7b3e5240ebe8362ed565351a45fc3d Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Wed, 1 Jun 2016 01:27:53 -0400
Subject: [PATCH] Change "result=false" to "return fals". There's no sense in
 trying the instruction if we can't catch the SIGILL or we can't restore
 SIGMASK state

---
 cpu.cpp | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/cpu.cpp b/cpu.cpp
index 52a69b24..7c39cccd 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -99,11 +99,11 @@ bool CpuId(word32 input, word32 output[4])
 
 	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerCPUID);
 	if (oldHandler == SIG_ERR)
-		result = false;
+		return false;
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoCPUID))
 		result = false;
@@ -162,10 +162,10 @@ static bool TrySSE2()
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoSSE2))
-		result = true;
+		result = false;
 	else
 	{
 #if CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE
@@ -397,11 +397,11 @@ static bool TryNEON()
 
 	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerNEON);
 	if (oldHandler == SIG_ERR)
-		result = false;
+		return false;
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoNEON))
 		result = false;
@@ -458,11 +458,11 @@ static bool TryCRC32()
 
 	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerCRC32);
 	if (oldHandler == SIG_ERR)
-		result = false;
+		return false;
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoCRC32))
 		result = false;
@@ -512,11 +512,11 @@ static bool TryAES()
 
 	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerAES);
 	if (oldHandler == SIG_ERR)
-		result = false;
+		return false;
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoAES))
 		result = false;
@@ -568,11 +568,11 @@ static bool TrySHA1()
 
 	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSHA1);
 	if (oldHandler == SIG_ERR)
-		result = false;
+		return false;
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoSHA1))
 		result = false;
@@ -627,11 +627,11 @@ static bool TrySHA2()
 
 	volatile SigHandler oldHandler = signal(SIGILL, SigIllHandlerSHA2);
 	if (oldHandler == SIG_ERR)
-		result = false;
+		return false;
 
 	volatile sigset_t oldMask;
 	if (sigprocmask(0, NULL, (sigset_t*)&oldMask))
-		result = false;
+		return false;
 
 	if (setjmp(s_jmpNoSHA2))
 		result = false;