Ross-Kitsis/CAH-MAC2

Re-implementation of CAH-MAC