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

Merge pull request #915 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8783-srtp-bus-error-on-sparc to master 

* commit 'c08809e29009d5f51bdc2276530e9ec40f211eaf':
  FS-8783: [libsrtp] Fix alignment issue
This commit is contained in:
Mike Jerris 2016-08-16 13:24:37 -05:00
parent dc4ae1f700 c08809e290
commit bb7f8783c9
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,12 +284,15 @@ aes_icm_set_octet(aes_icm_ctx_t *c,
err_status_t
aes_icm_set_iv(aes_icm_ctx_t *c, void *iv, int direction) {
v128_t *nonce = (v128_t *) iv;
v128_t nonce;
/* set nonce (for alignment) */
v128_copy_octet_string(&nonce, iv);
debug_print(mod_aes_icm,
"setting iv: %s", v128_hex_string(nonce));
"setting iv: %s", v128_hex_string(&nonce));
v128_xor(&c->counter, &c->offset, nonce);
v128_xor(&c->counter, &c->offset, &nonce);
debug_print(mod_aes_icm,
"set_counter: %s", v128_hex_string(&c->counter));

9
libs/srtp/crypto/cipher/aes_icm_ossl.c
View File

@ -263,11 +263,14 @@ err_status_t aes_icm_openssl_context_init (aes_icm_ctx_t *c, const uint8_t *key)
err_status_t aes_icm_openssl_set_iv (aes_icm_ctx_t *c, void *iv, int dir)
{
const EVP_CIPHER *evp;
v128_t *nonce = (v128_t*)iv;
v128_t nonce;
debug_print(mod_aes_icm, "setting iv: %s", v128_hex_string(nonce));
/* set nonce (for alignment) */
v128_copy_octet_string(&nonce, iv);
v128_xor(&c->counter, &c->offset, nonce);
debug_print(mod_aes_icm, "setting iv: %s", v128_hex_string(&nonce));
v128_xor(&c->counter, &c->offset, &nonce);
debug_print(mod_aes_icm, "set_counter: %s", v128_hex_string(&c->counter));