From 7e2e1f35f9bee2697f113887294dd1745b5031c3 Mon Sep 17 00:00:00 2001
From: Alexandre Savard <alexandresavard@alexandresavard-desktop.(none)>
Date: Wed, 13 Jan 2010 15:12:45 -0500
Subject: [PATCH] [#1722] Fix inline: format
---
sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp | 2 +-
sflphone-common/src/sip/SdesNegotiator.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
index b4a7213aac..e5d7fa4208 100644
--- a/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
+++ b/sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
@@ -69,7 +69,7 @@ std::string AudioSrtpSession::getLocalCryptoInfo() {
// std::string srtp_keys = "inline:16/14/NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj/2^20/1:32";
// format srtp keys as the following
- // inline:16/14/NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj/2^20/1:32
+ // inline:16/14/NzB4d1BINUAvLEw6UzF3WSJ+PSdFcGdUJShpX1Zj|2^20|1:32
std::string srtp_keys = "inline:";
// srtp_keys.append("16/14/");
srtp_keys += getBase64ConcatenatedKeys();
diff --git a/sflphone-common/src/sip/SdesNegotiator.cpp b/sflphone-common/src/sip/SdesNegotiator.cpp
index 6720df78d9..e8618e3ab8 100644
--- a/sflphone-common/src/sip/SdesNegotiator.cpp
+++ b/sflphone-common/src/sip/SdesNegotiator.cpp
@@ -74,7 +74,7 @@ void SdesNegotiator::parse (void)
keyParamsPattern = new Pattern (
"(?P<srtpKeyMethod>inline|[A-Za-z0-9_]+)\\:" \
- "(?P<srtpKeyInfo>[A-Za-z0-9\x2B\x2F\x3D]+|[\w\x2B\x2F\x3D]+)\\|" \
+ "(?P<srtpKeyInfo>[A-Za-z0-9\x2B\x2F\x3D]+)\\|" \
"2\\^(?P<lifetime>[0-9]+)\\|" \
"(?P<mkiValue>[0-9]+)\\:" \
"(?P<mkiLength>[0-9]{1,3})\\;?", "g");
--
GitLab