kenmirrors
/
freeswitch
mirror of https://github.com/signalwire/freeswitch.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

reapply several compiler fixes after last commit

This commit is contained in:
Jeff Lenk 2014-01-31 08:54:26 -06:00
parent f6afcb215d
commit 035985859c
4 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/srtp/crypto/cipher/aes_icm.c
View File

@ -387,7 +387,7 @@ aes_icm_encrypt_ismacryp(aes_icm_ctx_t *c,
for (i=0; i < (bytes_to_encr/sizeof(v128_t)); i++) { for (i=0; i < (bytes_to_encr/sizeof(v128_t)); i++) {
/* fill buffer with new keystream */ /* fill buffer with new keystream */
aes_icm_advance_ismacryp(c, forIsmacryp); aes_icm_advance_ismacryp(c, (uint8_t)forIsmacryp);
/* /*
* add keystream into the data buffer (this would be a lot faster * add keystream into the data buffer (this would be a lot faster
@ -435,7 +435,7 @@ aes_icm_encrypt_ismacryp(aes_icm_ctx_t *c,
if ((bytes_to_encr & 0xf) != 0) { if ((bytes_to_encr & 0xf) != 0) {
/* fill buffer with new keystream */ /* fill buffer with new keystream */
aes_icm_advance_ismacryp(c, forIsmacryp); aes_icm_advance_ismacryp(c, (uint8_t)forIsmacryp);
for (i=0; i < (bytes_to_encr & 0xf); i++) for (i=0; i < (bytes_to_encr & 0xf); i++)
*buf++ ^= c->keystream_buffer.v8[i]; *buf++ ^= c->keystream_buffer.v8[i];

2
libs/srtp/crypto/math/stat.c
View File

@ -24,7 +24,7 @@ debug_module_t mod_stat = {
err_status_t err_status_t
stat_test_monobit(uint8_t *data) { stat_test_monobit(uint8_t *data) {
uint8_t *data_end = data + STAT_TEST_DATA_LEN; uint8_t *data_end = data + STAT_TEST_DATA_LEN;
uint16_t ones_count; int ones_count;
ones_count = 0; ones_count = 0;
while (data < data_end) { while (data < data_end) {

2
libs/srtp/crypto/replay/rdbx.c
View File

@ -292,7 +292,7 @@ rdbx_add_index(rdbx_t *rdbx, int delta) {
if (delta > 0) { if (delta > 0) {
/* shift forward by delta */ /* shift forward by delta */
index_advance(&rdbx->index, delta); index_advance(&rdbx->index, (sequence_number_t)delta);
bitvector_left_shift(&rdbx->bitmask, delta); bitvector_left_shift(&rdbx->bitmask, delta);
bitvector_set_bit(&rdbx->bitmask, bitvector_get_length(&rdbx->bitmask) - 1); bitvector_set_bit(&rdbx->bitmask, bitvector_get_length(&rdbx->bitmask) - 1);
} else { } else {

20
libs/srtp/include/srtp_priv.h
View File

@ -69,12 +69,12 @@
*/ */
typedef struct { typedef struct {
unsigned char cc:4; /* CSRC count */ unsigned cc:4; /* CSRC count */
unsigned char x:1; /* header extension flag */ unsigned x:1; /* header extension flag */
unsigned char p:1; /* padding flag */ unsigned p:1; /* padding flag */
unsigned char version:2; /* protocol version */ unsigned version:2; /* protocol version */
unsigned char pt:7; /* payload type */ unsigned pt:7; /* payload type */
unsigned char m:1; /* marker bit */ unsigned m:1; /* marker bit */
uint16_t seq; /* sequence number */ uint16_t seq; /* sequence number */
uint32_t ts; /* timestamp */ uint32_t ts; /* timestamp */
uint32_t ssrc; /* synchronization source */ uint32_t ssrc; /* synchronization source */
@ -112,10 +112,10 @@ typedef struct {
#ifndef WORDS_BIGENDIAN #ifndef WORDS_BIGENDIAN
typedef struct { typedef struct {
unsigned char rc:5; /* reception report count */ unsigned rc:5; /* reception report count */
unsigned char p:1; /* padding flag */ unsigned p:1; /* padding flag */
unsigned char version:2; /* protocol version */ unsigned version:2; /* protocol version */
unsigned char pt:8; /* payload type */ unsigned pt:8; /* payload type */
uint16_t len; /* length */ uint16_t len; /* length */
uint32_t ssrc; /* synchronization source */ uint32_t ssrc; /* synchronization source */
} srtcp_hdr_t; } srtcp_hdr_t;