diff options
| author | Todd Short <tshort@akamai.com> | 2017-02-28 09:04:29 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-28 09:32:41 -0500 |
| commit | 2722ff506de5cbdf68ca39c233ddb6e2fc15aa37 (patch) | |
| tree | 9e15b7825a77ffda7744a059db7c13b68d32d069 /crypto | |
| parent | 14097b6a9263a40615a5c4cbf3fe808b1a14ffde (diff) | |
Remove some #if 0 code in ssl, crypto/bio
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2781)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/bio/bss_conn.c | 10 |
1 files changed, 1 insertions, 9 deletions
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: { |