Merge pull request #4705 from ronald-cron-arm/3258_implement_one-shot_MAC_2.x

Backport 2.x: Implement one-shot mac in PSA