diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-11-11 22:21:10 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-11-13 10:58:21 +0100 |
| commit | 802127e8fc07cbef499b645e7e1ae48ce3ed981c (patch) | |
| tree | 24f616a708827b670df7af0d80208ef615c7f19b /ssl/ssl_asn1.c | |
| parent | b4c0e4dff6c84a3cdf464587923eaa0f789168b8 (diff) | |
| download | openssl-802127e8fc07cbef499b645e7e1ae48ce3ed981c.zip openssl-802127e8fc07cbef499b645e7e1ae48ce3ed981c.tar.gz openssl-802127e8fc07cbef499b645e7e1ae48ce3ed981c.tar.bz2 | |
ssl/ssl_asn1.c: resolve warnings in VC-WIN32 build, which allows to add /WX.
It's argued that /WX allows to keep better focus on new code, which
motivates its comeback...
[Keep this commit separate as reminder for time overhaul.]
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4721)
Diffstat (limited to 'ssl/ssl_asn1.c')
| -rw-r--r-- | ssl/ssl_asn1.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c index 7258618..9327b33 100644 --- a/ssl/ssl_asn1.c +++ b/ssl/ssl_asn1.c @@ -296,12 +296,12 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, ret->master_key_length = tmpl; if (as->time != 0) - ret->time = as->time; + ret->time = (long)as->time; else - ret->time = (unsigned long)time(NULL); + ret->time = (long)time(NULL); if (as->timeout != 0) - ret->timeout = as->timeout; + ret->timeout = (long)as->timeout; else ret->timeout = 3; @@ -326,7 +326,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, goto err; #endif - ret->ext.tick_lifetime_hint = as->tlsext_tick_lifetime_hint; + ret->ext.tick_lifetime_hint = (unsigned long)as->tlsext_tick_lifetime_hint; ret->ext.tick_age_add = as->tlsext_tick_age_add; if (as->tlsext_tick) { ret->ext.tick = as->tlsext_tick->data; @@ -352,7 +352,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp, goto err; #endif /* OPENSSL_NO_SRP */ /* Flags defaults to zero which is fine */ - ret->flags = as->flags; + ret->flags = (int32_t)as->flags; ret->ext.max_early_data = as->max_early_data; if (as->alpn_selected != NULL) { |