fix a call to cipher_setup & rename passed variable