Some nextproto patches broke DTLS: fix
This commit is contained in:
parent
006b54a8eb
commit
bbcf3a9b30
@ -1382,10 +1382,8 @@ err:
|
|||||||
int ssl3_do_change_cipher_spec(SSL *s)
|
int ssl3_do_change_cipher_spec(SSL *s)
|
||||||
{
|
{
|
||||||
int i;
|
int i;
|
||||||
#ifdef OPENSSL_NO_NEXTPROTONEG
|
|
||||||
const char *sender;
|
const char *sender;
|
||||||
int slen;
|
int slen;
|
||||||
#endif
|
|
||||||
|
|
||||||
if (s->state & SSL_ST_ACCEPT)
|
if (s->state & SSL_ST_ACCEPT)
|
||||||
i=SSL3_CHANGE_CIPHER_SERVER_READ;
|
i=SSL3_CHANGE_CIPHER_SERVER_READ;
|
||||||
@ -1408,7 +1406,6 @@ int ssl3_do_change_cipher_spec(SSL *s)
|
|||||||
if (!s->method->ssl3_enc->change_cipher_state(s,i))
|
if (!s->method->ssl3_enc->change_cipher_state(s,i))
|
||||||
return(0);
|
return(0);
|
||||||
|
|
||||||
#ifdef OPENSSL_NO_NEXTPROTONEG
|
|
||||||
/* we have to record the message digest at
|
/* we have to record the message digest at
|
||||||
* this point so we can get it before we read
|
* this point so we can get it before we read
|
||||||
* the finished message */
|
* the finished message */
|
||||||
@ -1425,7 +1422,6 @@ int ssl3_do_change_cipher_spec(SSL *s)
|
|||||||
|
|
||||||
s->s3->tmp.peer_finish_md_len = s->method->ssl3_enc->final_finish_mac(s,
|
s->s3->tmp.peer_finish_md_len = s->method->ssl3_enc->final_finish_mac(s,
|
||||||
sender,slen,s->s3->tmp.peer_finish_md);
|
sender,slen,s->s3->tmp.peer_finish_md);
|
||||||
#endif
|
|
||||||
|
|
||||||
return(1);
|
return(1);
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user