[asterisk-commits] oej: branch oej/lingon-srtp-key-lifetime-1.8 r415968 - in /team/oej/lingon-sr...

[SVN commits to the Asterisk project]

Author: oej
Date: Thu Jun 12 12:42:11 2014
New Revision: 415968

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=415968
Log:
Reset branch and add some comments. Still haven't figured out the MKI bit. It's hard.

Modified:
    team/oej/lingon-srtp-key-lifetime-1.8/   (props changed)
    team/oej/lingon-srtp-key-lifetime-1.8/channels/sip/sdp_crypto.c

Propchange: team/oej/lingon-srtp-key-lifetime-1.8/
------------------------------------------------------------------------------
    automerge = Is-there-life-off-net?

Propchange: team/oej/lingon-srtp-key-lifetime-1.8/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Jun 12 12:42:11 2014
@@ -1,1 +1,1 @@
-/branches/1.8:1-415877
+/branches/1.8:1-415948

Modified: team/oej/lingon-srtp-key-lifetime-1.8/channels/sip/sdp_crypto.c
URL: http://svnview.digium.com/svn/asterisk/team/oej/lingon-srtp-key-lifetime-1.8/channels/sip/sdp_crypto.c?view=diff&rev=415968&r1=415967&r2=415968
==============================================================================
--- team/oej/lingon-srtp-key-lifetime-1.8/channels/sip/sdp_crypto.c (original)
+++ team/oej/lingon-srtp-key-lifetime-1.8/channels/sip/sdp_crypto.c Thu Jun 12 12:42:11 2014
@@ -230,6 +230,13 @@
 SNOM sends without lifetime or MKI:
 a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:H5Yen2gCtRLey/IBGPjHeLLpbnivJDg6IjzvV3vZ
 
+If we are getting an offer with one key using MKI and one key that is not using MKI,
+we should select the key without MKI
+	a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:PS1uQCVeeCFCanVmcjkpPywjNWhcYD0mXXtxaVBR|2^20|1:32
+	a=crypto:2 AES_CM_128_HMAC_SHA1_80 inline:SS1uQCVeeCFCaRRmcjkpPywjNWhcYD0mXXtxaVBR|2^20
+
+In this case, we should use crypto:2
+
 	*/
 
 	if (!ast_rtp_engine_srtp_is_registered()) {
@@ -295,7 +302,9 @@
 					mki = strsep(&info, "|");
 				}
 				/* At this point we do not support multiple keys, sorry */
-				if (mki != NULL && *mki != '1') {
+				//if (mki != NULL && *mki != '1') {
+				//If there's an MKI, give up.
+				if (mki != NULL) {
 					ast_log(LOG_ERROR, "Crypto mki handling not implemented. MKI = %s \n", mki);
 					continue;
 				}