From 47739161c685790344981c6858fe35c63cd705b1 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 20 Feb 2014 22:37:33 +0000 Subject: [PATCH] fix WIN32 warnings (cherry picked from commit b709f8ef54b1c9ad513878ba0213aa651a9acef8) --- crypto/x509v3/v3_scts.c | 2 +- ssl/s3_clnt.c | 2 +- ssl/s3_srvr.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/x509v3/v3_scts.c b/crypto/x509v3/v3_scts.c index c6ef0dc901..32548007d8 100644 --- a/crypto/x509v3/v3_scts.c +++ b/crypto/x509v3/v3_scts.c @@ -102,7 +102,7 @@ static void timestamp_print(BIO *out, BN_ULLONG timestamp) char genstr[20]; gen = ASN1_GENERALIZEDTIME_new(); ASN1_GENERALIZEDTIME_adj(gen, (time_t)0, - timestamp / 86400000, + (int)(timestamp / 86400000), (timestamp % 86400000) / 1000); /* Note GeneralizedTime from ASN1_GENERALIZETIME_adj is always 15 * characters long with a final Z. Update it with fractional seconds. diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 3a1b341bb9..9755a0feb2 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -3719,7 +3719,7 @@ int tls1_get_server_supplemental_data(SSL *s) long n; const unsigned char *p, *d; unsigned short supp_data_entry_type = 0; - unsigned long supp_data_entry_len = 0; + unsigned short supp_data_entry_len = 0; unsigned long supp_data_len = 0; size_t i; int cb_retval = 0; diff --git a/ssl/s3_srvr.c b/ssl/s3_srvr.c index 7dc085b647..3f43dcc4be 100644 --- a/ssl/s3_srvr.c +++ b/ssl/s3_srvr.c @@ -3806,7 +3806,7 @@ int tls1_get_client_supplemental_data(SSL *s) long n; const unsigned char *p, *d; unsigned short supp_data_entry_type = 0; - unsigned long supp_data_entry_len = 0; + unsigned short supp_data_entry_len = 0; unsigned long supp_data_len = 0; size_t i = 0; -- GitLab