Due to short-circuiting we only need to check "cipher" for NULL once.

PR#699
Reviewed-by: NRichard Levitte <levitte@openssl.org>