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

Merge branch 'm_savard'

Browse Source 
Conflicts:
	sflphone-common/test/sdesnegotiatorTest.cpp
	sflphone-common/test/sdesnegotiatorTest.h
This commit is contained in:
Alexandre Savard
2010-01-28 15:42:03 -05:00
parent e92778f99f d33e351f20
commit 5eb5b0c3f7
5 changed files with 57 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,39 +89,47 @@ void SdesNegotiatorTest::testKeyParamsPattern()
pattern = new sfl::Pattern("(?P<srtpKeyMethod>inline|[A-Za-z0-9_]+)\\:" \
"(?P<srtpKeyInfo>[A-Za-z0-9\x2B\x2F\x3D]+)\\|" \
"2\\^(?P<lifetime>[0-9]+)\\|" \
"(2\\^(?P<lifetime>[0-9]+)\\|" \
"(?P<mkiValue>[0-9]+)\\:" \
"(?P<mkiLength>[0-9]{1,3})\\;?", "g");
"(?P<mkiLength>[0-9]{1,3})\\;?)?", "g");
*pattern << subject;
pattern->matches();
CPPUNIT_ASSERT(pattern->group("srtpKeyMethod").compare("inline:"));
CPPUNIT_ASSERT(pattern->group("srtpKeyInfo").compare("d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj")
== 0);
CPPUNIT_ASSERT(pattern->group("lifetime").compare("20")== 0);
CPPUNIT_ASSERT(pattern->group("mkiValue").compare("1")== 0);
CPPUNIT_ASSERT(pattern->group("mkiLength").compare("32")== 0);
delete pattern;
pattern = NULL;
}
void SdesNegotiatorTest::testKeyParamsPatternCiscoStyle()
void SdesNegotiatorTest::testKeyParamsPatternWithoutMKI()
{
std::string subject = "inline:d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj";
pattern = new sfl::Pattern("(?P<srtpKeyMethod>inline|[A-Za-z0-9_]+)\\:" \
"(?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");
"(?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");
*pattern << subject;
pattern->matches();
CPPUNIT_ASSERT(pattern->group("srtpKeyMethod").compare("inline:"));
CPPUNIT_ASSERT(pattern->group("srtpKeyInfo").compare("d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj") == 0);
CPPUNIT_ASSERT(pattern->group("srtpKeyMethod").compare("inline:"));
CPPUNIT_ASSERT(pattern->group("srtpKeyInfo").compare("d0RmdmcmVCspeEc3QGZiNWpVLFJhQX1cfHAwJSoj")
== 0);
delete pattern;
pattern = NULL;
}
/**
* Make sure that all the fields can be extracted
* properly from the syntax.
@ -199,15 +207,14 @@ void SdesNegotiatorTest::testMostSimpleCase()
sfl::SdesNegotiator * negotiator = new sfl::SdesNegotiator(*capabilities, *cryptoOffer);
printf("negotiator->getCryptoSuite() %s\n", negotiator->getCryptoSuite().c_str());
printf("negotiator->getKeyMethod() %s\n", negotiator->getKeyMethod().c_str());
printf("negotiator->getKeyInfo() %s\n", negotiator->getKeyInfo().c_str());
CPPUNIT_ASSERT(negotiator->negotiate() == true);
CPPUNIT_ASSERT(negotiator->getCryptoSuite().compare("AES_CM_128_HMAC_SHA1_80") == 0);
CPPUNIT_ASSERT(negotiator->getKeyMethod().compare("inline") == 0);
CPPUNIT_ASSERT(negotiator->getKeyInfo().compare("AAECAwQFBgcICQoLDA0ODxAREhMUFRYXGBkaGxwd") == 0);
CPPUNIT_ASSERT(negotiator->getLifeTime().compare("")== 0);
CPPUNIT_ASSERT(negotiator->getMkiValue().compare("")== 0);
CPPUNIT_ASSERT(negotiator->getMkiLength().compare("")== 0);
delete capabilities; capabilities = NULL;
delete cryptoOffer; cryptoOffer = NULL;