diff options
| author | Andy Polyakov <appro@openssl.org> | 2017-11-11 22:23:12 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2017-11-13 10:58:57 +0100 |
| commit | 3a63c0edab842af3e84ef1cad2b4eb701eece3e1 (patch) | |
| tree | c45bf7fb2f69874b2779b33e5597a59bbc92e648 /apps/s_client.c | |
| parent | 802127e8fc07cbef499b645e7e1ae48ce3ed981c (diff) | |
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...
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4721)
Diffstat (limited to 'apps/s_client.c')
| -rw-r--r-- | apps/s_client.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 58ed1a5343..7c0639faad 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -417,10 +417,11 @@ static int serverinfo_cli_parse_cb(SSL *s, unsigned int ext_type, unsigned char ext_buf[4 + 65536]; /* Reconstruct the type/len fields prior to extension data */ - ext_buf[0] = ext_type >> 8; - ext_buf[1] = ext_type & 0xFF; - ext_buf[2] = inlen >> 8; - ext_buf[3] = inlen & 0xFF; + inlen &= 0xffff; /* for formal memcmpy correctness */ + ext_buf[0] = (unsigned char)(ext_type >> 8); + ext_buf[1] = (unsigned char)(ext_type); + ext_buf[2] = (unsigned char)(inlen >> 8); + ext_buf[3] = (unsigned char)(inlen); memcpy(ext_buf + 4, in, inlen); BIO_snprintf(pem_name, sizeof(pem_name), "SERVERINFO FOR EXTENSION %d", |