Restore old CMAC* implementation that wasn't added when adding the patch