KNF and other cleanup.
-Werror build fixes for aes_wrap.c

 include string.h for memcmp
 remove unused variables