shadps4-emu/ext-cryptopp
1
0
Fork 0
mirror of https://github.com/shadps4-emu/ext-cryptopp.git synced 2025-02-17 03:48:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Guard increment of inBlock in CTR_ModePolicy::OperateKeystream

Browse Source
This commit is contained in:
Jeffrey Walton 2023-09-29 02:41:45 -04:00
parent c6a16ea573
commit b08f72c3e4
No known key found for this signature in database
GPG Key ID: B36AB348921B1838
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modes.cpp
View File

@ -5,6 +5,7 @@
#ifndef CRYPTOPP_IMPORTS
#include "modes.h"
#include "strciphr.h"
#include "misc.h"
#if defined(CRYPTOPP_DEBUG)
@ -137,25 +138,29 @@ void CTR_ModePolicy::IncrementCounterBy256()
IncrementCounterByOne(m_counterArray, BlockSize()-1);
}
void CTR_ModePolicy::OperateKeystream(KeystreamOperation /*operation*/, byte *output, const byte *input, size_t iterationCount)
void CTR_ModePolicy::OperateKeystream(KeystreamOperation operation, byte *output, const byte *input, size_t iterationCount)
{
CRYPTOPP_ASSERT(output);
// CRYPTOPP_ASSERT(input); // input is sometimes NULL
CRYPTOPP_ASSERT(m_cipher->IsForwardTransformation());
CRYPTOPP_ASSERT(m_counterArray.size() == BlockSize());
CRYPTOPP_UNUSED(operation);
const unsigned int s = BlockSize();
const unsigned int inputIncrement = input ? s : 0;
const size_t s = BlockSize();
while (iterationCount)
{
const byte lsb = m_counterArray[s-1];
const size_t blocks = UnsignedMin(iterationCount, 256U-lsb);
const size_t blocks = UnsignedMin(iterationCount, 256u-lsb);
const size_t outIncrement = output ? blocks*s : 0;
const size_t inIncrement = input ? blocks*s : 0;
m_cipher->AdvancedProcessBlocks(m_counterArray, input, output, blocks*s, BlockTransformation::BT_InBlockIsCounter|BlockTransformation::BT_AllowParallel);
if ((m_counterArray[s-1] = byte(lsb + blocks)) == 0)
if ((m_counterArray[s-1] = static_cast<byte>(lsb + blocks)) == 0)
IncrementCounterBy256();
output = PtrAdd(output, blocks*s);
input = PtrAdd(input, blocks*inputIncrement);
output = PtrAdd(output, outIncrement);
input = PtrAdd(input, inIncrement);
iterationCount -= blocks;
}
}