Recorded merge of revisions 417677 from http://svn.asterisk.org/svn/asterisk/branches/11
authorJoshua Colp <jcolp@digium.com>
Mon, 30 Jun 2014 19:51:28 +0000 (19:51 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 30 Jun 2014 19:51:28 +0000 (19:51 +0000)
commit6e60f5d317d2bccaa556c98fbcc01d2db5796c1e
tree9d2e1bd2d26e584aa31e3b6b019ffe145784a2b2
parent688bb204dc872aaec9f2b829fe85039c08091b55
Recorded merge of revisions 417677 from svn.asterisk.org/svn/asterisk/branches/11

........
res_rtp_asterisk: Add SHA-256 support for DTLS and perform DTLS negotiation on RTCP.

This change fixes up DTLS support in res_rtp_asterisk so it can accept and provide
a SHA-256 fingerprint, so it occurs on RTCP, and so it occurs after ICE negotiation
completes. Configuration options to chan_sip and chan_pjsip have also been added to
allow behavior to be tweaked (such as forcing the AVP type media transports in SDP).

ASTERISK-22961 #close
Reported by: Jay Jideliov

Review: https://reviewboard.asterisk.org/r/3679/
Review: https://reviewboard.asterisk.org/r/3686/
........

Merged revisions 417678 from http://svn.asterisk.org/svn/asterisk/branches/12

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@417679 65c4cc65-6c06-0410-ace0-fbb531ad65f3
14 files changed:
channels/chan_sip.c
channels/sip/include/sip.h
configs/sip.conf.sample
contrib/ast-db-manage/config/versions/51f8cb66540e_add_further_dtls_options.py [new file with mode: 0644]
include/asterisk/res_pjsip.h
include/asterisk/res_pjsip_session.h
include/asterisk/rtp_engine.h
include/asterisk/sdp_srtp.h
main/rtp_engine.c
main/sdp_srtp.c
res/res_pjsip.c
res/res_pjsip/pjsip_configuration.c
res/res_pjsip_sdp_rtp.c
res/res_rtp_asterisk.c