projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Synchronise with Unix
[oweals/openssl.git]
/
ssl
/
dtls1.h
diff --git
a/ssl/dtls1.h
b/ssl/dtls1.h
index 4543ef75bb25c25354aabbd08737d7f335b0f1af..a663cf85f282dc76745a4f6020f5ff8ab95c2baf 100644
(file)
--- a/
ssl/dtls1.h
+++ b/
ssl/dtls1.h
@@
-67,9
+67,8
@@
extern "C" {
#endif
extern "C" {
#endif
-#define DTLS1_VERSION 0x0100
-#define DTLS1_VERSION_MAJOR 0x01
-#define DTLS1_VERSION_MINOR 0x00
+#define DTLS1_VERSION 0xFEFF
+#define DTLS1_BAD_VER 0x0100
#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110
#define DTLS1_AD_MISSING_HANDSHAKE_MESSAGE 110
@@
-83,16
+82,16
@@
extern "C" {
#define DTLS1_HM_BAD_FRAGMENT -2
#define DTLS1_HM_FRAGMENT_RETRY -3
#define DTLS1_HM_BAD_FRAGMENT -2
#define DTLS1_HM_FRAGMENT_RETRY -3
-#define DTLS1_CCS_HEADER_LENGTH
3
+#define DTLS1_CCS_HEADER_LENGTH
1
#define DTLS1_AL_HEADER_LENGTH 7
typedef struct dtls1_bitmap_st
{
#define DTLS1_AL_HEADER_LENGTH 7
typedef struct dtls1_bitmap_st
{
-
unsigned long long
map;
+
PQ_64BIT
map;
unsigned long length; /* sizeof the bitmap in bits */
unsigned long length; /* sizeof the bitmap in bits */
-
unsigned long long
max_seq_num; /* max record number seen so far */
+
PQ_64BIT
max_seq_num; /* max record number seen so far */
} DTLS1_BITMAP;
struct hm_header_st
} DTLS1_BITMAP;
struct hm_header_st
@@
-162,9
+161,6
@@
typedef struct dtls1_state_st
unsigned short handshake_read_seq;
unsigned short handshake_read_seq;
- /* only matters for handshake messages */
- unsigned long long next_expected_seq_num;
-
/* 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;