Commit c8cf8b73 authored by Sylvain Berfini's avatar Sylvain Berfini 🎩

Merge branch 'master' of git.linphone.org:ortp

parents f71b2073 ca6a3379
February 22th, 2012: ortp-0.20.0
- fix an issue on video call with ZRTP
February 17th, 2012: ortp-0.19.0
- ZRTP media encryption
December 22th, 2011: ortp-0.18.0
- SRTP media encryption
......
dnl Process this file with autoconf to produce a configure script.
AC_INIT([ortp],[0.18.0])
AC_INIT([ortp],[0.20.0])
AC_CANONICAL_SYSTEM
dnl Source packaging numbers
......
......@@ -60,7 +60,7 @@ develop programs using the oRTP library.
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall
make install DESTDIR=$RPM_BUILD_ROOT
%clean
rm -rf $RPM_BUILD_ROOT
......
......@@ -18,7 +18,7 @@
*/
#if defined(WIN32) || defined(_WIN32_WCE)
#ifdef _MSC_VER
#include "ortp-config-win32.h"
#elif HAVE_CONFIG_H
#include "ortp-config.h"
......
......@@ -436,6 +436,7 @@ static int32_t ozrtp_srtpSecretsReady (ZrtpContext* ctx, C_SrtpSecret_t* secrets
addStreamStatus=srtp_add_stream(userData->srtpSend, &policy);
} else { //if (part == ForReceiver)
srtpCreateStatus=srtp_create(&userData->srtpRecv, NULL);
policy.ssrc.type = ssrc_any_inbound; /*we don't know the incoming ssrc will be */
policy.ssrc.value=userData->session->rcv.ssrc; // peer
int32_t peerRole=secrets->role == Initiator ? Responder : Initiator;
policy.key=key_with_salt(secrets,peerRole);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment