Merge pull request #1031 from gilles-peskine-arm/cmac-blksize_max