From: Matt Caswell Date: Tue, 2 Jun 2015 07:57:02 +0000 (+0100) Subject: Correct type of RECORD_LAYER_get_rrec_length() X-Git-Tag: OpenSSL_1_1_0-pre1~1007 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=b821df5f5b8dbb9bae109ed01076cb4b393b67e0;p=oweals%2Fopenssl.git Correct type of RECORD_LAYER_get_rrec_length() The underlying field returned by RECORD_LAYER_get_rrec_length() is an unsigned int. The return type of the function should match that. Reviewed-by: Tim Hudson --- diff --git a/ssl/record/rec_layer_s3.c b/ssl/record/rec_layer_s3.c index 47a021d687..79d3c21fbe 100644 --- a/ssl/record/rec_layer_s3.c +++ b/ssl/record/rec_layer_s3.c @@ -1504,7 +1504,7 @@ int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl) /* * Returns the length in bytes of the current rrec */ -int RECORD_LAYER_get_rrec_length(RECORD_LAYER *rl) +unsigned int RECORD_LAYER_get_rrec_length(RECORD_LAYER *rl) { return SSL3_RECORD_get_length(&rl->rrec); } diff --git a/ssl/record/record.h b/ssl/record/record.h index cf1607ccb4..6931bb4712 100644 --- a/ssl/record/record.h +++ b/ssl/record/record.h @@ -326,7 +326,7 @@ void RECORD_LAYER_reset_read_sequence(RECORD_LAYER *rl); void RECORD_LAYER_reset_write_sequence(RECORD_LAYER *rl); int RECORD_LAYER_setup_comp_buffer(RECORD_LAYER *rl); int RECORD_LAYER_is_sslv2_record(RECORD_LAYER *rl); -int RECORD_LAYER_get_rrec_length(RECORD_LAYER *rl); +unsigned int 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,