#14465: Update openssl to tag android-4.0.4_r2.1
diff --git a/jni/openssl/ssl/dtls1.h b/jni/openssl/ssl/dtls1.h
index 5008bf6..2900d1d 100644
--- a/jni/openssl/ssl/dtls1.h
+++ b/jni/openssl/ssl/dtls1.h
@@ -105,11 +105,6 @@
#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
{
@@ -232,7 +227,7 @@
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 */
@@ -248,13 +243,6 @@
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
@@ -263,12 +251,8 @@
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