From d970fd597dc43c71716f5ce1db8f102515a73ad8 Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Fri, 30 May 2014 14:30:50 +0000
Subject: remove some #if 0 code. we don't need any more reminders that we're
 using a not quite appropriate data structure. ok jsing

---
 src/lib/libssl/bio_ssl.c | 17 -----------------
 1 file changed, 17 deletions(-)

(limited to 'src/lib/libssl/bio_ssl.c')

diff --git a/src/lib/libssl/bio_ssl.c b/src/lib/libssl/bio_ssl.c
index 8ffbe0a67a..3cd462e06f 100644
--- a/src/lib/libssl/bio_ssl.c
+++ b/src/lib/libssl/bio_ssl.c
@@ -152,18 +152,6 @@ ssl_read(BIO *b, char *out, int outl)
 
 	BIO_clear_retry_flags(b);
 
-#if 0
-	if (!SSL_is_init_finished(ssl)) {
-/*		ret=SSL_do_handshake(ssl); */
-		if (ret > 0) {
-
-			outflags = (BIO_FLAGS_READ|BIO_FLAGS_SHOULD_RETRY);
-			ret = -1;
-			goto end;
-		}
-	}
-#endif
-/*	if (ret > 0) */
 	ret = SSL_read(ssl, out, outl);
 
 	switch (SSL_get_error(ssl, ret)) {
@@ -448,12 +436,7 @@ ssl_ctrl(BIO *b, int cmd, long num, void *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
 		}
 		break;
 	case BIO_CTRL_GET_CALLBACK:
-- 
cgit v1.2.3-55-g6feb