Fix nxpkeydiversification and review of the CMAC code (RFC 4493)