[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  2722ff506de5cbdf68ca39c233ddb6e2fc15aa37 (commit)
      from  14097b6a9263a40615a5c4cbf3fe808b1a14ffde (commit)


- Log -----------------------------------------------------------------
commit 2722ff506de5cbdf68ca39c233ddb6e2fc15aa37
Author: Todd Short <tshort at akamai.com>
Date:   Tue Feb 28 09:04:29 2017 -0500

    Remove some #if 0 code in ssl, crypto/bio
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/2781)

-----------------------------------------------------------------------

Summary of changes:
 crypto/bio/bss_conn.c | 10 +---------
 ssl/bio_ssl.c         | 10 +---------
 ssl/s3_lib.c          |  4 ----
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/crypto/bio/bss_conn.c b/crypto/bio/bss_conn.c
index ddbc896..5562efa 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:
         {
diff --git a/ssl/bio_ssl.c b/ssl/bio_ssl.c
index 3d380c8..8b5036f 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:
         {
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 1df1afa..4f8977a 100644
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3669,16 +3669,12 @@ const SSL_CIPHER *ssl3_choose_cipher(SSL *s, STACK_OF(SSL_CIPHER) *clnt,
 
     /* Let's see which ciphers we can support */
 
-#if 0
     /*
      * Do not set the compare functions, because this may lead to a
      * reordering by "id". We want to keep the original ordering. We may pay
      * a price in performance during sk_SSL_CIPHER_find(), but would have to
      * pay with the price of sk_SSL_CIPHER_dup().
      */
-    sk_SSL_CIPHER_set_cmp_func(srvr, ssl_cipher_ptr_id_cmp);
-    sk_SSL_CIPHER_set_cmp_func(clnt, ssl_cipher_ptr_id_cmp);
-#endif
 
 #ifdef CIPHER_DEBUG
     fprintf(stderr, "Server has %d from %p:\n", sk_SSL_CIPHER_num(srvr),