summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2011-05-25 14:31:47 +0000
committerDr. Stephen Henson <steve@openssl.org>2011-05-25 14:31:47 +0000
commitbbcf3a9b300bc8109bb306a53f6f3445ba02e8e9 (patch)
tree0bda77ccb359008607df624f175c961f80e3b18f /ssl
parent006b54a8ebf69ecc5b8a8259e95ac71d29c79973 (diff)
Some nextproto patches broke DTLS: fix
Diffstat (limited to 'ssl')
-rw-r--r--ssl/s3_pkt.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ssl/s3_pkt.c b/ssl/s3_pkt.c
index f6e31e9c3d..ee103cd242 100644
--- a/ssl/s3_pkt.c
+++ b/ssl/s3_pkt.c
@@ -1382,10 +1382,8 @@ err:
int ssl3_do_change_cipher_spec(SSL *s)
{
int i;
-#ifdef OPENSSL_NO_NEXTPROTONEG
const char *sender;
int slen;
-#endif
if (s->state & SSL_ST_ACCEPT)
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))
return(0);
-#ifdef OPENSSL_NO_NEXTPROTONEG
/* we have to record the message digest at
* this point so we can get it before we read
* 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,
sender,slen,s->s3->tmp.peer_finish_md);
-#endif
return(1);
}