From 2722ff506de5cbdf68ca39c233ddb6e2fc15aa37 Mon Sep 17 00:00:00 2001 From: Todd Short Date: Tue, 28 Feb 2017 09:04:29 -0500 Subject: Remove some #if 0 code in ssl, crypto/bio Reviewed-by: Richard Levitte Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/2781) --- crypto/bio/bss_conn.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) (limited to 'crypto') diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c index ddbc8967f6..5562efaa3b 100644 --- a/crypto/bio/bss_conn.c +++ b/crypto/bio/bss_conn.c @@ -478,15 +478,7 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) } break; case BIO_CTRL_SET_CALLBACK: - { -# if 0 /* FIXME: Should this be used? -- Richard - * Levitte */ - BIOerr(BIO_F_CONN_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED); - ret = -1; -# else - ret = 0; -# endif - } + ret = 0; /* use callback ctrl */ break; case BIO_CTRL_GET_CALLBACK: { -- cgit v1.2.3