February 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: bsc: improve encryption testing config TestHdlrEncrParams

by fixeria

Attention is currently required from: neels. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 ) Change subject: bsc: improve encryption testing config TestHdlrEncrParams ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: A bit hard to follow due to many changes in a single patch. Not going to block you though. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6590ecf4a146dbed494d9d72f5a79441877e9010 Gerrit-Change-Number: 27234 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Thu, 17 Feb 2022 10:07:00 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr_test: increase test coverage for oa / bwe conversation

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/27211 ) Change subject: amr_test: increase test coverage for oa / bwe conversation ...................................................................... amr_test: increase test coverage for oa / bwe conversation The functions that convert between octet-aligned and bandwith-efficient AMR format have good coverage on the octet-aligned side, but the bandwith-efficient side has a very little number of sample packets. Lets add some more sample packets to increase coverage. Related: SYS#5834 Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 --- M tests/amr/amr_test.c M tests/amr/amr_test.ok 2 files changed, 131 insertions(+), 31 deletions(-) Approvals: dexter: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/amr/amr_test.c b/tests/amr/amr_test.c index 3d0d917..69ba723 100644 --- a/tests/amr/amr_test.c +++ b/tests/amr/amr_test.c @@ -29,6 +29,7 @@ "703c22f979890338540179209572624a0f8535871c2f7039cbf926b7e4425b6ef0", "703c2e671f3b1b0810412d5adae61e2b2a319885c6ced4e909b4eeaa2ea0f0cd80", "703cf8fc77356c948141686cda34d35220db719e36a359d86b64420dc64b563850", + "703c3eec9c37dfb201c093c57a1235a02af55ccc22f1c9593a6e058c368b4d7f50", "60344e300c0e6251342c2ae51fd8a698a945488d16c98922726f3e50", "60341fc722c7880328a9c280030bc9755c3ef519f80000295323e000", "60342c338655c00008efba03592419adf62478a79278b3e2d68ab0f0", @@ -47,7 +48,7 @@ "0004f89d67f1160935bde1996840", "0004633cc7f0630439ffe0000000", "0004eb81fc0758973b9edc782550", - "a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc", /* sample with invalid FT */ + "a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc", /* sample with invalid FT, will be detected as bandwith-efficient */ "END", }; @@ -55,10 +56,20 @@ char *bwe_amr_samples[] = { "f4495c7cda8f80", "f44aaa6c969780", + "7449c1e32c6780", + "74400000000380", + "703c493323b0bf68028086d15a00", + "703c59171697c53c01801fb6aa80", + "703c55029bb2e23a0020172e8b00", + "703c48f52442f08884a8050b8500", + "7038000000000000000000000000", + "7151434e01292c40c4735e4412204077", + "714eadbe13ac4694f4726f71985d64cd", "f3d09c20e32da600c025a72e0a9b360386e40f87e19282094adc1a11e397d1d4", "f3d39a49a09e7a802852e297e8c9246aadf5a45928bfc27177fed8404d97d3b8", "f3c2155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0", "f3c381bc7061c9f8507f6029de6115c16e5fa470c243b21b6e35dbb48bd84c00", + "73c901b7a2004be7f85284b6ab7142acfe6872b1ae1c107d0588b551de7be650", "a7bfc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03f", /* sample with invalid FT */ "END", }; diff --git a/tests/amr/amr_test.ok b/tests/amr/amr_test.ok index c9cde1f..02e36d9 100644 --- a/tests/amr/amr_test.ok +++ b/tests/amr/amr_test.ok @@ -24,132 +24,139 @@ rc: 32 Sample No.: 3 + octet aligned: 703c3eec9c37dfb201c093c57a1235a02af55ccc22f1c9593a6e058c368b4d7f50 + 011100000011110000111110111011001001110000110111110111111011001000000001110000001001001111000101011110100001001000110101101000000010101011110101010111001100110000100010111100011100100101011001001110100110111000000101100011000011011010001011010011010111111101010000 + bw-efficient: 73cfbb270df7ec807024f15e848d680abd573308bc72564e9b81630da2d35fd4 + 0111001111001111101110110010011100001101111101111110110010000000011100000010010011110001010111101000010010001101011010000000101010111101010101110011001100001000101111000111001001010110010011101001101110000001011000110000110110100010110100110101111111010100 + rc: 32 + +Sample No.: 4 octet aligned: 60344e300c0e6251342c2ae51fd8a698a945488d16c98922726f3e50 01100000001101000100111000110000000011000000111001100010010100010011010000101100001010101110010100011111110110001010011010011000101010010100010101001000100011010001011011001001100010010010001001110010011011110011111001010000 bw-efficient: 63538c030398944d0b0ab947f629a62a51522345b262489c9bcf94 011000110101001110001100000000110000001110011000100101000100110100001011000010101011100101000111111101100010100110100110001010100101000101010010001000110100010110110010011000100100100010011100100110111100111110010100 rc: 27 -Sample No.: 4 +Sample No.: 5 octet aligned: 60341fc722c7880328a9c280030bc9755c3ef519f80000295323e000 01100000001101000001111111000111001000101100011110001000000000110010100010101001110000101000000000000011000010111100100101110101010111000011111011110101000110011111100000000000000000000010100101010011001000111110000000000000 bw-efficient: 6347f1c8b1e200ca2a70a000c2f25d570fbd467e00000a54c8f800 011000110100011111110001110010001011000111100010000000001100101000101010011100001010000000000000110000101111001001011101010101110000111110111101010001100111111000000000000000000000101001010100110010001111100000000000 rc: 27 -Sample No.: 5 +Sample No.: 6 octet aligned: 60342c338655c00008efba03592419adf62478a79278b3e2d68ab0f0 01100000001101000010110000110011100001100101010111000000000000000000100011101111101110100000001101011001001001000001100110101101111101100010010001111000101001111001001001111000101100111110001011010110100010101011000011110000 bw-efficient: 634b0ce1957000023bee80d649066b7d891e29e49e2cf8b5a2ac3c 011000110100101100001100111000011001010101110000000000000000001000111011111011101000000011010110010010010000011001101011011111011000100100011110001010011110010010011110001011001111100010110101101000101010110000111100 rc: 27 -Sample No.: 6 +Sample No.: 7 octet aligned: 502c98ab841e491ff7a1a555016a32a3c7f913210630 01010000001011001001100010101011100001000001111001001001000111111111011110100001101001010101010100000001011010100011001010100011110001111111100100010011001000010000011000110000 bw-efficient: 52e62ae1079247fde86955405a8ca8f1fe44c8418c00 01010010111001100010101011100001000001111001001001000111111111011110100001101001010101010100000001011010100011001010100011110001111111100100010011001000010000011000110000000000 rc: 22 -Sample No.: 7 +Sample No.: 8 octet aligned: 502cc5459a0d200e7097c4dfe86ec8d27f1756d776f0 01010000001011001100010101000101100110100000110100100000000011100111000010010111110001001101111111101000011011101100100011010010011111110001011101010110110101110111011011110000 bw-efficient: 52f151668348039c25f137fa1bb2349fc5d5b5ddbc00 01010010111100010101000101100110100000110100100000000011100111000010010111110001001101111111101000011011101100100011010010011111110001011101010110110101110111011011110000000000 rc: 22 -Sample No.: 8 +Sample No.: 9 octet aligned: 502c42b332081813d7e916e7aa5e80d7fde812b8c080 01010000001011000100001010110011001100100000100000011000000100111101011111101001000101101110011110101010010111101000000011010111111111011110100000010010101110001100000010000000 bw-efficient: 52d0accc820604f5fa45b9ea97a035ff7a04ae302000 01010010110100001010110011001100100000100000011000000100111101011111101001000101101110011110101010010111101000000011010111111111011110100000010010101110001100000010000000000000 rc: 22 -Sample No.: 9 +Sample No.: 10 octet aligned: 40240343e959c79bacd20c77501054880a718db200 010000000010010000000011010000111110100101011001110001111001101110101100110100100000110001110111010100000001000001010100100010000000101001110001100011011011001000000000 bw-efficient: 4240d0fa5671e6eb34831dd4041522029c636c80 0100001001000000110100001111101001010110011100011110011011101011001101001000001100011101110101000000010000010101001000100000001010011100011000110110110010000000 rc: 20 -Sample No.: 10 +Sample No.: 11 octet aligned: 4024172c53401e39115ceecd12606df5689bdd0ca0 010000000010010000010111001011000101001101000000000111100011100100010001010111001110111011001101000100100110000001101101111101010110100010011011110111010000110010100000 bw-efficient: 4245cb14d0078e44573bb344981b7d5a26f74328 0100001001000101110010110001010011010000000001111000111001000100010101110011101110110011010001001001100000011011011111010101101000100110111101110100001100101000 rc: 20 -Sample No.: 11 +Sample No.: 12 octet aligned: 4024f871cf48801ec427f0fc3f7318898622062200 010000000010010011111000011100011100111101001000100000000001111011000100001001111111000011111100001111110111001100011000100010011000011000100010000001100010001000000000 bw-efficient: 427e1c73d22007b109fc3f0fdcc6226188818880 0100001001111110000111000111001111010010001000000000011110110001000010011111110000111111000011111101110011000110001000100110000110001000100000011000100010000000 rc: 20 -Sample No.: 12 +Sample No.: 13 octet aligned: 20141fd4c02667c742b164aef659ffe708 0010000000010100000111111101010011000000001001100110011111000111010000101011000101100100101011101111011001011001111111111110011100001000 bw-efficient: 2147f5300999f1d0ac592bbd967ff9c2 00100001010001111111010100110000000010011001100111110001110100001010110001011001001010111011110110010110011111111111100111000010 rc: 16 -Sample No.: 13 +Sample No.: 14 octet aligned: 2014197e10ead7b250bccbbf3b81887c64 0010000000010100000110010111111000010000111010101101011110110010010100001011110011001011101111110011101110000001100010000111110001100100 bw-efficient: 21465f843ab5ec942f32efcee0621f19 00100001010001100101111110000100001110101011010111101100100101000010111100110010111011111100111011100000011000100001111100011001 rc: 16 -Sample No.: 14 +Sample No.: 15 octet aligned: 2014e959f35fdfe5e9667ffbc088818088 0010000000010100111010010101100111110011010111111101111111100101111010010110011001111111111110111100000010001000100000011000000010001000 bw-efficient: 217a567cd7f7f97a599ffef022206022 00100001011110100101011001111100110101111111011111111001011110100101100110011111111111101111000000100010001000000110000000100010 rc: 16 -Sample No.: 15 +Sample No.: 16 octet aligned: 100c4e9ba850e30d5d53d04de41e7c 000100000000110001001110100110111010100001010000111000110000110101011101010100111101000001001101111001000001111001111100 bw-efficient: 10d3a6ea1438c35754f41379079f00 000100001101001110100110111010100001010000111000110000110101011101010100111101000001001101111001000001111001111100000000 rc: 15 -Sample No.: 16 +Sample No.: 17 octet aligned: 100c6c18e7b7fff53aeb055e7d1c54 000100000000110001101100000110001110011110110111111111111111010100111010111010110000010101011110011111010001110001010100 bw-efficient: 10db0639edfffd4ebac1579f471500 000100001101101100000110001110011110110111111111111111010100111010111010110000010101011110011111010001110001010100000000 rc: 15 -Sample No.: 17 +Sample No.: 18 octet aligned: 100c1fb967f7f1fdf547bf2e61c060 000100000000110000011111101110010110011111110111111100011111110111110101010001111011111100101110011000011100000001100000 bw-efficient: 10c7ee59fdfc7f7d51efcb98701800 000100001100011111101110010110011111110111111100011111110111110101010001111011111100101110011000011100000001100000000000 rc: 15 -Sample No.: 18 +Sample No.: 19 octet aligned: 0004f89d67f1160935bde1996840 0000000000000100111110001001110101100111111100010001011000001001001101011011110111100001100110010110100001000000 bw-efficient: 007e2759fc45824d6f78665a1000 0000000001111110001001110101100111111100010001011000001001001101011011110111100001100110010110100001000000000000 rc: 14 -Sample No.: 19 +Sample No.: 20 octet aligned: 0004633cc7f0630439ffe0000000 0000000000000100011000110011110011000111111100000110001100000100001110011111111111100000000000000000000000000000 bw-efficient: 0058cf31fc18c10e7ff800000000 0000000001011000110011110011000111111100000110001100000100001110011111111111100000000000000000000000000000000000 rc: 14 -Sample No.: 20 +Sample No.: 21 octet aligned: 0004eb81fc0758973b9edc782550 0000000000000100111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010000 bw-efficient: 007ae07f01d625cee7b71e095400 0000000001111010111000000111111100000001110101100010010111001110111001111011011100011110000010010101010000000000 rc: 14 -Sample No.: 21 +Sample No.: 22 octet aligned: a078ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00ff00fc 101000000111100011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111100 bw-efficient: @@ -174,34 +181,104 @@ rc: 7 Sample No.: 2 + bw-efficient: 7449c1e32c6780 + 01110100010010011100000111100011001011000110011110000000 + octet aligned: 704427078cb19c + 01110000010001000010011100000111100011001011000110011100 + rc: 7 + +Sample No.: 3 + bw-efficient: 74400000000380 + 01110100010000000000000000000000000000000000001110000000 + octet aligned: 7044000000000c + 01110000010001000000000000000000000000000000000000001100 + rc: 7 + +Sample No.: 4 + bw-efficient: 703c493323b0bf68028086d15a00 + 0111000000111100010010010011001100100011101100001011111101101000000000101000000010000110110100010101101000000000 + octet aligned: 7000f124cc8ec2fda00a021b4568 + 0111000000000000111100010010010011001100100011101100001011111101101000000000101000000010000110110100010101101000 + rc: 14 + +Sample No.: 5 + bw-efficient: 703c59171697c53c01801fb6aa80 + 0111000000111100010110010001011100010110100101111100010100111100000000011000000000011111101101101010101010000000 + octet aligned: 7000f1645c5a5f14f006007edaa8 + 0111000000000000111100010110010001011100010110100101111100010100111100000000011000000000011111101101101010101000 + rc: 14 + +Sample No.: 6 + bw-efficient: 703c55029bb2e23a0020172e8b00 + 0111000000111100010101010000001010011011101100101110001000111010000000000010000000010111001011101000101100000000 + octet aligned: 7000f1540a6ecb88e800805cba2c + 0111000000000000111100010101010000001010011011101100101110001000111010000000000010000000010111001011101000101100 + rc: 14 + +Sample No.: 7 + bw-efficient: 703c48f52442f08884a8050b8500 + 0111000000111100010010001111010100100100010000101111000010001000100001001010100000000101000010111000010100000000 + octet aligned: 7000f123d4910bc22212a0142e14 + 0111000000000000111100010010001111010100100100010000101111000010001000100001001010100000000101000010111000010100 + rc: 14 + +Sample No.: 8 + bw-efficient: 7038000000000000000000000000 + 0111000000111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + octet aligned: 7000e00000000000000000000000 + 0111000000000000111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 + rc: 14 + +Sample No.: 9 + bw-efficient: 7151434e01292c40c4735e4412204077 + 01110001010100010100001101001110000000010010100100101100010000001100010001110011010111100100010000010010001000000100000001110111 + octet aligned: 7014450d3804a4b10311cd7910488101dc + 0111000000010100010001010000110100111000000001001010010010110001000000110001000111001101011110010001000001001000100000010000000111011100 + rc: 17 + +Sample No.: 10 + bw-efficient: 714eadbe13ac4694f4726f71985d64cd + 01110001010011101010110110111110000100111010110001000110100101001111010001110010011011110111000110011000010111010110010011001101 + octet aligned: 70143ab6f84eb11a53d1c9bdc661759334 + 0111000000010100001110101011011011111000010011101011000100011010010100111101000111001001101111011100011001100001011101011001001100110100 + rc: 17 + +Sample No.: 11 bw-efficient: f3d09c20e32da600c025a72e0a9b360386e40f87e19282094adc1a11e397d1d4 1111001111010000100111000010000011100011001011011010011000000000110000000010010110100111001011100000101010011011001101100000001110000110111001000000111110000111111000011001001010000010000010010100101011011100000110100001000111100011100101111101000111010100 octet aligned: f03c4270838cb6980300969cb82a6cd80e1b903e1f864a08252b7068478e5f4750 111100000011110001000010011100001000001110001100101101101001100000000011000000001001011010011100101110000010101001101100110110000000111000011011100100000011111000011111100001100100101000001000001001010010101101110000011010000100011110001110010111110100011101010000 rc: 33 -Sample No.: 3 +Sample No.: 12 bw-efficient: f3d39a49a09e7a802852e297e8c9246aadf5a45928bfc27177fed8404d97d3b8 1111001111010011100110100100100110100000100111100111101010000000001010000101001011100010100101111110100011001001001001000110101010101101111101011010010001011001001010001011111111000010011100010111011111111110110110000100000001001101100101111101001110111000 octet aligned: f03c4e69268279ea00a14b8a5fa32491aab7d69164a2ff09c5dffb6101365f4ee0 111100000011110001001110011010010010011010000010011110011110101000000000101000010100101110001010010111111010001100100100100100011010101010110111110101101001000101100100101000101111111100001001110001011101111111111011011000010000000100110110010111110100111011100000 rc: 33 -Sample No.: 4 +Sample No.: 13 bw-efficient: f3c2155b65131c68682079fab4810911200003b360ae0446000025f11e539dd0 1111001111000010000101010101101101100101000100110001110001101000011010000010000001111001111110101011010010000001000010010001000100100000000000000000001110110011011000001010111000000100010001100000000000000000001001011111000100011110010100111001110111010000 octet aligned: f03c08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740 111100000011110000001000010101010110110110010100010011000111000110100001101000001000000111100111111010101101001000000100001001000100010010000000000000000000111011001101100000101011100000010001000110000000000000000000100101111100010001111001010011100111011101000000 rc: 33 -Sample No.: 5 +Sample No.: 14 bw-efficient: f3c381bc7061c9f8507f6029de6115c16e5fa470c243b21b6e35dbb48bd84c00 1111001111000011100000011011110001110000011000011100100111111000010100000111111101100000001010011101111001100001000101011100000101101110010111111010010001110000110000100100001110110010000110110110111000110101110110111011010010001011110110000100110000000000 octet aligned: f03c0e06f1c18727e141fd80a779845705b97e91c3090ec86db8d76ed22f613000 111100000011110000001110000001101111000111000001100001110010011111100001010000011111110110000000101001110111100110000100010101110000010110111001011111101001000111000011000010010000111011001000011011011011100011010111011011101101001000101111011000010011000000000000 rc: 33 -Sample No.: 6 +Sample No.: 15 + bw-efficient: 73c901b7a2004be7f85284b6ab7142acfe6872b1ae1c107d0588b551de7be650 + 0111001111001001000000011011011110100010000000000100101111100111111110000101001010000100101101101010101101110001010000101010110011111110011010000111001010110001101011100001110000010000011111010000010110001000101101010101000111011110011110111110011001010000 + octet aligned: 703c2406de88012f9fe14a12daadc50ab3f9a1cac6b87041f41622d54779ef9940 + 011100000011110000100100000001101101111010001000000000010010111110011111111000010100101000010010110110101010110111000101000010101011001111111001101000011100101011000110101110000111000001000001111101000001011000100010110101010100011101111001111011111001100101000000 + rc: 33 + +Sample No.: 16 bw-efficient: a7bfc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03fc03f 1010011110111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111110000000011111111000000001111111100000000111111 octet aligned: @@ -213,25 +290,26 @@ Sample No.: 0... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes Sample No.: 1... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes Sample No.: 2... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes -Sample No.: 3... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes +Sample No.: 3... AMR mode: 7, OA: 33 bytes, BE: 32 bytes, OA: 33 bytes Sample No.: 4... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes Sample No.: 5... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes -Sample No.: 6... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes +Sample No.: 6... AMR mode: 6, OA: 28 bytes, BE: 27 bytes, OA: 28 bytes Sample No.: 7... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes Sample No.: 8... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes -Sample No.: 9... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes +Sample No.: 9... AMR mode: 5, OA: 22 bytes, BE: 22 bytes, OA: 22 bytes Sample No.: 10... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes Sample No.: 11... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes -Sample No.: 12... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes +Sample No.: 12... AMR mode: 4, OA: 21 bytes, BE: 20 bytes, OA: 21 bytes Sample No.: 13... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes Sample No.: 14... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes -Sample No.: 15... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes +Sample No.: 15... AMR mode: 2, OA: 17 bytes, BE: 16 bytes, OA: 17 bytes Sample No.: 16... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes Sample No.: 17... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes -Sample No.: 18... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes +Sample No.: 18... AMR mode: 1, OA: 15 bytes, BE: 15 bytes, OA: 15 bytes Sample No.: 19... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes Sample No.: 20... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes -Sample No.: 21... skipping a sample with a wrong FT +Sample No.: 21... AMR mode: 0, OA: 14 bytes, BE: 14 bytes, OA: 14 bytes +Sample No.: 22... skipping a sample with a wrong FT Testing conversion from IuUP to bw-efficient and inverse: @@ -262,7 +340,8 @@ Sample No.: 18 ==>octet aligned Sample No.: 19 ==>octet aligned Sample No.: 20 ==>octet aligned -Sample No.: 21 ==>bandwith efficient +Sample No.: 21 ==>octet aligned +Sample No.: 22 ==>bandwith efficient Sample No.: 0 ==>bandwith efficient Sample No.: 1 ==>bandwith efficient Sample No.: 2 ==>bandwith efficient @@ -270,4 +349,14 @@ Sample No.: 4 ==>bandwith efficient Sample No.: 5 ==>bandwith efficient Sample No.: 6 ==>bandwith efficient +Sample No.: 7 ==>bandwith efficient +Sample No.: 8 ==>bandwith efficient +Sample No.: 9 ==>bandwith efficient +Sample No.: 10 ==>bandwith efficient +Sample No.: 11 ==>bandwith efficient +Sample No.: 12 ==>bandwith efficient +Sample No.: 13 ==>bandwith efficient +Sample No.: 14 ==>bandwith efficient +Sample No.: 15 ==>bandwith efficient +Sample No.: 16 ==>bandwith efficient OK: Test passed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/27211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 Gerrit-Change-Number: 27211 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr_test: increase test coverage for oa / bwe conversation

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/27211 ) Change subject: amr_test: increase test coverage for oa / bwe conversation ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/27211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 Gerrit-Change-Number: 27211 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 17 Feb 2022 09:19:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in libosmo-netif[master]: amr_test: increase test coverage for oa / bwe conversation

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/27211 to look at the new patch set (#2). Change subject: amr_test: increase test coverage for oa / bwe conversation ...................................................................... amr_test: increase test coverage for oa / bwe conversation The functions that convert between octet-aligned and bandwith-efficient AMR format have good coverage on the octet-aligned side, but the bandwith-efficient side has a very little number of sample packets. Lets add some more sample packets to increase coverage. Related: SYS#5834 Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 --- M tests/amr/amr_test.c M tests/amr/amr_test.ok 2 files changed, 131 insertions(+), 31 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/11/27211/2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/27211 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53bd574e1ce7349419553e3957fff19e81567b93 Gerrit-Change-Number: 27211 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: improve encryption testing config TestHdlrEncrParams

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 to look at the new patch set (#2). Change subject: bsc: improve encryption testing config TestHdlrEncrParams ...................................................................... bsc: improve encryption testing config TestHdlrEncrParams Clean up: absorb pars.encr_exp_enc_alg into TestHdlrEncrParams as pars.encr.alg_expect. Remove the automagic encr alg choice from test procedures, instead put all magic in the pars.encr configuration setup; like this all encr alg values remain fixed through the tests, less confusing. Add separate alg_chosen for BSSMAP: So far, we have only one algorithm field for both the mask of permitted algorithms in the Encryption Information IS and the Chosen Encryption Algorithm IE. However, in the Chosen Enc Alg there must be only one bit set. Thus we cannot easily run a test where more than one alg is permitted and where the BSSMAP Chosen Enc Alg IE is involved. We've recently come to realize that the Chosen Encryption Algorithm IE may also be omitted from BSSMAP messages, in which case osmo-bsc should still work. To be able to test BSSMAP messages with omitted Chosen Encryption Algorithm, allow to set alg_chosen == omit. Keep t_EncrParams() in a way that all current tests (that set only one bit in alg_permitted) still run the same as they always did. Add t_EncrParams2() for a proper template. Add a convenience function to configure encryption testing. Related: SYS#5839 Change-Id: I6590ecf4a146dbed494d9d72f5a79441877e9010 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 93 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/27234/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6590ecf4a146dbed494d9d72f5a79441877e9010 Gerrit-Change-Number: 27234 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg

by neels

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 to look at the new patch set (#3). Change subject: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg ...................................................................... bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg Report: in inter-BSC incoming handover, when the MSC omits the Chosen Encryption Algorithm IE in the Handover Request message, then osmo-bsc starts an unencrypted lchan even if A5/0 is not permitted. This test verifies that the Encryption Information is present in the Channel Activation when the Chosen Enc Alg is omitted. Related: SYS#5839 Change-Id: Ia94cc29bf66339ed782cb5101f3640f69cf73131 --- M bsc/BSC_Tests.ttcn 1 file changed, 16 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/27233/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia94cc29bf66339ed782cb5101f3640f69cf73131 Gerrit-Change-Number: 27233 Gerrit-PatchSet: 3 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg

by neels

neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg ...................................................................... Patch Set 2: This change is ready for review. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia94cc29bf66339ed782cb5101f3640f69cf73131 Gerrit-Change-Number: 27233 Gerrit-PatchSet: 2 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Comment-Date: Thu, 17 Feb 2022 01:12:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: No Gerrit-MessageType: comment

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: improve encryption testing config TestHdlrEncrParams

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 ) Change subject: bsc: improve encryption testing config TestHdlrEncrParams ...................................................................... bsc: improve encryption testing config TestHdlrEncrParams Clean up: absorb pars.encr_exp_enc_alg into TestHdlrEncrParams as pars.encr.alg_expect. Add separate alg_chosen for BSSMAP: So far, we have only one algorithm field for both the mask of permitted algorithms in the Encryption Information IS and the Chosen Encryption Algorithm IE. However, in the Chosen Enc Alg there must be only one bit set. Thus we cannot easily run a test where more than one alg is permitted and where the BSSMAP Chosen Enc Alg IE is involved. We've recently come to realize that the Chosen Encryption Algorithm IE may also be omitted from BSSMAP messages, in which case osmo-bsc should still work. To be able to test BSSMAP messages with omitted Chosen Encryption Algorithm, allow to set alg_chosen == omit. Keep t_EncrParams() in a way that all current tests (that set only one bit in alg_permitted) still run the same as they always did. Add t_EncrParams2() for a proper template. Add a convenience function to configure encryption testing. Related: SYS#5839 Change-Id: I6590ecf4a146dbed494d9d72f5a79441877e9010 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 93 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/34/27234/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index dadd5bf..69e187c 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1673,10 +1673,12 @@ var template BSSMAP_IE_KC128 kc128 := omit; if (ispresent(enc)) { var TestHdlrEncrParams v_enc := valueof(enc); - encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg)); - chosenEncryptionAlgorithm := valueof( - ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( - f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg_permitted)); + if (ispresent(v_enc.enc_alg_chosen)) { + chosenEncryptionAlgorithm := valueof( + ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( + f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg_chosen)), 1))); + } if (ispresent(v_enc.enc_kc128)) { kc128 := ts_BSSMAP_IE_Kc128(v_enc.enc_kc128); } @@ -3781,8 +3783,7 @@ var MSC_ConnHdlr vc_conn; var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams('05'O, f_rnd_octstring(8))); /* A5/0 and A5/2 (0x01|0x04)*/ - pars.encr_exp_enc_alg := '04'O; /* A5/2 */ + pars.encr := f_encr_params('05'O, '04'O); /* A5/0 and A5/2 (0x01|0x04)*/ f_init(1, true); f_vty_encryption_a5("0 1 2 3"); @@ -3797,8 +3798,7 @@ var MSC_ConnHdlr vc_conn; var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams('06'O, f_rnd_octstring(8))); /* A5/1 and A5/2 (0x02|0x04)*/ - pars.encr_exp_enc_alg := '02'O; /* A5/1 */ + pars.encr := f_encr_params('06'O, '02'O); /* A5/1 and A5/2 (0x02|0x04)*/ f_init(1, true); f_vty_encryption_a5("1 2"); @@ -6108,27 +6108,27 @@ f_shutdown_helper(); } -function f_tc_ho_into_this_bsc_a5(OCT1 encr_alg) runs on test_CT { +function f_tc_ho_into_this_bsc_a5(TestHdlrEncrParams encr) runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams(encr_alg, f_rnd_octstring(8), f_rnd_octstring(16))); + pars.encr := encr; f_tc_ho_into_this_bsc_main(pars); f_shutdown_helper(); } testcase TC_ho_into_this_bsc_a5_0() runs on test_CT { - f_tc_ho_into_this_bsc_a5('01'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('01'O)); } testcase TC_ho_into_this_bsc_a5_1() runs on test_CT { - f_tc_ho_into_this_bsc_a5('02'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('02'O)); } testcase TC_ho_into_this_bsc_a5_3() runs on test_CT { - f_tc_ho_into_this_bsc_a5('08'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('08'O)); } testcase TC_ho_into_this_bsc_a5_4() runs on test_CT { - f_tc_ho_into_this_bsc_a5('10'O); + f_tc_ho_into_this_bsc_a5(f_encr_params('10'O)); } testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 109194b..c2b49c8 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -550,17 +550,85 @@ } type record TestHdlrEncrParams { - OCT1 enc_alg, + /* A mask of multiple encryption algorithms, for Encryption Information IE. */ + OCT1 enc_alg_permitted, + /* Expect this encryption algorithm in Channel Activation from the BSC. + * To expect no encryption, set to '01'O == A5/0. */ + OCT1 enc_alg_expect, + /* In BSSMAP, the Chosen Encryption Algorithm IE that the test sends to the BSC. + * When set to omit, the MSC will not send a Chosen Encryption Algorithm IE. */ + OCT1 enc_alg_chosen optional, octetstring enc_key, octetstring enc_kc128 optional }; -template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit) := { - enc_alg := alg, +template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg_permitted, + octetstring key, template (omit) octetstring kc128 := omit) := { + enc_alg_permitted := alg_permitted, + enc_alg_expect := alg_permitted, /* <- for compat with tests before enc_alg_expect was added */ + enc_alg_chosen := alg_permitted, /* <- for compat with tests before enc_alg_chosen was added */ enc_key := key, enc_kc128 := kc128 } +template (value) TestHdlrEncrParams t_EncrParams2(OCT1 alg_permitted, + OCT1 alg_expect, + template(omit) OCT1 alg_chosen, + octetstring key, + template (omit) octetstring kc128 := omit) := { + enc_alg_permitted := alg_permitted, + enc_alg_expect := alg_expect, + enc_alg_chosen := alg_chosen, + enc_key := key, + enc_kc128 := kc128 +} + +/* Convenience for common t_EncrParams2 usage. + * + * To test a scenario where only A5/3 is permitted: + * f_encr_params('08'O); + * To test a scenario where A5/3 is chosen from A5/0,A5/1,A5/3 (1 | 2 | 8 = 11 = 0xb): + * f_encr_params('0b'O, '08'O); + * To test the same, but the Chosen Encryption Algorithm IE should reflect A5/1: + * f_encr_params('0b'O, '08'O, '02'O); + * To test the same, but the MSC sends no Chosen Encryption Algorithm IE: + * f_encr_params('0b'O, '08'O, omit); + * + * Set alg_chosen and alg_expect magically when == '00'O: + * - enc_alg_expect is set to alg_chosen if present, else to alg_permitted. + * - enc_alg_chosen is set to alg_permitted. + * When only alg_permitted is given, alg_permitted must reflect only one algorithm, or f_cipher_mode_bssmap_to_rsl() + * will fail. + * When alg_chosen is passed as omit, the messages from the MSC will not contain a Chosen Encryption Algorithm IE. + */ +function f_encr_params(OCT1 alg_permitted, OCT1 alg_expect := '00'O, template (omit) OCT1 alg_chosen := '00'O, + boolean kc128 := false) + return TestHdlrEncrParams +{ + if (not istemplatekind(alg_chosen, "omit")) { + if (valueof(alg_chosen) == '00'O) { + if (alg_expect != '00'O) { + alg_chosen := alg_expect; + } else { + /* In this case, alg_permitted should have only one permitted algo */ + alg_chosen := alg_permitted; + } + } + if (alg_expect == '00'O) { + alg_expect := valueof(alg_chosen); + } + } + if (alg_expect == '00'O) { + /* In this case, alg_permitted should have only one permitted algo */ + alg_expect := valueof(alg_permitted); + } + var template octetstring kc := omit; + if (kc128) { + kc := f_rnd_octstring(16); + } + return valueof(t_EncrParams2(alg_permitted, alg_expect, alg_chosen, f_rnd_octstring(8), kc)); +} + type record TestHdlrParamsLcls { GlobalCallReferenceValue gcr optional, /* LCLS Configuration */ @@ -588,7 +656,6 @@ RSL_IE_Body expect_mr_conf_ie optional, /* typically present for AMR codecs */ bitstring expect_mr_s0_s7 optional, /* typically present for AMR codecs */ TestHdlrEncrParams encr optional, - OCT1 encr_exp_enc_alg optional, /* if set, expect a different enc_alg than encr.enc_alg */ TestHdlrParamsLcls lcls, SCCP_PAR_Address sccp_addr_msc optional, SCCP_PAR_Address sccp_addr_bsc optional, @@ -618,7 +685,6 @@ expect_mr_conf_ie := omit, expect_mr_s0_s7 := omit, encr := omit, - encr_exp_enc_alg := omit, lcls := { gcr := omit, cfg := omit, @@ -740,24 +806,12 @@ else if (alg_bssmap == '80'O) { return RSL_ALG_ID_A5_7; } else { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption Algorithm"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Encryption Algorithm: " & + oct2str(alg_bssmap)); return RSL_ALG_ID_A5_0; } } -function f_cipher_mode_bssmap_to_rsl_exp_enc_alg() runs on MSC_ConnHdlr return RSL_AlgId -{ - var OCT1 enc_alg; - - if (ispresent(g_pars.encr_exp_enc_alg)) { - enc_alg := g_pars.encr_exp_enc_alg; - } else { - enc_alg := g_pars.encr.enc_alg; - } - - return f_cipher_mode_bssmap_to_rsl(enc_alg); -} - function f_verify_encr_info(RSL_Message rsl) runs on MSC_ConnHdlr { var RSL_IE_Body encr_info; var RSL_AlgId alg_rsl; @@ -776,7 +830,7 @@ /* RSL uses a different representation of the encryption algorithm, * so we need to convert first */ - alg_rsl := f_cipher_mode_bssmap_to_rsl_exp_enc_alg(); + alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg_expect); if (alg_rsl == RSL_ALG_ID_A5_4 and ispresent(g_pars.encr.enc_kc128)) { expect_kc := g_pars.encr.enc_kc128; @@ -820,9 +874,9 @@ var RSL_Message rsl; if (isvalue(enc.enc_kc128)) { - BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(enc.enc_alg, enc.enc_key, valueof(enc.enc_kc128))); + BSSAP.send(ts_BSSMAP_CipherModeCmdKc128(enc.enc_alg_permitted, enc.enc_key, valueof(enc.enc_kc128))); } else { - BSSAP.send(ts_BSSMAP_CipherModeCmd(enc.enc_alg, enc.enc_key)); + BSSAP.send(ts_BSSMAP_CipherModeCmd(enc.enc_alg_permitted, enc.enc_key)); } alt { @@ -843,7 +897,7 @@ Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected Cipher Mode Complete"); } else { setverdict(pass); - var RSL_AlgId alg_rsl := f_cipher_mode_bssmap_to_rsl_exp_enc_alg(); + var RSL_AlgId alg_rsl := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg_expect); if (oct2int(bssap.pdu.bssmap.cipherModeComplete.chosenEncryptionAlgorithm.algorithmIdentifier) != enum2int(alg_rsl)) { setverdict(fail, "Unexpected Encryption Algorithm ID in BSSMAP Cipher Mode Complete"); } @@ -941,11 +995,11 @@ var RSL_IE_Body ms_power_param; var RSL_IE_Body ms_power; - if (ispresent(g_pars.encr) and g_pars.encr.enc_alg != '01'O) { + if (ispresent(g_pars.encr) and g_pars.encr.enc_alg_permitted != '01'O) { if (not f_rsl_find_ie(chan_act, RSL_IE_ENCR_INFO, encr_info)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Missing Encryption IE in CHAN ACT"); } else { - var RSL_AlgId alg := f_cipher_mode_bssmap_to_rsl_exp_enc_alg(); + var RSL_AlgId alg := f_cipher_mode_bssmap_to_rsl(g_pars.encr.enc_alg_expect); var octetstring expect_key; if (alg == RSL_ALG_ID_A5_4) { expect_key := g_pars.encr.enc_kc128; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27234 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I6590ecf4a146dbed494d9d72f5a79441877e9010 Gerrit-Change-Number: 27234 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in osmo-ttcn3-hacks[master]: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 ) Change subject: bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg ...................................................................... bsc: add TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg Report: in inter-BSC incoming handover, when the MSC omits the Chosen Encryption Algorithm IE in the Handover Request message, then osmo-bsc starts an unencrypted lchan even if A5/0 is not permitted. This test verifies that the Encryption Information is present in the Channel Activation when the Chosen Enc Alg is omitted. Related: SYS#5839 Change-Id: Ia94cc29bf66339ed782cb5101f3640f69cf73131 --- M bsc/BSC_Tests.ttcn M bsc/MSC_ConnectionHandler.ttcn 2 files changed, 26 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/33/27233/1 diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index dadd5bf..43236b3 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -1674,9 +1674,11 @@ if (ispresent(enc)) { var TestHdlrEncrParams v_enc := valueof(enc); encryptionInformation := valueof(ts_BSSMAP_IE_EncrInfo(v_enc.enc_key, v_enc.enc_alg)); - chosenEncryptionAlgorithm := valueof( - ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( - f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + if (v_enc.msc_sends_chosen_encr_alg_ie) { + chosenEncryptionAlgorithm := valueof( + ts_BSSMAP_IE_ChosenEncryptionAlgorithm(int2oct(enum2int( + f_cipher_mode_bssmap_to_rsl(v_enc.enc_alg)), 1))); + } if (ispresent(v_enc.enc_kc128)) { kc128 := ts_BSSMAP_IE_Kc128(v_enc.enc_kc128); } @@ -6108,9 +6110,10 @@ f_shutdown_helper(); } -function f_tc_ho_into_this_bsc_a5(OCT1 encr_alg) runs on test_CT { +function f_tc_ho_into_this_bsc_a5(OCT1 encr_alg, boolean msc_sends_chosen_encr_alg_ie := true) runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); - pars.encr := valueof(t_EncrParams(encr_alg, f_rnd_octstring(8), f_rnd_octstring(16))); + pars.encr := valueof(t_EncrParams(encr_alg, f_rnd_octstring(8), f_rnd_octstring(16), + msc_sends_chosen_encr_alg_ie)); f_tc_ho_into_this_bsc_main(pars); f_shutdown_helper(); } @@ -6131,6 +6134,18 @@ f_tc_ho_into_this_bsc_a5('10'O); } +/* Report: in inter-BSC incoming handover, when the MSC omits the Chosen Encryption Algorithm IE in the Handover Request + * message, then osmo-bsc starts an unencrypted lchan even if A5/0 is not permitted. + * + * This test verifies that the Encryption Information is present in the Channel Activation when the Chosen Enc Alg is + * omitted. + * + * Related: SYS#5839 + */ +testcase TC_ho_into_this_bsc_a5_1_3_no_chosen_enc_alg() runs on test_CT { + f_tc_ho_into_this_bsc_a5('0a'O, false); +} + testcase TC_ho_into_this_bsc_tla_v6() runs on test_CT { var TestHdlrParams pars := f_gen_test_hdlr_pars(); pars.host_aoip_tla := "::6"; diff --git a/bsc/MSC_ConnectionHandler.ttcn b/bsc/MSC_ConnectionHandler.ttcn index 109194b..df84d93 100644 --- a/bsc/MSC_ConnectionHandler.ttcn +++ b/bsc/MSC_ConnectionHandler.ttcn @@ -552,13 +552,16 @@ type record TestHdlrEncrParams { OCT1 enc_alg, octetstring enc_key, - octetstring enc_kc128 optional + octetstring enc_kc128 optional, + boolean msc_sends_chosen_encr_alg_ie }; -template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit) := { +template (value) TestHdlrEncrParams t_EncrParams(OCT1 alg, octetstring key, template (omit) octetstring kc128 := omit, + boolean msc_sends_chosen_encr_alg_ie := true) := { enc_alg := alg, enc_key := key, - enc_kc128 := kc128 + enc_kc128 := kc128, + msc_sends_chosen_encr_alg_ie := msc_sends_chosen_encr_alg_ie } type record TestHdlrParamsLcls { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/27233 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ia94cc29bf66339ed782cb5101f3640f69cf73131 Gerrit-Change-Number: 27233 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

3 years, 4 months

1
0
0 0

Change in docker-playground[master]: Remove debian-buster-erlang

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/docker-playground/+/27215 ) Change subject: Remove debian-buster-erlang ...................................................................... Remove debian-buster-erlang We don't need the image anymore, we use debian-bullseye-erlang. Change-Id: I6f22642f5f67a173b17db55aa7a7bda3d9debd54 --- D debian-buster-erlang/Dockerfile D debian-buster-erlang/Makefile 2 files changed, 0 insertions(+), 57 deletions(-) Approvals: laforge: Looks good to me, approved fixeria: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/debian-buster-erlang/Dockerfile b/debian-buster-erlang/Dockerfile deleted file mode 100644 index 10b2c88..0000000 --- a/debian-buster-erlang/Dockerfile +++ /dev/null @@ -1,54 +0,0 @@ -ARG REGISTRY=docker.io -FROM ${REGISTRY}/debian:buster -# Arguments used after FROM must be specified again -ARG OSMOCOM_REPO_MIRROR="http://download.opensuse.org" -ARG OSMOCOM_REPO_PATH="repositories/network:/osmocom:" - -MAINTAINER Harald Welte <laforge(a)gnumonks.org> - -ARG OSMOCOM_REPO="${OSMOCOM_REPO_MIRROR}/${OSMOCOM_REPO_PATH}/latest/Debian_10/" - -# install the erlang vm and rebar (2) -RUN apt-get update && \ - apt-get upgrade -y && \ - apt-get -y install \ - erlang \ - rebar - -# add rebar3 -ADD https://s3.amazonaws.com/rebar3/rebar3 /usr/bin/rebar3 -RUN chmod 0755 /usr/bin/rebar3 - -# install ninimal build utilities as well as system utilities -RUN apt-get update && \ - apt-get -y install \ - build-essential \ - git \ - procps \ - tcpdump \ - vim \ - netcat-openbsd \ - wget \ - && \ - apt-get clean - -# install additional C-language / system dependencies of our Erlang projects -RUN apt-get update && \ - apt-get -y install \ - libpcap-dev \ - && \ - apt-get clean - -# add osmocom latest repo, should we ever require packages from there -RUN apt-get update && apt-get install -y \ - gnupg -COPY .common/Release.key /tmp/Release.key -RUN apt-key add /tmp/Release.key && \ - rm /tmp/Release.key && \ - echo "deb " $OSMOCOM_REPO " ./" > /etc/apt/sources.list.d/osmocom-latest.list -ADD $OSMOCOM_REPO/Release /tmp/Release - -# add a non-root user under which we will normaly execute build tests -RUN useradd -m build -WORKDIR /home/build -USER build diff --git a/debian-buster-erlang/Makefile b/debian-buster-erlang/Makefile deleted file mode 100644 index 67066b3..0000000 --- a/debian-buster-erlang/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -UPSTREAM_DISTRO=debian:buster -DISTRO=debian-buster -include ../make/Makefile -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/27215 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: I6f22642f5f67a173b17db55aa7a7bda3d9debd54 Gerrit-Change-Number: 27215 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years, 4 months

1
0
0 0

2025

2024

2023

2022

gerrit-log February 2022