diff options
| author | Matt Caswell <matt@openssl.org> | 2016-10-19 15:11:24 +0100 |
|---|---|---|
| committer | Matt Caswell <matt@openssl.org> | 2016-11-04 12:09:46 +0000 |
| commit | 348240c676a1b2beaebb865e8be0b62f88c10b7d (patch) | |
| tree | 4ab53f4be6dee16b0a91113264047970c5cff1b9 /ssl/s3_lib.c | |
| parent | a14aa99be8fe169bba7afc6355b6b6d750b2ba1d (diff) | |
| download | openssl-348240c676a1b2beaebb865e8be0b62f88c10b7d.tar.gz | |
Fix misc size_t issues causing Windows warnings in 64 bit
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'ssl/s3_lib.c')
| -rw-r--r-- | ssl/s3_lib.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ssl/s3_lib.c b/ssl/s3_lib.c index d6d7c46287..45824012ef 100644 --- a/ssl/s3_lib.c +++ b/ssl/s3_lib.c @@ -3035,9 +3035,10 @@ long ssl3_ctrl(SSL *s, int cmd, long larg, void *parg) case SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP: *(unsigned char **)parg = s->tlsext_ocsp_resp; - if (s->tlsext_ocsp_resplen == 0) + if (s->tlsext_ocsp_resplen == 0 + || s->tlsext_ocsp_resplen > LONG_MAX) return -1; - return s->tlsext_ocsp_resplen; + return (long)s->tlsext_ocsp_resplen; case SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP: OPENSSL_free(s->tlsext_ocsp_resp); @@ -3955,9 +3956,10 @@ int ssl_fill_hello_random(SSL *s, int server, unsigned char *result, size_t len) unsigned long Time = (unsigned long)time(NULL); unsigned char *p = result; l2n(Time, p); - return RAND_bytes(p, len - 4); + /* TODO(size_t): Convert this */ + return RAND_bytes(p, (int)(len - 4)); } else - return RAND_bytes(result, len); + return RAND_bytes(result, (int)len); } int ssl_generate_master_secret(SSL *s, unsigned char *pms, size_t pmslen, |