--- ssl/s23_srvr.c.orig	2014-10-17 14:26:15.000000000 +0200
+++ ssl/s23_srvr.c	2014-10-17 14:30:54.000000000 +0200
@@ -322,12 +322,14 @@
 						type=1;
 						}
 					}
+#ifndef OPENSSL_NO_SSL3
 				else if (!(s->options & SSL_OP_NO_SSLv3))
 					{
 					s->version=SSL3_VERSION;
 					/* type=2; */
 					s->state=SSL23_ST_SR_CLNT_HELLO_B;
 					}
+#endif
 				else if (!(s->options & SSL_OP_NO_SSLv2))
 					type=1;
 
@@ -394,12 +396,15 @@
 			else
 				{
 				/* client requests SSL 3.0 */
+#ifndef OPENSSL_NO_SSL3
 				if (!(s->options & SSL_OP_NO_SSLv3))
 					{
 					s->version=SSL3_VERSION;
 					type=3;
 					}
-				else if (!(s->options & SSL_OP_NO_TLSv1))
+				else
+#endif
+				if (!(s->options & SSL_OP_NO_TLSv1))
 					{
 					/* we won't be able to use TLS of course,
 					 * but this will send an appropriate alert */