Changeset 4537 for pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c
- Timestamp:
- Jun 19, 2013 6:47:43 AM (11 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
pjproject/trunk/pjlib/src/pj/ssl_sock_ossl.c
r4506 r4537 381 381 382 382 pj_memcpy(buf, cert->privkey_pass.ptr, cert->privkey_pass.slen); 383 return cert->privkey_pass.slen;383 return (int)cert->privkey_pass.slen; 384 384 } 385 385 … … 988 988 989 989 /* Workaround for ticket #985 */ 990 #if defined(PJ_WIN32) && PJ_WIN32!=0990 #if (defined(PJ_WIN32) && PJ_WIN32!=0) || (defined(PJ_WIN64) && PJ_WIN64!=0) 991 991 if (ssock->param.timer_heap) { 992 992 pj_time_val interval = {0, DELAYED_CLOSE_TIMEOUT}; … … 1131 1131 } else { 1132 1132 /* Overlapped */ 1133 unsignedright_len, left_len;1133 pj_size_t right_len, left_len; 1134 1134 right_len = buf->buf + buf->max_len - (char*)wdata; 1135 1135 left_len = (char*)wdata->next - buf->buf; … … 1139 1139 /* This is the last data, just adjust the buffer length */ 1140 1140 if (wdata->prev < wdata) { 1141 unsignedjump_len;1141 pj_size_t jump_len; 1142 1142 jump_len = (char*)wdata - 1143 1143 ((char*)wdata->prev + wdata->prev->record_len); … … 1145 1145 } else { 1146 1146 /* Overlapped */ 1147 unsignedright_len, left_len;1147 pj_size_t right_len, left_len; 1148 1148 right_len = buf->buf + buf->max_len - 1149 1149 ((char*)wdata->prev + wdata->prev->record_len); … … 1388 1388 if (data && size > 0) { 1389 1389 /* Consume the whole data */ 1390 nwritten = BIO_write(ssock->ossl_rbio, data, size);1390 nwritten = BIO_write(ssock->ossl_rbio, data, (int)size); 1391 1391 if (nwritten < size) { 1392 1392 status = GET_SSL_STATUS(ssock); … … 1414 1414 read_data_t *buf = *(OFFSET_OF_READ_DATA_PTR(ssock, data)); 1415 1415 void *data_ = (pj_int8_t*)buf->data + buf->len; 1416 int size_ = ssock->read_size - buf->len;1416 int size_ = (int)(ssock->read_size - buf->len); 1417 1417 1418 1418 /* SSL_read() may write some data to BIO write when re-negotiation … … 1456 1456 } else { 1457 1457 1458 int err = SSL_get_error(ssock->ossl_ssl, size);1458 int err = SSL_get_error(ssock->ossl_ssl, (int)size); 1459 1459 1460 1460 /* SSL might just return SSL_ERROR_WANT_READ in … … 1664 1664 /* Start read */ 1665 1665 status = pj_activesock_start_read2(ssock->asock, ssock->pool, 1666 ssock->param.read_buffer_size,1666 (unsigned)ssock->param.read_buffer_size, 1667 1667 ssock->asock_rbuf, 1668 1668 PJ_IOQUEUE_ALWAYS_ASYNC); … … 1743 1743 /* Start read */ 1744 1744 status = pj_activesock_start_read2(ssock->asock, ssock->pool, 1745 ssock->param.read_buffer_size,1745 (unsigned)ssock->param.read_buffer_size, 1746 1746 ssock->asock_rbuf, 1747 1747 PJ_IOQUEUE_ALWAYS_ASYNC); … … 2181 2181 */ 2182 2182 pj_lock_acquire(ssock->write_mutex); 2183 nwritten = SSL_write(ssock->ossl_ssl, data, size);2183 nwritten = SSL_write(ssock->ossl_ssl, data, (int)size); 2184 2184 pj_lock_release(ssock->write_mutex); 2185 2185
Note: See TracChangeset
for help on using the changeset viewer.