firebird/firebird-mirror
firebird/firebird-mirror
8
0
Fork 1
mirror of https://github.com/FirebirdSQL/firebird.git synced 2025-02-02 10:00:38 +01:00
Code Issues

Fixed #7065: Connection hangs after delivery of 2**32 - 1 packets

Browse Source
This commit is contained in:
AlexPeshkoff 2021-12-12 20:29:22 +03:00
parent 0df93174c5
commit eed81bac03
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/plugins/crypt/chacha/ChaCha.cpp
View File

@ -87,8 +87,8 @@ private:
class ChaCha FB_FINAL : public StdPlugin<IWireCryptPluginImpl<ChaCha, CheckStatusWrapper> >
{
public:
explicit ChaCha(IPluginConfig*)
: en(NULL), de(NULL), iv(getPool())
explicit ChaCha(IPluginConfig* cfg)
: en(NULL), de(NULL), iv(getPool()), pluginConfig(cfg)
{ }
// ICryptPlugin implementation
@ -103,6 +103,7 @@ private:
Cipher* createCypher(unsigned int l, const void* key);
AutoPtr<Cipher> en, de;
UCharBuffer iv;
RefPtr<IPluginConfig> pluginConfig;
};
void ChaCha::setKey(CheckStatusWrapper* status, ICryptKey* key)
@ -157,9 +158,22 @@ const char* ChaCha::getKnownTypes(CheckStatusWrapper* status)
const unsigned char* ChaCha::getSpecificData(CheckStatusWrapper* status, const char*, unsigned* len)
{
*len = 16;
GenerateRandomBytes(iv.getBuffer(*len), 12);
iv[12] = iv[13] = iv[14] = iv[15] = 0;
RefPtr<IConfig> config(pluginConfig->getDefaultConfig(status));
check(status);
RefPtr<IConfigEntry> entry(config->find(status, "CounterSize"));
check(status);
if (entry.hasData())
*len = entry->getIntValue() == 32 ? 16 : 8;
else
*len = 8;
if (*len == 16)
{
GenerateRandomBytes(iv.getBuffer(16), 12);
iv[12] = iv[13] = iv[14] = iv[15] = 0;
}
else
GenerateRandomBytes(iv.getBuffer(8), 8);
return iv.begin();
}