Remove some commented out code in libssl

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2774)

diff --git a/ssl/record/rec_layer_d1.c b/ssl/record/rec_layer_d1.c
index ed695892862a0e0c625a1f633a09c27989460917..28da0dafb14820501d83e1265d4d5d00920046dd 100644 (file)
--- a/ssl/record/rec_layer_d1.c
+++ b/ssl/record/rec_layer_d1.c
@@ -1050,20 +1050,11 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
     }
 
     /* record length after mac and block padding */
     }
 
     /* record length after mac and block padding */

-    /*
-     * if (type == SSL3_RT_APPLICATION_DATA || (type == SSL3_RT_ALERT && !
-     * SSL_in_init(s)))
-     */

 
     /* there's only one epoch between handshake and app data */
 
     s2n(s->rlayer.d->w_epoch, pseq);
 
 
     /* there's only one epoch between handshake and app data */
 
     s2n(s->rlayer.d->w_epoch, pseq);
 

-    /* XDTLS: ?? */
-    /*
-     * else s2n(s->d1->handshake_epoch, pseq);
-     */
-

     memcpy(pseq, &(s->rlayer.write_sequence[2]), 6);
     pseq += 6;
     s2n(SSL3_RECORD_get_length(&wr), pseq);
     memcpy(pseq, &(s->rlayer.write_sequence[2]), 6);
     pseq += 6;
     s2n(SSL3_RECORD_get_length(&wr), pseq);

diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c
index 4f8977ae7e07f58459d3881d2a7e9edf21f8f399..16696526443d18973da5b3b308badadb72d86638 100644 (file)
--- a/ssl/s3_lib.c
+++ b/ssl/s3_lib.c
@@ -3347,9 +3347,6 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
             ctx->cert->dh_tmp = pkdh;
             return 1;
         }
             ctx->cert->dh_tmp = pkdh;
             return 1;
         }

-        /*
-         * break;
-         */

     case SSL_CTRL_SET_TMP_DH_CB:
         {
             SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);
     case SSL_CTRL_SET_TMP_DH_CB:
         {
             SSLerr(SSL_F_SSL3_CTX_CTRL, ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED);


@@ -3381,7 +3378,6 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
                                    &ctx->ext.supportedgroups_len,
                                    &nid, 1);
         }
                                    &ctx->ext.supportedgroups_len,
                                    &nid, 1);
         }

-        /* break; */

 #endif                          /* !OPENSSL_NO_EC */
     case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
         ctx->ext.servername_arg = parg;
 #endif                          /* !OPENSSL_NO_EC */
     case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
         ctx->ext.servername_arg = parg;

diff --git a/ssl/ssl_ciph.c b/ssl/ssl_ciph.c
index 0b60debdd95eee0571909339ad60bf7812f32662..5fe21174303475da552dd556852690d43b1e6556 100644 (file)
--- a/ssl/ssl_ciph.c
+++ b/ssl/ssl_ciph.c
@@ -701,9 +701,6 @@ static void ssl_cipher_collect_ciphers(const SSL_METHOD *ssl_method,
         co_list[co_list_num].prev = NULL;
         co_list[co_list_num].active = 0;
         co_list_num++;
         co_list[co_list_num].prev = NULL;
         co_list[co_list_num].active = 0;
         co_list_num++;

-        /*
-         * if (!sk_push(ca_list,(char *)c)) goto err;
-         */

     }
 
     /*
     }
 
     /*

diff --git a/ssl/statem/statem_clnt.c b/ssl/statem/statem_clnt.c
index 5957718c23c8675931101330cb8d1d1d49461306..52f192dbb5082c3c20192fffd6048359ad301f54 100644 (file)
--- a/ssl/statem/statem_clnt.c
+++ b/ssl/statem/statem_clnt.c
@@ -649,8 +649,6 @@ WORK_STATE ossl_statem_client_pre_work(SSL *s, WORK_STATE wst)
 /*
  * Perform any work that needs to be done after sending a message from the
  * client to the server.
 /*
  * Perform any work that needs to be done after sending a message from the
  * client to the server.

-    case TLS_ST_SR_CERT_VRFY:
-        return SSL3_RT_MAX_PLAIN_LENGTH;

  */
 WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
 {
  */
 WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
 {