diff options
| author | Todd Short <tshort@akamai.com> | 2017-02-28 09:04:29 -0500 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2017-02-28 09:32:41 -0500 |
| commit | 2722ff506de5cbdf68ca39c233ddb6e2fc15aa37 (patch) | |
| tree | 9e15b7825a77ffda7744a059db7c13b68d32d069 | |
| parent | 14097b6a9263a40615a5c4cbf3fe808b1a14ffde (diff) | |
Remove some #if 0 code in ssl, crypto/bio
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2781)
| -rw-r--r-- | crypto/bio/bss_conn.c | 10 | ||||
| -rw-r--r-- | ssl/bio_ssl.c | 10 | ||||
| -rw-r--r-- | 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 ddbc8967f6..5562efaa3b 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 3d380c83fb..8b5036fe38 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 1df1afa02e..4f8977ae7e 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), |