Commit 2722ff50 authored by Todd Short's avatar Todd Short Committed by Rich Salz
Browse files

Remove some #if 0 code in ssl, crypto/bio 



Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2781)
parent 14097b6a

crypto/bio/bss_conn.c

+1 −9
Original line number Diff line number Diff line
@@ -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:

        {

ssl/bio_ssl.c

+1 −9
Original line number Diff line number Diff line
@@ -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:

        {

ssl/s3_lib.c

+0 −4
Original line number Diff line number Diff line
@@ -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),