diff options
Diffstat (limited to 'deps/openssl/openssl/ssl/dtls1.h')
-rw-r--r-- | deps/openssl/openssl/ssl/dtls1.h | 26 |
1 files changed, 3 insertions, 23 deletions
diff --git a/deps/openssl/openssl/ssl/dtls1.h b/deps/openssl/openssl/ssl/dtls1.h index e65d501191..2900d1d8ae 100644 --- a/deps/openssl/openssl/ssl/dtls1.h +++ b/deps/openssl/openssl/ssl/dtls1.h @@ -57,8 +57,8 @@ * */ -#ifndef HEADER_DTLS1_H -#define HEADER_DTLS1_H +#ifndef HEADER_DTLS1_H +#define HEADER_DTLS1_H #include <openssl/buffer.h> #include <openssl/pqueue.h> @@ -72,12 +72,8 @@ #elif defined(OPENSSL_SYS_NETWARE) && !defined(_WINSOCK2API_) #include <sys/timeval.h> #else -#if defined(OPENSSL_SYS_VXWORKS) -#include <sys/times.h> -#else #include <sys/time.h> #endif -#endif #ifdef __cplusplus extern "C" { @@ -109,11 +105,6 @@ extern "C" { #define DTLS1_AL_HEADER_LENGTH 2 #endif -#ifndef OPENSSL_NO_SSL_INTERN - -#ifndef OPENSSL_NO_SCTP -#define DTLS1_SCTP_AUTH_LABEL "EXPORTER_DTLS_OVER_SCTP" -#endif typedef struct dtls1_bitmap_st { @@ -236,7 +227,7 @@ typedef struct dtls1_state_st struct dtls1_timeout_st timeout; - /* Indicates when the last handshake msg or heartbeat sent will timeout */ + /* Indicates when the last handshake msg sent will timeout */ struct timeval next_timeout; /* Timeout duration */ @@ -252,13 +243,6 @@ typedef struct dtls1_state_st unsigned int retransmitting; unsigned int change_cipher_spec_ok; -#ifndef OPENSSL_NO_SCTP - /* used when SSL_ST_XX_FLUSH is entered */ - int next_state; - - int shutdown_received; -#endif - } DTLS1_STATE; typedef struct dtls1_record_data_st @@ -267,12 +251,8 @@ typedef struct dtls1_record_data_st unsigned int packet_length; SSL3_BUFFER rbuf; SSL3_RECORD rrec; -#ifndef OPENSSL_NO_SCTP - struct bio_dgram_sctp_rcvinfo recordinfo; -#endif } DTLS1_RECORD_DATA; -#endif /* Timeout multipliers (timeout slice is defined in apps/timeouts.h */ #define DTLS1_TMO_READ_COUNT 2 |