Merge pull request #3640 from AndrzejKurek/fi-hash-instead-of-crc

Swap out CRC calculation in AES in favour of a simple hash