projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from 1.0.0-stable.
[openssl.git]
/
ssl
/
dtls1.h
diff --git
a/ssl/dtls1.h
b/ssl/dtls1.h
index 6548a98f035168421f5acd987c9bc26fd323ccb1..177e55cd9f143fc9541f7b9da2bfa1656a04d81f 100644
(file)
--- a/
ssl/dtls1.h
+++ b/
ssl/dtls1.h
@@
-68,6
+68,7
@@
extern "C" {
#endif
#define DTLS1_VERSION 0xFEFF
#endif
#define DTLS1_VERSION 0xFEFF
+#define DTLS1_BAD_VER 0x0100
#if 0
/* this alert description is not specified anywhere... */
#if 0
/* this alert description is not specified anywhere... */
@@
-102,6
+103,19
@@
typedef struct dtls1_bitmap_st
encoding */
} DTLS1_BITMAP;
encoding */
} DTLS1_BITMAP;
+struct dtls1_retransmit_state
+ {
+ EVP_CIPHER_CTX *enc_write_ctx; /* cryptographic state */
+ EVP_MD_CTX *write_hash; /* used for mac generation */
+#ifndef OPENSSL_NO_COMP
+ COMP_CTX *compress; /* compression */
+#else
+ char *compress;
+#endif
+ SSL_SESSION *session;
+ unsigned short epoch;
+ };
+
struct hm_header_st
{
unsigned char type;
struct hm_header_st
{
unsigned char type;
@@
-110,6
+124,7
@@
struct hm_header_st
unsigned long frag_off;
unsigned long frag_len;
unsigned int is_ccs;
unsigned long frag_off;
unsigned long frag_len;
unsigned int is_ccs;
+ struct dtls1_retransmit_state saved_retransmit_state;
};
struct ccs_header_st
};
struct ccs_header_st
@@
-169,6
+184,9
@@
typedef struct dtls1_state_st
unsigned short handshake_read_seq;
unsigned short handshake_read_seq;
+ /* save last sequence number for retransmissions */
+ unsigned char last_write_sequence[8];
+
/* Received handshake records (processed and unprocessed) */
record_pqueue unprocessed_rcds;
record_pqueue processed_rcds;
/* Received handshake records (processed and unprocessed) */
record_pqueue unprocessed_rcds;
record_pqueue processed_rcds;
@@
-179,13
+197,26
@@
typedef struct dtls1_state_st
/* Buffered (sent) handshake records */
pqueue sent_messages;
/* Buffered (sent) handshake records */
pqueue sent_messages;
+ /* Buffered application records.
+ * Only for records between CCS and Finished
+ * to prevent either protocol violation or
+ * unnecessary message loss.
+ */
+ record_pqueue buffered_app_data;
+
unsigned int mtu; /* max wire packet size */
struct hm_header_st w_msg_hdr;
struct hm_header_st r_msg_hdr;
struct dtls1_timeout_st timeout;
unsigned int mtu; /* max wire packet size */
struct hm_header_st w_msg_hdr;
struct hm_header_st r_msg_hdr;
struct dtls1_timeout_st timeout;
-
+
+ /* Indicates when the last handshake msg sent will timeout */
+ struct timeval next_timeout;
+
+ /* Timeout duration */
+ unsigned short timeout_duration;
+
/* storage for Alert/Handshake protocol data received but not
* yet processed by ssl3_read_bytes: */
unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
/* storage for Alert/Handshake protocol data received but not
* yet processed by ssl3_read_bytes: */
unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];