1 files changed, 1 insertions, 24 deletions

diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index 7f6a5a0bbd..7b6af070c9 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_srvr.c,v 1.104 2015/06/15 03:32:59 doug Exp $ */
+/* $OpenBSD: s3_srvr.c,v 1.105 2015/06/15 05:16:56 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -148,8 +148,6 @@
  * OTHERWISE.
  */
 
-#define REUSE_CIPHER_BUG
-
 #include <stdio.h>
 
 #include "ssl_locl.h"
@@ -1126,27 +1124,6 @@ ssl3_get_client_hello(SSL *s)
                 }
                 s->s3->tmp.new_cipher = c;
         } else {
-                /* Session-id reuse */
-#ifdef REUSE_CIPHER_BUG
-                STACK_OF(SSL_CIPHER) *sk;
-                SSL_CIPHER *nc = NULL;
-                SSL_CIPHER *ec = NULL;
-
-                if (s->options & SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG) {
-                        sk = s->session->ciphers;
-                        for (i = 0; i < sk_SSL_CIPHER_num(sk); i++) {
-                                c = sk_SSL_CIPHER_value(sk, i);
-                                if (c->algorithm_enc & SSL_eNULL)
-                                        nc = c;
-                        }
-                        if (nc != NULL)
-                                s->s3->tmp.new_cipher = nc;
-                        else if (ec != NULL)
-                                s->s3->tmp.new_cipher = ec;
-                        else
-                                s->s3->tmp.new_cipher = s->session->cipher;
-                } else
-#endif
                 s->s3->tmp.new_cipher = s->session->cipher;
         }