From d589c8b2bdd28a81df1ca72b628a77b7b4cb1eda Mon Sep 17 00:00:00 2001 From: Idan Freiberg Date: Sun, 25 Oct 2026 18:52:21 +0200 Subject: [PATCH] MT#55283 Fix SRTP initialization for created endpoints Closes #2222 Change-Id: Ie9de8cc48f7729174ab33da7478149e5ff628ceb (cherry picked from commit 9af64cdc6c682c6fab1d91170ba8722fc9d82f59) --- daemon/call.c | 6 ++ t/Makefile | 9 ++- t/auto-daemon-tests-create-srtp.pl | 101 +++++++++++++++++++++++++++++ 3 files changed, 114 insertions(+), 2 deletions(-) create mode 100644 t/auto-daemon-tests-create-srtp.pl diff --git a/daemon/call.c b/daemon/call.c index 8bb71bc51..6ac3891dd 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -6533,6 +6533,10 @@ static bool monologue_call_create_media(struct call_monologue *ml, sdp_ng_flags bf_set(&m->media_flags, MEDIA_FLAG_SEND | MEDIA_FLAG_RECV | MEDIA_FLAG_SETUP_ACTIVE | MEDIA_FLAG_SETUP_PASSIVE | MEDIA_FLAG_DTLS | MEDIA_FLAG_SDES); + if (flags->dtls_off) + MEDIA_CLEAR(m, DTLS); + if (flags->sdes_off) + MEDIA_CLEAR(m, SDES); __rtcp_mux_set(flags, m); media_init_from_flags(m, flags); @@ -6643,5 +6647,7 @@ bool monologue_call_create_answer(struct call_monologue *ml, sdp_ng_flags *flags sdp_sp_move(&media->sp, sp); } + monologue_media_start(ml); + return true; } diff --git a/t/Makefile b/t/Makefile index 1fb3a5ddc..3ef1ecd72 100644 --- a/t/Makefile +++ b/t/Makefile @@ -114,7 +114,8 @@ include ../lib/common.Makefile daemon-tests-bundle daemon-tests-dtls \ daemon-tests-recording daemon-tests-create \ daemon-tests-created-subscriptions \ - daemon-tests-dtx-dtmf + daemon-tests-dtx-dtmf \ + daemon-tests-create-srtp TESTS= test-bitstr test-str aes-crypt aead-aes-crypt test-const_str_hash.strhash ifeq ($(with_transcoding),yes) @@ -165,7 +166,8 @@ daemon-tests: daemon-tests-main daemon-tests-jb daemon-tests-pubsub daemon-tests daemon-tests-bundle daemon-tests-dtls \ daemon-tests-recording daemon-tests-create \ daemon-tests-created-subscriptions \ - daemon-tests-dtx-dtmf + daemon-tests-dtx-dtmf \ + daemon-tests-create-srtp daemon-test-deps: tests-preload.so $(MAKE) -C ../daemon @@ -200,6 +202,9 @@ daemon-tests-pubsub: daemon-test-deps daemon-tests-create: daemon-test-deps ./auto-test-helper "$@" perl -I../perl auto-daemon-tests-create.pl +daemon-tests-create-srtp: daemon-test-deps + ./auto-test-helper "$@" perl -I../perl auto-daemon-tests-create-srtp.pl + daemon-tests-created-subscriptions: daemon-test-deps ./auto-test-helper "$@" perl -I../perl auto-daemon-tests-created-subscriptions.pl diff --git a/t/auto-daemon-tests-create-srtp.pl b/t/auto-daemon-tests-create-srtp.pl new file mode 100644 index 000000000..3fcc6e02f --- /dev/null +++ b/t/auto-daemon-tests-create-srtp.pl @@ -0,0 +1,101 @@ +#!/usr/bin/perl + +use strict; +use warnings; +use NGCP::Rtpengine::Test; +use NGCP::Rtpclient::SRTP; +use NGCP::Rtpengine::AutoTest; +use Test::More; +use MIME::Base64 qw(encode_base64); + +autotest_start(qw(--config-file=none -t -1 -i 203.0.113.1 -n 2223 -f -L 7 -E)) or die; + +new_call; +my $response = rtpe_req('create', 'SDES disabled', { + 'from-tag' => ft(), + 'transport-protocol' => 'UDP/TLS/RTP/SAVP', + SDES => ['off'], +}); +unlike($response->{sdp}, qr/^a=crypto:/m, 'SDES disabled: no crypto attributes'); +like($response->{sdp}, qr/^a=fingerprint:/m, 'SDES disabled: DTLS still offered'); +rtpe_req('delete', 'SDES disabled', {}); + +my @suites = qw(AEAD_AES_128_GCM AES_256_CM_HMAC_SHA1_80 AES_CM_128_HMAC_SHA1_80); +my %key_lengths = (AEAD_AES_128_GCM => 28, AES_256_CM_HMAC_SHA1_80 => 46, + AES_CM_128_HMAC_SHA1_80 => 30); + +for my $suite (@suites) { + my ($secure, $plain) = new_call([qw(198.51.100.10 5000)], [qw(198.51.100.10 5002)]); + my ($secure_tag, $plain_tag) = (ft(), tt()); + my $offer = rtpe_req('create', "$suite offer", { + 'from-tag' => $secure_tag, + 'transport-protocol' => 'RTP/SAVP', + DTLS => 'off', + SDES => [map { "only-$_" } @suites], + codec => { offer => ['PCMU'] }, + }); + unlike($offer->{sdp}, qr/^a=(?:fingerprint|setup|tls-id):/m, "$suite: DTLS disabled"); + # Select each suite from the same offer, including suites other than its first preference. + my ($crypto_tag, $out_key) = $offer->{sdp} =~ /^a=crypto:(\d+) \Q$suite\E inline:(\S+)/m; + ok(defined($crypto_tag), "$suite is offered"); + my ($secure_port) = $offer->{sdp} =~ /^m=audio (\d+)/m; + my $in_key = encode_base64('x' x $key_lengths{$suite}, ''); + rtpe_req('create answer', "$suite answer", { + 'from-tag' => $secure_tag, + sdp => <{tags}{$secure_tag}{medias}[0]; + ok(!grep {$_ eq 'DTLS-SRTP'} (@{$media->{flags}}), "$suite: DTLS remains disabled"); + is(scalar(@{$media->{streams}}), 2, "$suite: RTP and RTCP streams exist"); + for my $stream (@{$media->{streams}}) { + is($stream->{'crypto suite'}, $suite, "$suite: output crypto context uses selected suite"); + } + + # The Perl SRTP helper supports AES-CM. GCM is covered by the context assertions above. + if (my $cs = $NGCP::Rtpclient::SRTP::crypto_suites{$suite}) { + my $plain_offer = rtpe_req('create', "$suite plain peer", { + 'from-tag' => $plain_tag, + DTLS => 'off', SDES => ['off'], + codec => { offer => ['PCMU'] }, + }); + my ($plain_port) = $plain_offer->{sdp} =~ /^m=audio (\d+)/m; + rtpe_req('create answer', "$suite plain answer", { + 'from-tag' => $plain_tag, + sdp => < $secure_tag, + 'to-tag' => $plain_tag, + flags => ['directional', 'bidirectional'], + }); + my $send_ctx = { cs => $cs, key => $in_key }; + my $receive_ctx = { cs => $cs, key => $out_key }; + srtp_snd($secure, $secure_port, rtp(0, 1000, 3000, 0x1234, "\x11" x 160), $send_ctx); + rcv($plain, $plain_port, rtpm(0, 1000, 3000, -1, "\x11" x 160)); + snd($plain, $plain_port, rtp(0, 2000, 4000, 0x5678, "\x22" x 160)); + srtp_rcv($secure, $secure_port, rtpm(0, 2000, 4000, -1, "\x22" x 160), $receive_ctx); + } + rtpe_req('delete', "$suite cleanup", {}); +} + +done_testing();