diff options
| author | Matt Caswell <matt@openssl.org> | 2015-01-30 17:29:41 +0000 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2015-03-26 13:53:07 +0000 |
| commit | 258f8721a5d2c3ec5fd433e89112885139be1db3 (patch) | |
| tree | e43ce47ce54ae67d4a50f28306fdde89f5f5241d /ssl/ssl_locl.h | |
| parent | ab97b2cd4301074fd88fd2f13b8c79342593dae4 (diff) | |
Encapsulate s->s3->rrec
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'ssl/ssl_locl.h')
| -rw-r--r-- | ssl/ssl_locl.h | 44 |
1 files changed, 2 insertions, 42 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index 8163b99095..8a16204a2f 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -166,6 +166,7 @@ # include <openssl/symhacks.h> #include "record/ssl3_buffer.h" +#include "record/ssl3_record.h" #include "record/rec_layer.h" # ifdef OPENSSL_BUILD_SHLIBSSL @@ -1223,47 +1224,6 @@ struct ssl_st { RECORD_LAYER rlayer; }; -typedef struct ssl3_record_st { - /* type of record */ - /* - * r - */ int type; - /* How many bytes available */ - /* - * rw - */ unsigned int length; - /* - * How many bytes were available before padding was removed? This is used - * to implement the MAC check in constant time for CBC records. - */ - /* - * rw - */ unsigned int orig_len; - /* read/write offset into 'buf' */ - /* - * r - */ unsigned int off; - /* pointer to the record data */ - /* - * rw - */ unsigned char *data; - /* where the decode bytes are */ - /* - * rw - */ unsigned char *input; - /* only used with decompression - malloc()ed */ - /* - * r - */ unsigned char *comp; - /* epoch number, needed by DTLS1 */ - /* - * r - */ unsigned long epoch; - /* sequence number, needed by DTLS1 */ - /* - * r - */ unsigned char seq_num[8]; -} SSL3_RECORD; typedef struct ssl3_state_st { long flags; @@ -1281,7 +1241,7 @@ typedef struct ssl3_state_st { int empty_fragment_done; /* The value of 'extra' when the buffers were initialized */ int init_extra; - SSL3_RECORD rrec; /* each decoded record goes in here */ + SSL3_RECORD rrec; /* each decoded record goes in here */ SSL3_RECORD wrec; /* goes out from here */ /* * storage for Alert/Handshake protocol data received but not yet |