Merge pull request #7 in FSA/freeswitch-advantage from MKI-regression to v1.8-fsa

* commit '755ce589ce65422a69ce11f86f64186bff6f902c':
  FS-10778: Fix for MKI regression introduced in FS-10778
This commit is contained in:
Mike Jerris 2018-01-02 21:39:46 +00:00
commit dfe2ebb038

View File

@ -3130,11 +3130,11 @@ static int dtls_state_setup(switch_rtp_t *rtp_session, switch_dtls_t *dtls)
local_salt = remote_salt + cr_saltlen;
}
memcpy(&ssec.local_raw_key, local_key, cr_keylen);
memcpy(&ssec.local_raw_key + cr_keylen, local_salt, cr_saltlen);
memcpy(ssec.local_raw_key, local_key, cr_keylen);
memcpy(ssec.local_raw_key + cr_keylen, local_salt, cr_saltlen);
memcpy(&ssec.remote_raw_key, remote_key, cr_keylen);
memcpy(&ssec.remote_raw_key + cr_keylen, remote_salt, cr_saltlen);
memcpy(ssec.remote_raw_key, remote_key, cr_keylen);
memcpy(ssec.remote_raw_key + cr_keylen, remote_salt, cr_saltlen);
ssec.crypto_type = AES_CM_128_HMAC_SHA1_80;