diff options
author | jsing <> | 2015-02-09 10:53:28 +0000 |
---|---|---|
committer | jsing <> | 2015-02-09 10:53:28 +0000 |
commit | b6cf79472f84871a9cffc9c9ee7643d17e8943a4 (patch) | |
tree | 26c8e0794ca281a87b301ecbd4dde188ac6918e4 /src/lib/libssl/dtls1.h | |
parent | ba83f0a487d169240e07a7f1b6b97c6f5ae100ef (diff) | |
download | openbsd-b6cf79472f84871a9cffc9c9ee7643d17e8943a4.tar.gz openbsd-b6cf79472f84871a9cffc9c9ee7643d17e8943a4.tar.bz2 openbsd-b6cf79472f84871a9cffc9c9ee7643d17e8943a4.zip |
Jettison DTLS over SCTP.
OpenBSD does not have SCTP support and it sees little use in the wild.
OPENSSL_NO_SCTP is already specified via opensslfeatures.h, hence this
is a code removal only and symbols should remain unchanged.
ok beck@ miod@ tedu@
Diffstat (limited to 'src/lib/libssl/dtls1.h')
-rw-r--r-- | src/lib/libssl/dtls1.h | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/src/lib/libssl/dtls1.h b/src/lib/libssl/dtls1.h index 40940a494a..1d65dc5821 100644 --- a/src/lib/libssl/dtls1.h +++ b/src/lib/libssl/dtls1.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: dtls1.h,v 1.16 2014/12/14 15:30:50 jsing Exp $ */ | 1 | /* $OpenBSD: dtls1.h,v 1.17 2015/02/09 10:53:28 jsing Exp $ */ |
2 | /* | 2 | /* |
3 | * DTLS implementation written by Nagendra Modadugu | 3 | * DTLS implementation written by Nagendra Modadugu |
4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. | 4 | * (nagendra@cs.stanford.edu) for the OpenSSL project 2005. |
@@ -95,9 +95,6 @@ extern "C" { | |||
95 | 95 | ||
96 | #ifndef OPENSSL_NO_SSL_INTERN | 96 | #ifndef OPENSSL_NO_SSL_INTERN |
97 | 97 | ||
98 | #ifndef OPENSSL_NO_SCTP | ||
99 | #define DTLS1_SCTP_AUTH_LABEL "EXPORTER_DTLS_OVER_SCTP" | ||
100 | #endif | ||
101 | 98 | ||
102 | typedef struct dtls1_bitmap_st { | 99 | typedef struct dtls1_bitmap_st { |
103 | unsigned long map; /* track 32 packets on 32-bit systems | 100 | unsigned long map; /* track 32 packets on 32-bit systems |
@@ -225,12 +222,6 @@ typedef struct dtls1_state_st { | |||
225 | unsigned int retransmitting; | 222 | unsigned int retransmitting; |
226 | unsigned int change_cipher_spec_ok; | 223 | unsigned int change_cipher_spec_ok; |
227 | 224 | ||
228 | #ifndef OPENSSL_NO_SCTP | ||
229 | /* used when SSL_ST_XX_FLUSH is entered */ | ||
230 | int next_state; | ||
231 | |||
232 | int shutdown_received; | ||
233 | #endif | ||
234 | 225 | ||
235 | } DTLS1_STATE; | 226 | } DTLS1_STATE; |
236 | 227 | ||
@@ -239,9 +230,6 @@ typedef struct dtls1_record_data_st { | |||
239 | unsigned int packet_length; | 230 | unsigned int packet_length; |
240 | SSL3_BUFFER rbuf; | 231 | SSL3_BUFFER rbuf; |
241 | SSL3_RECORD rrec; | 232 | SSL3_RECORD rrec; |
242 | #ifndef OPENSSL_NO_SCTP | ||
243 | struct bio_dgram_sctp_rcvinfo recordinfo; | ||
244 | #endif | ||
245 | } DTLS1_RECORD_DATA; | 233 | } DTLS1_RECORD_DATA; |
246 | 234 | ||
247 | #endif | 235 | #endif |