On Mon, Jun 17, 2019 at 10:18:48AM +0200, Ard Biesheuvel wrote: > The wusb code takes a very peculiar approach at implementing CBC-MAC, > by using plain CBC into a scratch buffer, and taking the output IV > as the MAC. > > We can clean up this code substantially by switching to the cbcmac > shash, as exposed by the CCM template. To ensure that the module is > loaded on demand, add the cbcmac template name as a module alias. > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > --- > v4: - update Kconfig dependencies accordingly (and fix whitespace) > v3: - add missing #include to fix build error spotted by kbuild test robot > v2: - use finup()/digest() where possible, and process b0+b1 using a single > call to update() > - make 'stv_hsmic_hs' static const and remove comment regarding GCC 4.1 > > NOTE: I don't have any hardware to test this, but the built-in selftest > still passes. > > crypto/ccm.c | 1 + > drivers/usb/wusbcore/Kconfig | 8 +- > drivers/usb/wusbcore/crypto.c | 169 +++++--------------- > 3 files changed, 48 insertions(+), 130 deletions(-) I've queued this up in the usb-next tree now, thanks. greg k-h