Further libssl size_t-ify of reading

[openssl.git] / ssl / record / record.h

diff --git a/ssl/record/record.h b/ssl/record/record.h
index 2ed8ab9..fc70f8d 100644 (file)
--- a/ssl/record/record.h
+++ b/ssl/record/record.h
@@ -38,16 +38,16 @@ typedef struct ssl3_record_st {
     int type;
     /* How many bytes available */
     /* rw */
     int type;
     /* How many bytes available */
     /* rw */

-    unsigned int length;
+    size_t 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 */
     /*
      * 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;
+    size_t orig_len;

     /* read/write offset into 'buf' */
     /* r */
     /* read/write offset into 'buf' */
     /* r */

-    unsigned int off;
+    size_t off;

     /* pointer to the record data */
     /* rw */
     unsigned char *data;
     /* pointer to the record data */
     /* rw */
     unsigned char *data;


@@ -82,7 +82,7 @@ typedef struct record_pqueue_st {
 
 typedef struct dtls1_record_data_st {
     unsigned char *packet;
 
 typedef struct dtls1_record_data_st {
     unsigned char *packet;

-    unsigned int packet_length;
+    size_t packet_length;

     SSL3_BUFFER rbuf;
     SSL3_RECORD rrec;
 #ifndef OPENSSL_NO_SCTP
     SSL3_BUFFER rbuf;
     SSL3_RECORD rrec;
 #ifndef OPENSSL_NO_SCTP


@@ -116,9 +116,9 @@ typedef struct dtls_record_layer_st {
      * processed by ssl3_read_bytes:
      */
     unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];
      * processed by ssl3_read_bytes:
      */
     unsigned char alert_fragment[DTLS1_AL_HEADER_LENGTH];

-    unsigned int alert_fragment_len;
+    size_t alert_fragment_len;

     unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];
     unsigned char handshake_fragment[DTLS1_HM_HEADER_LENGTH];

-    unsigned int handshake_fragment_len;
+    size_t handshake_fragment_len;

     /* save last and current sequence numbers for retransmissions */
     unsigned char last_write_sequence[8];
     unsigned char curr_write_sequence[8];
     /* save last and current sequence numbers for retransmissions */
     unsigned char last_write_sequence[8];
     unsigned char curr_write_sequence[8];


@@ -143,7 +143,7 @@ typedef struct record_layer_st {
     /* where we are when reading */
     int rstate;
     /* How many pipelines can be used to read data */
     /* where we are when reading */
     int rstate;
     /* How many pipelines can be used to read data */

-    unsigned int numrpipes;
+    size_t numrpipes;

     /* How many pipelines can be used to write data */
     unsigned int numwpipes;
     /* read IO goes into here */
     /* How many pipelines can be used to write data */
     unsigned int numwpipes;
     /* read IO goes into here */


@@ -162,11 +162,11 @@ typedef struct record_layer_st {
      * processed by ssl3_read_bytes:
      */
     unsigned char alert_fragment[2];
      * processed by ssl3_read_bytes:
      */
     unsigned char alert_fragment[2];

-    unsigned int alert_fragment_len;
+    size_t alert_fragment_len;

     unsigned char handshake_fragment[4];
     unsigned char handshake_fragment[4];

-    unsigned int handshake_fragment_len;
+    size_t handshake_fragment_len;

     /* The number of consecutive empty records we have received */
     /* The number of consecutive empty records we have received */

-    unsigned int empty_record_count;
+    size_t empty_record_count;

     /* partial write - check the numbers match */
     /* number bytes written */
     int wpend_tot;
     /* partial write - check the numbers match */
     /* number bytes written */
     int wpend_tot;


@@ -208,18 +208,20 @@ void RECORD_LAYER_clear(RECORD_LAYER *rl);
 void RECORD_LAYER_release(RECORD_LAYER *rl);
 int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);
 int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);
 void RECORD_LAYER_release(RECORD_LAYER *rl);
 int RECORD_LAYER_read_pending(const RECORD_LAYER *rl);
 int RECORD_LAYER_write_pending(const RECORD_LAYER *rl);

-int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf, int len);
+int RECORD_LAYER_set_data(RECORD_LAYER *rl, const unsigned char *buf,
+                          size_t len);

 void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
 void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
 int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);
 void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl);
 void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl);
 int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl);

-unsigned int RECORD_LAYER_get_rrec_length(RECORD_LAYER *rl);
+size_t RECORD_LAYER_get_rrec_length(RECORD_LAYER *rl);

 __owur int ssl3_pending(const SSL *s);
 __owur int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
 __owur int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                          unsigned int *pipelens, unsigned int numpipes,
                          int create_empty_fragment);
 __owur int ssl3_read_bytes(SSL *s, int type, int *recvd_type,
 __owur int ssl3_pending(const SSL *s);
 __owur int ssl3_write_bytes(SSL *s, int type, const void *buf, int len);
 __owur int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
                          unsigned int *pipelens, unsigned int numpipes,
                          int create_empty_fragment);
 __owur int ssl3_read_bytes(SSL *s, int type, int *recvd_type,

-                           unsigned char *buf, int len, int peek);
+                           unsigned char *buf, size_t len, int peek,
+                           size_t *read);

 __owur int ssl3_setup_buffers(SSL *s);
 __owur int ssl3_enc(SSL *s, SSL3_RECORD *inrecs, unsigned int n_recs, int send);
 __owur int n_ssl3_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int send);
 __owur int ssl3_setup_buffers(SSL *s);
 __owur int ssl3_enc(SSL *s, SSL3_RECORD *inrecs, unsigned int n_recs, int send);
 __owur int n_ssl3_mac(SSL *ssl, SSL3_RECORD *rec, unsigned char *md, int send);


@@ -235,7 +237,8 @@ void DTLS_RECORD_LAYER_clear(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_set_write_sequence(RECORD_LAYER *rl, unsigned char *seq);
 __owur int dtls1_read_bytes(SSL *s, int type, int *recvd_type,
 void DTLS_RECORD_LAYER_resync_write(RECORD_LAYER *rl);
 void DTLS_RECORD_LAYER_set_write_sequence(RECORD_LAYER *rl, unsigned char *seq);
 __owur int dtls1_read_bytes(SSL *s, int type, int *recvd_type,

-                            unsigned char *buf, int len, int peek);
+                            unsigned char *buf, size_t len, int peek,
+                            size_t *read);

 __owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
 __owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
                           unsigned int len, int create_empty_fragement);
 __owur int dtls1_write_bytes(SSL *s, int type, const void *buf, int len);
 __owur int do_dtls1_write(SSL *s, int type, const unsigned char *buf,
                           unsigned int len, int create_empty_fragement);