Fix crash in dtls1_get_record whilst in the listen state where you get two

[openssl.git] / ssl / dtls1.h

diff --git a/ssl/dtls1.h b/ssl/dtls1.h
index b5042ea5fd22fc703867e022233de5e4f2c5bf39..96f733434a9bbf3007b56af3da7b3ba6b166f4af 100644 (file)
--- a/ssl/dtls1.h
+++ b/ssl/dtls1.h
@@ -84,8 +84,14 @@ extern "C" {
 #endif
 
 #define DTLS1_VERSION                  0xFEFF
+#define DTLS1_2_VERSION                        0xFEFD
+#define DTLS_MAX_VERSION               DTLS1_2_VERSION
+
 #define DTLS1_BAD_VER                  0x0100
 
+/* Special value for method supporting multiple versions */
+#define DTLS_ANY_VERSION               0x1FFFF
+
 #if 0
 /* this alert description is not specified anywhere... */
 #define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE    110
@@ -115,6 +121,9 @@ extern "C" {
 #define DTLS1_SCTP_AUTH_LABEL  "EXPORTER_DTLS_OVER_SCTP"
 #endif
 
+/* Max MTU overhead we know about so far is 40 for IPv6 + 8 for UDP */
+#define DTLS1_MAX_MTU_OVERHEAD                   48
+
 typedef struct dtls1_bitmap_st
        {
        unsigned long map;              /* track 32 packets on 32-bit systems
@@ -229,6 +238,7 @@ typedef struct dtls1_state_st
        /* Is set when listening for new connections with dtls1_listen() */
        unsigned int listen;
 
+       unsigned int link_mtu; /* max on-the-wire DTLS packet size */
        unsigned int mtu; /* max DTLS packet size */
 
        struct hm_header_st w_msg_hdr;
@@ -236,7 +246,7 @@ typedef struct dtls1_state_st
 
        struct dtls1_timeout_st timeout;
 
-       /* Indicates when the last handshake msg sent will timeout */
+       /* Indicates when the last handshake msg or heartbeat sent will timeout */
        struct timeval next_timeout;
 
        /* Timeout duration */
@@ -250,6 +260,10 @@ typedef struct dtls1_state_st
        unsigned int handshake_fragment_len;
 
        unsigned int retransmitting;
+       /*
+        * Set when the handshake is ready to process peer's ChangeCipherSpec message.
+        * Cleared after the message has been processed.
+        */
        unsigned int change_cipher_spec_ok;
 
 #ifndef OPENSSL_NO_SCTP
@@ -284,4 +298,3 @@ typedef struct dtls1_record_data_st
 }
 #endif
 #endif
-