Commit Graph

12 Commits

Author SHA1 Message Date
5eb5b0c3f7 Merge branch 'm_savard'
Conflicts:
	sflphone-common/test/sdesnegotiatorTest.cpp
	sflphone-common/test/sdesnegotiatorTest.h
2010-01-28 15:42:03 -05:00
d33e351f20 [#2522] Fix SDES negotiation to be compatible with incomplete key parameter field 2010-01-28 14:38:54 -05:00
e92778f99f Merge branch 'master' of git+ssh://repos-sflphone-git@git.sflphone.org/var/repos/sflphone/git/sflphone
Conflicts:
	sflphone-common/test/sdesnegotiatorTest.h
2010-01-27 23:39:39 -05:00
0e9fb9c149 Added new test for a different regex supporting the Cisco style that omits
some parameters prescribed in RFC4568.
2010-01-27 18:53:17 -05:00
aa60db7289 [#2522] Write a new test for keyparameters sdes value
This test fails since Lifetime, MKI Value, and MKI Length are optional for most
application supporting sdes/srtp
2010-01-27 16:18:49 -05:00
f0f7027a30 [#1722] Put crypto attribute in media field 2010-01-18 12:30:10 -05:00
fa296d6d48 [#1722] Fixed problem where multiple crypto lines could not be processed
sequentially.
2010-01-15 20:10:54 -05:00
5cf2efbed4 [#1722] Fix mkiLifetime mkiKeyLength separator 2010-01-13 15:10:28 -05:00
01b091924b [#1722] Add accessors in SdesNegotiator to get srtp info after negotiation 2010-01-13 11:27:23 -05:00
fbaf32a5e0 [#1722] Working test suite for SdesNegociator 2010-01-13 10:58:57 -05:00
4c06ec3507 [#1722] Not working SdesNegociator unit test 2010-01-12 15:40:27 -05:00
671aae9d2f [#1722] Add SdesNegotiator unit test in test/ 2010-01-12 12:02:51 -05:00