From 81f3524da48718decd44d2dae619655ea3811eb3 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@alexandresavard-desktop.(none)>
Date: Thu, 7 Jan 2010 15:02:40 -0500
Subject: [PATCH] [#1722] Set crypto context in SRTP sessions
---
sflphone-common/src/audio/audiortp/AudioRtpSession.h | 2 --
sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp | 5 +++++
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/sflphone-common/src/audio/audiortp/AudioRtpSession.h b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
index 2859304734..e1d8b536cb 100644
--- a/sflphone-common/src/audio/audiortp/AudioRtpSession.h
+++ b/sflphone-common/src/audio/audiortp/AudioRtpSession.h
@@ -187,8 +187,6 @@ namespace sfl {
_layerFrameSize = _audiolayer->getFrameSize(); // in ms
_layerSampleRate = _audiolayer->getSampleRate();
- // if(this->)
-
}
template <typename D>
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
index e8f23bb80e..ac46ec940c 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
@@ -35,6 +35,11 @@ AudioSrtpSession::AudioSrtpSession (ManagerImpl * manager, SIPCall * sipcall) :
_debug ("AudioSrtpSession initialized");
initializeMasterKey();
initializeMasterSalt();
+ initializeCryptoContext();
+ txCryptoCtx->deriveSrtpKeys(0);
+
+ setInQueueCryptoContext(txCryptoCtx);
+ setOutQueueCryptoContext(txCryptoCtx);
}
void AudioSrtpSession::initializeMasterKey(void)
--
GitLab