jami/jami-daemon
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-daemon.git synced 2025-08-12 22:09:25 +08:00
Code Issues Projects Releases Wiki Activity

[#1722] Fix mkiLifetime mkiKeyLength separator

Browse Source
This commit is contained in:
Alexandre Savard
2010-01-13 15:10:28 -05:00
parent 724a0e6b70
commit 5cf2efbed4
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sflphone-common/src/audio/audiortp/AudioSrtpSession.cpp
View File

@ -73,7 +73,7 @@ std::string AudioSrtpSession::getLocalCryptoInfo() {
std::string srtp_keys = "inline:";
// srtp_keys.append("16/14/");
srtp_keys += getBase64ConcatenatedKeys();
srtp_keys.append("/2^20/1:32");
srtp_keys.append("|2^20|1:32");
std::string crypto = tag.append(" ");
crypto += crypto_suite.append(" ");

2
sflphone-common/src/sip/SdesNegotiator.cpp
View File

@ -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]+)\\|" \
"(?P<srtpKeyInfo>[A-Za-z0-9\x2B\x2F\x3D]+|[\w\x2B\x2F\x3D]+)\\|" \
"2\\^(?P<lifetime>[0-9]+)\\|" \
"(?P<mkiValue>[0-9]+)\\:" \
"(?P<mkiLength>[0-9]{1,3})\\;?", "g");

6
sflphone-common/test/sdesnegotiatorTest.cpp
View File

@ -41,9 +41,9 @@ using std::endl;
void SdesNegotiatorTest::setUp()
{
// std::string attr("1 AES_CM_128_HMAC_SHA1_32 srtp inline:16/14/AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwd/2^20/1:32");
std::string attr("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwd|2^20|1:32");
std::string attr("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32");
// std::string attr("a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj|2^20|1:32");
remoteOffer = new std::vector<std::string>();
remoteOffer->push_back(attr);
@ -149,7 +149,7 @@ void SdesNegotiatorTest::testNegotiation()
CPPUNIT_ASSERT(sdesnego->negotiate());
CPPUNIT_ASSERT(sdesnego->getCryptoSuite().compare("AES_CM_128_HMAC_SHA1_80") == 0);
CPPUNIT_ASSERT(sdesnego->getKeyMethod().compare("inline") == 0);
CPPUNIT_ASSERT(sdesnego->getKeyInfo().compare("d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj") == 0);
CPPUNIT_ASSERT(sdesnego->getKeyInfo().compare("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwd") == 0);
CPPUNIT_ASSERT(sdesnego->getLifeTime().compare("20") == 0);
CPPUNIT_ASSERT(sdesnego->getMkiValue().compare("1") == 0);
CPPUNIT_ASSERT(sdesnego->getMkiLength().compare("32") == 0);