- fix CCryptoManager::DecryptSessionData() overwriting first data block, if to be decrypted data is larger than a single block (#255)

Luke1410 · Luke1410 · commit e67c8fd64f66 · 2019-09-03T23:19:13.000+02:00
diff --git a/Source/src/crypto/cryptomanager.cpp b/Source/src/crypto/cryptomanager.cpp
@@ -123,7 +123,7 @@ namespace SLNet
 				}
 				RakAssert(static_cast<size_t>(bytesWritten1) <= inOutBufferSize);
 				int bytesWritten2;
-				if (EVP_DecryptFinal_ex(&m_decryptionContext, outBuffer, &bytesWritten2) == 0) {
+				if (EVP_DecryptFinal_ex(&m_decryptionContext, outBuffer + bytesWritten1, &bytesWritten2) == 0) {
 					return false; // failed final decryption step
 				}
 				RakAssert(static_cast<size_t>(bytesWritten1) + static_cast<size_t>(bytesWritten2) <= inOutBufferSize);

Original file line number	Diff line number	Diff line change
`@@ -123,7 +123,7 @@ namespace SLNet`
`123`	`123`	`}`
`124`	`124`	`RakAssert(static_cast<size_t>(bytesWritten1) <= inOutBufferSize);`
`125`	`125`	`int bytesWritten2;`
`126`		`- if (EVP_DecryptFinal_ex(&m_decryptionContext, outBuffer, &bytesWritten2) == 0) {`
	`126`	`+ if (EVP_DecryptFinal_ex(&m_decryptionContext, outBuffer + bytesWritten1, &bytesWritten2) == 0) {`
`127`	`127`	`return false; // failed final decryption step`
`128`	`128`	`}`
`129`	`129`	`RakAssert(static_cast<size_t>(bytesWritten1) + static_cast<size_t>(bytesWritten2) <= inOutBufferSize);`