From fa90e4dc0e42f6d59a770d0da814e71ff386c9e3 Mon Sep 17 00:00:00 2001
From: Richard Fuchs <rfuchs@sipwise.com>
Date: Tue, 19 Feb 2019 09:37:48 -0500
Subject: [PATCH] fix test suites for 0c9bb7c

Change-Id: I689b24ab0deae6439b8359dbfa4020259d7e0572
---
 t/auto-daemon-tests.pl                    | 64 +++++++++++------------
 t/test-sdes-sdes-select-offer-restrict.pl |  4 +-
 t/test-sdes-sdes-select-offer.pl          |  2 +-
 3 files changed, 35 insertions(+), 35 deletions(-)

diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl
index f69782b83..99b2e8567 100755
--- a/t/auto-daemon-tests.pl
+++ b/t/auto-daemon-tests.pl
@@ -526,10 +526,10 @@ a=sendrecv
 a=rtcp:PORT
 a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:cJOJ7kxQjhFBp2fP6AYjs3vKw7CeBdWZCj0isbJv
 a=crypto:2 AES_CM_128_HMAC_SHA1_32 inline:VAzLKvoE3jG9cdH/AZsl/ZqWNXrUzyM4Gw6chrFr
-a=crypto:3 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:4 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:5 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:6 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
+a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw
+a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g
+a=crypto:5 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:6 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
 a=crypto:7 F8_128_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:8 F8_128_HMAC_SHA1_32 inline:CRYPTO128
 a=crypto:9 NULL_HMAC_SHA1_80 inline:CRYPTO128
@@ -584,10 +584,10 @@ a=sendrecv
 a=rtcp:PORT
 a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:cJOJ7kxQjhFBp2fP6AYjs3vKw7CeBdWZCj0isbJv
 a=crypto:2 AES_CM_128_HMAC_SHA1_32 inline:VAzLKvoE3jG9cdH/AZsl/ZqWNXrUzyM4Gw6chrFr
-a=crypto:3 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:4 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:5 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:6 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
+a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw
+a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g
+a=crypto:5 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:6 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
 a=crypto:7 F8_128_HMAC_SHA1_32 inline:CRYPTO128
 a=crypto:8 NULL_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:9 NULL_HMAC_SHA1_32 inline:CRYPTO128
@@ -640,14 +640,14 @@ a=rtpmap:0 PCMU/8000
 a=sendrecv
 a=rtcp:PORT
 a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:cJOJ7kxQjhFBp2fP6AYjs3vKw7CeBdWZCj0isbJv
-a=crypto:2 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:3 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:4 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:5 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
-a=crypto:6 F8_128_HMAC_SHA1_80 inline:CRYPTO128
-a=crypto:7 F8_128_HMAC_SHA1_32 inline:CRYPTO128
-a=crypto:8 NULL_HMAC_SHA1_80 inline:CRYPTO128
-a=crypto:9 NULL_HMAC_SHA1_32 inline:CRYPTO128
+a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw
+a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g
+a=crypto:5 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:6 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
+a=crypto:7 F8_128_HMAC_SHA1_80 inline:CRYPTO128
+a=crypto:8 F8_128_HMAC_SHA1_32 inline:CRYPTO128
+a=crypto:9 NULL_HMAC_SHA1_80 inline:CRYPTO128
+a=crypto:10 NULL_HMAC_SHA1_32 inline:CRYPTO128
 SDP
 
 answer('gh 661 remove one', { ICE => 'remove' }, <<SDP);
@@ -697,10 +697,10 @@ a=rtpmap:0 PCMU/8000
 a=sendrecv
 a=rtcp:PORT
 a=crypto:2 AES_CM_128_HMAC_SHA1_32 inline:VAzLKvoE3jG9cdH/AZsl/ZqWNXrUzyM4Gw6chrFr
-a=crypto:3 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:4 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:5 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:6 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
+a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw
+a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g
+a=crypto:5 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:6 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
 a=crypto:7 F8_128_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:8 F8_128_HMAC_SHA1_32 inline:CRYPTO128
 a=crypto:9 NULL_HMAC_SHA1_80 inline:CRYPTO128
@@ -894,10 +894,10 @@ a=sendrecv
 a=rtcp:PORT
 a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:2 AES_CM_128_HMAC_SHA1_32 inline:CRYPTO128
-a=crypto:3 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:4 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:5 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:6 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
+a=crypto:3 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:4 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
+a=crypto:5 AES_256_CM_HMAC_SHA1_80 inline:CRYPTO256
+a=crypto:6 AES_256_CM_HMAC_SHA1_32 inline:CRYPTO256
 a=crypto:7 F8_128_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:8 F8_128_HMAC_SHA1_32 inline:CRYPTO128
 a=crypto:9 NULL_HMAC_SHA1_80 inline:CRYPTO128
@@ -947,10 +947,10 @@ a=sendrecv
 a=rtcp:PORT
 a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:2 AES_CM_128_HMAC_SHA1_32 inline:CRYPTO128
-a=crypto:3 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:4 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:5 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:6 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
+a=crypto:3 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:4 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
+a=crypto:5 AES_256_CM_HMAC_SHA1_80 inline:CRYPTO256
+a=crypto:6 AES_256_CM_HMAC_SHA1_32 inline:CRYPTO256
 a=crypto:7 F8_128_HMAC_SHA1_32 inline:CRYPTO128
 a=crypto:8 NULL_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:9 NULL_HMAC_SHA1_32 inline:CRYPTO128
@@ -998,10 +998,10 @@ a=rtpmap:0 PCMU/8000
 a=sendrecv
 a=rtcp:PORT
 a=crypto:1 AES_CM_128_HMAC_SHA1_32 inline:CRYPTO128
-a=crypto:2 AES_CM_192_HMAC_SHA1_80 inline:CRYPTO192
-a=crypto:3 AES_CM_192_HMAC_SHA1_32 inline:CRYPTO192
-a=crypto:4 AES_CM_256_HMAC_SHA1_80 inline:CRYPTO256
-a=crypto:5 AES_CM_256_HMAC_SHA1_32 inline:CRYPTO256
+a=crypto:2 AES_192_CM_HMAC_SHA1_80 inline:CRYPTO192
+a=crypto:3 AES_192_CM_HMAC_SHA1_32 inline:CRYPTO192
+a=crypto:4 AES_256_CM_HMAC_SHA1_80 inline:CRYPTO256
+a=crypto:5 AES_256_CM_HMAC_SHA1_32 inline:CRYPTO256
 a=crypto:6 F8_128_HMAC_SHA1_80 inline:CRYPTO128
 a=crypto:7 F8_128_HMAC_SHA1_32 inline:CRYPTO128
 a=crypto:8 NULL_HMAC_SHA1_80 inline:CRYPTO128
diff --git a/t/test-sdes-sdes-select-offer-restrict.pl b/t/test-sdes-sdes-select-offer-restrict.pl
index 0eebd852a..f8a48fb7d 100755
--- a/t/test-sdes-sdes-select-offer-restrict.pl
+++ b/t/test-sdes-sdes-select-offer-restrict.pl
@@ -8,7 +8,7 @@ use IO::Socket;
 my $r = NGCP::Rtpengine::Test->new();
 my ($a, $b) = $r->client_pair(
 	{sdes => 1, sdes_args => {suites => [qw(
-		AES_CM_256_HMAC_SHA1_80 AES_CM_256_HMAC_SHA1_32
+		AES_256_CM_HMAC_SHA1_80 AES_256_CM_HMAC_SHA1_32
 		AES_CM_128_HMAC_SHA1_80 AES_CM_128_HMAC_SHA1_32
 	)]}},
 	{sdes => 1}
@@ -19,7 +19,7 @@ my ($a, $b) = $r->client_pair(
 
 $r->timer_once(10, sub { $r->stop(); });
 
-$a->offer($b, ICE => 'remove', flags => [qw(SDES-no-AES_CM_256_HMAC_SHA1_80 SDES-no-AES_CM_256_HMAC_SHA1_32)]);
+$a->offer($b, ICE => 'remove', flags => [qw(SDES-no-AES_256_CM_HMAC_SHA1_80 SDES-no-AES_256_CM_HMAC_SHA1_32)]);
 
 @{$a->{sdes}->{suites}} == 4 or die; # the ones we selected
 
diff --git a/t/test-sdes-sdes-select-offer.pl b/t/test-sdes-sdes-select-offer.pl
index ab5016902..6893566fc 100755
--- a/t/test-sdes-sdes-select-offer.pl
+++ b/t/test-sdes-sdes-select-offer.pl
@@ -8,7 +8,7 @@ use IO::Socket;
 my $r = NGCP::Rtpengine::Test->new();
 my ($a, $b) = $r->client_pair(
 	{sdes => 1, sdes_args => {suites => [qw(
-		AES_CM_256_HMAC_SHA1_80 AES_CM_256_HMAC_SHA1_32
+		AES_256_CM_HMAC_SHA1_80 AES_256_CM_HMAC_SHA1_32
 		AES_CM_128_HMAC_SHA1_80 AES_CM_128_HMAC_SHA1_32
 	)]}},
 	{sdes => 1}