diff options
| author |   jsing <jsing@openbsd.org> | 2014-12-14 13:45:47 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-12-14 13:45:47 +0000 |
| commit | 7002c208637fe992532348807543290b6cca520b (patch) | |
| tree | 26bd4fe040d3eedb3dbce470877fb13efdb447f8 /lib/libssl/src/ssl/d1_srvr.c | |
| parent | Handle ed command "s" as a one line command, which it is. (diff) | |
| download | wireguard-openbsd-7002c208637fe992532348807543290b6cca520b.tar.xz wireguard-openbsd-7002c208637fe992532348807543290b6cca520b.zip | |
unifdef NETSCAPE_HANG_BUG from the DTLS code. The code is not currently
enabled and I would hope that no one is using client certificates with DTLS
and Netscape, assuming it even supported it...
ok bcook@ miod@
Diffstat (limited to 'lib/libssl/src/ssl/d1_srvr.c')
| -rw-r--r-- | lib/libssl/src/ssl/d1_srvr.c | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/lib/libssl/src/ssl/d1_srvr.c b/lib/libssl/src/ssl/d1_srvr.c index ee0e62336fc..71aa5e75d29 100644 --- a/lib/libssl/src/ssl/d1_srvr.c +++ b/lib/libssl/src/ssl/d1_srvr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: d1_srvr.c,v 1.43 2014/12/10 15:43:31 jsing Exp $ */ +/* $OpenBSD: d1_srvr.c,v 1.44 2014/12/14 13:45:47 jsing Exp $ */ /* * DTLS implementation written by Nagendra Modadugu * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. @@ -513,7 +513,6 @@ dtls1_accept(SSL *s) ret = dtls1_send_certificate_request(s); if (ret <= 0) goto end; -#ifndef NETSCAPE_HANG_BUG s->state = SSL3_ST_SW_SRVR_DONE_A; #ifndef OPENSSL_NO_SCTP if (BIO_dgram_is_sctp(SSL_get_wbio(s))) { @@ -521,16 +520,6 @@ dtls1_accept(SSL *s) s->state = DTLS1_SCTP_ST_SW_WRITE_SOCK; } #endif -#else - s->state = SSL3_ST_SW_FLUSH; - s->s3->tmp.next_state = SSL3_ST_SR_CERT_A; -#ifndef OPENSSL_NO_SCTP - if (BIO_dgram_is_sctp(SSL_get_wbio(s))) { - s->d1->next_state = s->s3->tmp.next_state; - s->s3->tmp.next_state = DTLS1_SCTP_ST_SW_WRITE_SOCK; - } -#endif -#endif s->init_num = 0; } break; @@ -1375,17 +1364,6 @@ dtls1_send_certificate_request(SSL *s) s->init_num = n + DTLS1_HM_HEADER_LENGTH; s->init_off = 0; -#ifdef NETSCAPE_HANG_BUG -/* XXX: what to do about this? */ - p = (unsigned char *)s->init_buf->data + s->init_num; - - /* do the header */ - *(p++) = SSL3_MT_SERVER_DONE; - *(p++) = 0; - *(p++) = 0; - *(p++) = 0; - s->init_num += 4; -#endif /* XDTLS: set message header ? */ msg_len = s->init_num - DTLS1_HM_HEADER_LENGTH; |