Skip to content
Snippets Groups Projects
Commit d252ab34 authored by Alexandre Savard's avatar Alexandre Savard
Browse files

[#1722] Use getLocalSSRCNetwork() to identify crypto context for in out RTP

parent e2fc783e
No related merge requests found
...@@ -43,6 +43,7 @@ AudioSrtpSession::AudioSrtpSession (ManagerImpl * manager, SIPCall * sipcall) : ...@@ -43,6 +43,7 @@ AudioSrtpSession::AudioSrtpSession (ManagerImpl * manager, SIPCall * sipcall) :
initializeMasterSalt(); initializeMasterSalt();
initializeInputCryptoContext(); initializeInputCryptoContext();
initializeOutputCryptoContext(); initializeOutputCryptoContext();
outputCryptoCtx->deriveSrtpKeys(0); outputCryptoCtx->deriveSrtpKeys(0);
setInQueueCryptoContext(inputCryptoCtx); setInQueueCryptoContext(inputCryptoCtx);
...@@ -71,36 +72,36 @@ void AudioSrtpSession::initializeMasterSalt(void) ...@@ -71,36 +72,36 @@ void AudioSrtpSession::initializeMasterSalt(void)
void AudioSrtpSession::initializeInputCryptoContext(void) void AudioSrtpSession::initializeInputCryptoContext(void)
{ {
inputCryptoCtx = new ost::CryptoContext(0x12345678, inputCryptoCtx = new ost::CryptoContext(getLocalSSRCNetwork(),
0, // roc, 0, // roc,
0L, // keydr, 0L, // keydr,
SrtpEncryptionAESCM, // encryption algo SrtpEncryptionAESCM, // encryption algo
SrtpAuthenticationSha1Hmac, // authtication algo SrtpAuthenticationSha1Hmac, // authtication algo
_masterKey, // Master Key _masterKey, // Master Key
128 / 8, // Master Key length 128 / 8, // Master Key length
_masterSalt, // Master Salt _masterSalt, // Master Salt
112 / 8, // Master Salt length 112 / 8, // Master Salt length
128 / 8, // encryption keyl 128 / 8, // encryption keyl
160 / 8, // authentication key len 160 / 8, // authentication key len
112 / 8, // session salt len 112 / 8, // session salt len
80 / 8); // authentication tag len 80 / 8); // authentication tag len
} }
void AudioSrtpSession::initializeOutputCryptoContext(void) void AudioSrtpSession::initializeOutputCryptoContext(void)
{ {
outputCryptoCtx = new ost::CryptoContext(0x12345678, outputCryptoCtx = new ost::CryptoContext(getLocalSSRCNetwork(),
0, // roc, 0, // roc,
0L, // keydr, 0L, // keydr,
SrtpEncryptionAESCM, // encryption algo SrtpEncryptionAESCM, // encryption algo
SrtpAuthenticationSha1Hmac, // authtication algo SrtpAuthenticationSha1Hmac, // authtication algo
_masterKey, // Master Key _masterKey, // Master Key
128 / 8, // Master Key length 128 / 8, // Master Key length
_masterSalt, // Master Salt _masterSalt, // Master Salt
112 / 8, // Master Salt length 112 / 8, // Master Salt length
128 / 8, // encryption keyl 128 / 8, // encryption keyl
160 / 8, // authentication key len 160 / 8, // authentication key len
112 / 8, // session salt len 112 / 8, // session salt len
80 / 8); // authentication tag len 80 / 8); // authentication tag len
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment