From 2722ff506de5cbdf68ca39c233ddb6e2fc15aa37 Mon Sep 17 00:00:00 2001
From: Todd Short <tshort@akamai.com>
Date: Tue, 28 Feb 2017 09:04:29 -0500
Subject: 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)
---
 ssl/bio_ssl.c | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'ssl/bio_ssl.c')

diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 3d380c83fb..8b5036fe38 100644
--- a/ssl/bio_ssl.c
+++ b/ssl/bio_ssl.c
@@ -380,15 +380,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
         ret = BIO_ctrl(ssl->rbio, cmd, num, ptr);
         break;
     case BIO_CTRL_SET_CALLBACK:
-        {
-#if 0                           /* FIXME: Should this be used? -- Richard
-                                 * Levitte */
-            SSLerr(SSL_F_SSL_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