mirror of
https://github.com/openssl/openssl.git
synced 2025-03-25 20:00:44 +08:00
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)
This commit is contained in:
parent
7f517c2676
commit
38f2837b1b
@ -1050,20 +1050,11 @@ int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
|
||||
}
|
||||
|
||||
/* 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);
|
||||
|
||||
/* 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);
|
||||
|
@ -3347,9 +3347,6 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
|
||||
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);
|
||||
@ -3381,7 +3378,6 @@ long ssl3_ctx_ctrl(SSL_CTX *ctx, int cmd, long larg, void *parg)
|
||||
&ctx->ext.supportedgroups_len,
|
||||
&nid, 1);
|
||||
}
|
||||
/* break; */
|
||||
#endif /* !OPENSSL_NO_EC */
|
||||
case SSL_CTRL_SET_TLSEXT_SERVERNAME_ARG:
|
||||
ctx->ext.servername_arg = parg;
|
||||
|
@ -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++;
|
||||
/*
|
||||
* if (!sk_push(ca_list,(char *)c)) goto err;
|
||||
*/
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -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.
|
||||
case TLS_ST_SR_CERT_VRFY:
|
||||
return SSL3_RT_MAX_PLAIN_LENGTH;
|
||||
*/
|
||||
WORK_STATE ossl_statem_client_post_work(SSL *s, WORK_STATE wst)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user