fix WIN32 warnings
authorDr. Stephen Henson <steve@openssl.org>
Thu, 20 Feb 2014 22:37:33 +0000 (22:37 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Thu, 20 Feb 2014 22:55:24 +0000 (22:55 +0000)
(cherry picked from commit b709f8ef54b1c9ad513878ba0213aa651a9acef8)

crypto/x509v3/v3_scts.c
ssl/s3_clnt.c
ssl/s3_srvr.c

index c6ef0dc..3254800 100644 (file)
@@ -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.
index 3a1b341..9755a0f 100644 (file)
@@ -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;
index 7dc085b..3f43dcc 100644 (file)
@@ -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;