cleaned up tomcrypt interface