kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-02 02:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "res_pjsip_sdp_rtp: Reject offer of required SRTP without res_srtp." into 13

Browse Source
This commit is contained in:
Joshua Colp
2016-11-11 15:17:54 -06:00
committed by Gerrit Code Review
parent cf08676c00 b70eb07c53
commit 10e64a5fb8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
res/res_pjsip_sdp_rtp.c
View File

@@ -896,9 +896,11 @@ static int negotiate_incoming_sdp_stream(struct ast_sip_session *session, struct
res = setup_media_encryption(session, session_media, sdp, stream); res = setup_media_encryption(session, session_media, sdp, stream);
if (res) { if (res) {
if (!session->endpoint->media.rtp.encryption_optimistic) { if (!session->endpoint->media.rtp.encryption_optimistic ||
!pj_strncmp2(&stream->desc.transport, "RTP/SAVP", 8)) {
/* If optimistic encryption is disabled and crypto should have been enabled /* If optimistic encryption is disabled and crypto should have been enabled
* but was not this session must fail. * but was not this session must fail. This must also fail if crypto was
* required in the offer but could not be set up.
*/ */
return -1; return -1;
} }