From d18aa84116b041f07ec959009203d2af5804e6e6 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Wed, 20 Feb 2019 15:52:23 -0500 Subject: [PATCH] fix test suites for different implementations of base64 encoding further fix for fa90e4d Change-Id: Ic8aa9e08f21fe79ba6d55fea87928e9ece228779 --- t/auto-daemon-tests.pl | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/t/auto-daemon-tests.pl b/t/auto-daemon-tests.pl index 99b2e8567..4c2e826f2 100755 --- a/t/auto-daemon-tests.pl +++ b/t/auto-daemon-tests.pl @@ -59,6 +59,7 @@ sub offer_answer { my $resp = $c->req($req); is $resp->{result}, 'ok', "$name - $cmd status"; my $regexp = "^\Q$exp_sdp_out\E\$"; + $regexp =~ s/\\\?/./gs; $regexp =~ s/PORT/(\\d{1,5})/gs; $regexp =~ s/ICEBASE/([0-9a-zA-Z]{16})/gs; $regexp =~ s/ICEUFRAG/([0-9a-zA-Z]{8})/gs; @@ -526,8 +527,8 @@ 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_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw -a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g +a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyH? +a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8? 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 @@ -584,8 +585,8 @@ 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_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw -a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g +a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyH? +a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8? 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 @@ -640,8 +641,8 @@ a=rtpmap:0 PCMU/8000 a=sendrecv a=rtcp:PORT a=crypto:1 AES_CM_128_HMAC_SHA1_80 inline:cJOJ7kxQjhFBp2fP6AYjs3vKw7CeBdWZCj0isbJv -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:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyH? +a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8? 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 @@ -697,8 +698,8 @@ 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_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyHw -a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8g +a=crypto:3 AES_256_CM_HMAC_SHA1_80 inline:8AbZePWwsKhLGX3GlXA+yHYPQ3cgraer/9DkFJYCOPZZy3o9wC0NIbIFYZfyH? +a=crypto:4 AES_256_CM_HMAC_SHA1_32 inline:2GLk3p/csdno4KlGO1TxCVaEt+bifmDlQ5NjnCb5cJYPURiGRSTBEtEq37db8? 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