Add CRYPTOPP_ASSERT (Issue 277, CVE-2016-7420)

trap.h and CRYPTOPP_ASSERT has existed for over a year in Master. We deferred on the cut-over waiting for a minor version bump (5.7). We have to use it now due to CVE-2016-7420

1 files changed, 2 insertions, 2 deletions

diff --git a/socketft.h b/socketft.h
index 61592834..2ebee4db 100644
--- a/socketft.h
+++ b/socketft.h
@@ -94,7 +94,7 @@ public:
 		{if (result == static_cast<socket_t>(SOCKET_ERROR)) HandleError(operation);}

 #ifdef USE_WINDOWS_STYLE_SOCKETS

 	void CheckAndHandleError(const char *operation, BOOL result) const

-		{assert(result==TRUE || result==FALSE); if (!result) HandleError(operation);}

+		{CRYPTOPP_ASSERT(result==TRUE || result==FALSE); if (!result) HandleError(operation);}

 	void CheckAndHandleError(const char *operation, bool result) const

 		{if (!result) HandleError(operation);}

 #endif

@@ -121,7 +121,7 @@ class SocketsInitializer
 {

 public:

 	SocketsInitializer() {Socket::StartSockets();}

-	~SocketsInitializer() {try {Socket::ShutdownSockets();} catch (const Exception&) {assert(0);}}

+	~SocketsInitializer() {try {Socket::ShutdownSockets();} catch (const Exception&) {CRYPTOPP_ASSERT(0);}}

 };

 

 class SocketReceiver : public NetworkReceiver