aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2016-10-03 21:12:23 +0100
committerMatt Caswell <matt@openssl.org>2016-11-04 12:09:45 +0000
commit5607b2759a3148be6f38a9205d225bc8c802eaf1 (patch)
tree4eaffb7aabcd3c2634d12b3e32618e3436d418fb
parent7ee8627f6eb7cf63b34d2701d76bb66f6db811e5 (diff)
downloadopenssl-5607b2759a3148be6f38a9205d225bc8c802eaf1.zip
openssl-5607b2759a3148be6f38a9205d225bc8c802eaf1.tar.gz
openssl-5607b2759a3148be6f38a9205d225bc8c802eaf1.tar.bz2
Convert SSL3_RECORD_clear() and SSL3_RECORD_release() to size_t
Reviewed-by: Rich Salz <rsalz@openssl.org>
-rw-r--r--ssl/record/record_locl.h4
-rw-r--r--ssl/record/ssl3_record.c8
2 files changed, 6 insertions, 6 deletions
diff --git a/ssl/record/record_locl.h b/ssl/record/record_locl.h
index 0c9df3e..3d51443 100644
--- a/ssl/record/record_locl.h
+++ b/ssl/record/record_locl.h
@@ -100,8 +100,8 @@ int ssl3_release_write_buffer(SSL *s);
#define SSL3_RECORD_is_read(r) ((r)->read)
#define SSL3_RECORD_set_read(r) ((r)->read = 1)
-void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs);
-void SSL3_RECORD_release(SSL3_RECORD *r, unsigned int num_recs);
+void SSL3_RECORD_clear(SSL3_RECORD *r, size_t);
+void SSL3_RECORD_release(SSL3_RECORD *r, size_t num_recs);
void SSL3_RECORD_set_seq_num(SSL3_RECORD *r, const unsigned char *seq_num);
int ssl3_get_record(SSL *s);
__owur int ssl3_do_compress(SSL *ssl, SSL3_RECORD *wr);
diff --git a/ssl/record/ssl3_record.c b/ssl/record/ssl3_record.c
index dc2b479..921afb0 100644
--- a/ssl/record/ssl3_record.c
+++ b/ssl/record/ssl3_record.c
@@ -33,10 +33,10 @@ static const unsigned char ssl3_pad_2[48] = {
/*
* Clear the contents of an SSL3_RECORD but retain any memory allocated
*/
-void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs)
+void SSL3_RECORD_clear(SSL3_RECORD *r, size_t num_recs)
{
unsigned char *comp;
- unsigned int i;
+ size_t i;
for (i = 0; i < num_recs; i++) {
comp = r[i].comp;
@@ -46,9 +46,9 @@ void SSL3_RECORD_clear(SSL3_RECORD *r, unsigned int num_recs)
}
}
-void SSL3_RECORD_release(SSL3_RECORD *r, unsigned int num_recs)
+void SSL3_RECORD_release(SSL3_RECORD *r, size_t num_recs)
{
- unsigned int i;
+ size_t i;
for (i = 0; i < num_recs; i++) {
OPENSSL_free(r[i].comp);