SSH connection stopped working with AES-CBC mode

Before adding CTR support for AES I was able to connect to remote hosts with CBC. Now with the new code (4.7.1) I can connect with CTR mode but connection with CBC mode stopped working.

 

Bad decrypted length in SshIncomingPacket::calculateLength() as shown in log attached.

 

A simple workaround I performed was to replace the new code with the old one:

classes SshEncryptionFacility and SshDecryptionFacility:

function makeCipherMode:

switch (mode) {
case CbcMode:

{ //old code: CBC_Encryption *cbc = new CBC_Encryption(cipher, new Null_Padding); Cipher_Mode_Filter *filter = new Cipher_Mode_Filter(cbc); filter->set_iv(iv); filter->set_key(key); return filter;   //commenting the new code: // return get_cipher(cipher->name() + "/CBC/NoPadding", key, iv, ENCRYPTION); }

case CtrMode:
return makeCtrCipherMode(cipher, iv, key);
}

After that, both CBC and CTR modes work successfully.