generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Address more Windows warnings illuminated by mingw.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Andy Polyakov 2015-10-05 15:23:37 +02:00
parent 52ee3ed3a1
commit f4bd5de544
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/openssl/e_os2.h
View File

@ -262,8 +262,12 @@ extern "C" {
# define OPENSSL_GLOBAL_REF(name) _shadow_##name # define OPENSSL_GLOBAL_REF(name) _shadow_##name
# endif # endif
# ifdef OPENSSL_SYS_MSDOS # ifdef _WIN32
# define ossl_ssize_t long # ifdef _WIN64
# define ossl_ssize_t __int64
# else
# define ossl_ssize_t int
# endif
# endif # endif
# if defined(__ultrix) && !defined(ssize_t) # if defined(__ultrix) && !defined(ssize_t)

16
ssl/record/rec_layer_s3.c
View File

@ -293,7 +293,7 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
* s->packet_length bytes if extend == 1].) * s->packet_length bytes if extend == 1].)
*/ */
int i, len, left; int i, len, left;
long align = 0; size_t align = 0;
unsigned char *pkt; unsigned char *pkt;
SSL3_BUFFER *rb; SSL3_BUFFER *rb;
@ -307,8 +307,8 @@ int ssl3_read_n(SSL *s, int n, int max, int extend)
left = rb->left; left = rb->left;
#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0 #if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
align = (long)rb->buf + SSL3_RT_HEADER_LENGTH; align = (size_t)rb->buf + SSL3_RT_HEADER_LENGTH;
align = (-align) & (SSL3_ALIGN_PAYLOAD - 1); align = (0-align) & (SSL3_ALIGN_PAYLOAD - 1);
#endif #endif
if (!extend) { if (!extend) {
@ -673,7 +673,7 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
int i, mac_size, clear = 0; int i, mac_size, clear = 0;
int prefix_len = 0; int prefix_len = 0;
int eivlen; int eivlen;
long align = 0; size_t align = 0;
SSL3_RECORD *wr; SSL3_RECORD *wr;
SSL3_BUFFER *wb = &s->rlayer.wbuf; SSL3_BUFFER *wb = &s->rlayer.wbuf;
SSL_SESSION *sess; SSL_SESSION *sess;
@ -753,8 +753,8 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
* multiple of SSL3_ALIGN_PAYLOAD, so if we want to align the real * multiple of SSL3_ALIGN_PAYLOAD, so if we want to align the real
* payload, then we can just pretent we simply have two headers. * payload, then we can just pretent we simply have two headers.
*/ */
align = (long)SSL3_BUFFER_get_buf(wb) + 2 * SSL3_RT_HEADER_LENGTH; align = (size_t)SSL3_BUFFER_get_buf(wb) + 2 * SSL3_RT_HEADER_LENGTH;
align = (-align) & (SSL3_ALIGN_PAYLOAD - 1); align = (0-align) & (SSL3_ALIGN_PAYLOAD - 1);
#endif #endif
p = SSL3_BUFFER_get_buf(wb) + align; p = SSL3_BUFFER_get_buf(wb) + align;
SSL3_BUFFER_set_offset(wb, align); SSL3_BUFFER_set_offset(wb, align);
@ -762,8 +762,8 @@ int do_ssl3_write(SSL *s, int type, const unsigned char *buf,
p = SSL3_BUFFER_get_buf(wb) + SSL3_BUFFER_get_offset(wb) + prefix_len; p = SSL3_BUFFER_get_buf(wb) + SSL3_BUFFER_get_offset(wb) + prefix_len;
} else { } else {
#if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0 #if defined(SSL3_ALIGN_PAYLOAD) && SSL3_ALIGN_PAYLOAD!=0
align = (long)SSL3_BUFFER_get_buf(wb) + SSL3_RT_HEADER_LENGTH; align = (size_t)SSL3_BUFFER_get_buf(wb) + SSL3_RT_HEADER_LENGTH;
align = (-align) & (SSL3_ALIGN_PAYLOAD - 1); align = (0-align) & (SSL3_ALIGN_PAYLOAD - 1);
#endif #endif
p = SSL3_BUFFER_get_buf(wb) + align; p = SSL3_BUFFER_get_buf(wb) + align;
SSL3_BUFFER_set_offset(wb, align); SSL3_BUFFER_set_offset(wb, align);