commit ec60ccc1c1b9562359753e8fcbeeab0a6b4b669c
author Matt Caswell <matt@openssl.org> Tue Oct 04 20:31:19 2016 +0100
committer Matt Caswell <matt@openssl.org> Fri Nov 04 12:09:45 2016 +0000
tree 4db1076afbff2f1e1e4f66200fdf9b9b95d3f4c9
parent 8c1a534305054c58d783fdfe7adbed24f5893a2e

Convert session_id_length and sid_ctx_len to size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>

ssl/ssl_asn1.c

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index aa6e3e6..9b6ea0a 100644
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -223,14 +223,14 @@
 
 /* Copy an OCTET STRING, return error if it exceeds maximum length */
 
-static int ssl_session_memcpy(unsigned char *dst, unsigned int *pdstlen,
-                              ASN1_OCTET_STRING *src, int maxlen)
+static int ssl_session_memcpy(unsigned char *dst, size_t *pdstlen,
+                              ASN1_OCTET_STRING *src, size_t maxlen)
 {
     if (src == NULL) {
         *pdstlen = 0;
         return 1;
     }
-    if (src->length > maxlen)
+    if (src->length < 0 || src->length > (int)maxlen)
         return 0;
     memcpy(dst, src->data, src->length);
     *pdstlen = src->length;
@@ -241,7 +241,7 @@
                              long length)
 {
     long id;
-    unsigned int tmpl;
+    size_t tmpl;
     const unsigned char *p = *pp;
     SSL_SESSION_ASN1 *as = NULL;
     SSL_SESSION *ret = NULL;