cleanup Signed-off-by: Riccardo Schirone <sirmy15@gmail.com>
Also add aes-cbc support by getting IV from user