osmo_hexparse: allow whitespace in parsed string, add ws test
This is particularly useful for hex dumps containing spaces found in a log
(e.g. osmo-nitb authentication rand token), which can now be passed in quotes
to osmo-auc-gen without having to edit the spaces away.
Change-Id: Ib7af07f674a2d26c8569acdee98835fb3e626c45
diff --git a/tests/utils/utils_test.c b/tests/utils/utils_test.c
index e3d6221..cad162d 100644
--- a/tests/utils/utils_test.c
+++ b/tests/utils/utils_test.c
@@ -124,6 +124,31 @@
for (i = 0; i < sizeof(data); i++)
OSMO_ASSERT(data[i] == i);
+ printf("Hexparse 0..255 with whitespace\n");
+ memset(data, 0, sizeof(data));
+ rc = osmo_hexparse(
+ "00 01\t02\r030405060708090A0B0C0D0 E 0 F\n"
+ "10 11\t12\r131415161718191A1B1C1D1 E 1 F\n"
+ "20 21\t22\r232425262728292A2B2C2D2 E 2 F\n"
+ "30 31\t32\r333435363738393a3b3c3d3 e 3 f\n"
+ "40 41\t42\r434445464748494A4B4C4D4 E 4 F\n"
+ "50 51\t52\r535455565758595a5b5c5d5 e 5 f\n"
+ "60 61\t62\r636465666768696A6B6C6D6 E 6 F\n"
+ "70 71\t72\r737475767778797A7B7C7D7 E 7 F\n"
+ "80 81\t82\r838485868788898A8B8C8D8 E 8 F\n"
+ "90 91\t92\r939495969798999A9B9C9D9 E 9 F\n"
+ "A0 A1\tA2\rA3a4a5a6a7a8a9AAABACADA E A F\n"
+ "B0 B1\tB2\rB3b4b5b6b7b8b9BABBBCBDB E B F\n"
+ "C0 C1\tC2\rC3c4c5c6c7c8c9CACBCCCDC E C F \n"
+ "D0 D1\tD2\rD3d4d5d6d7d8d9DADBDCDDD E D F\t\n"
+ "E0 E1\tE2\rE3e4e5e6e7e8e9EAEBECEDE E E F \t\n"
+ "F0 F1\tF2\rF3f4f5f6f7f8f9FAFBFCFDF E F F \t\r\n"
+ , data, sizeof(data));
+ printf("rc = %d\n", rc);
+ printf("--> %s\n\n", osmo_hexdump(data, sizeof(data)));
+ for (i = 0; i < sizeof(data); i++)
+ OSMO_ASSERT(data[i] == i);
+
printf("Hexparse with buffer too short\n");
memset(data, 0, sizeof(data));
rc = osmo_hexparse("000102030405060708090a0b0c0d0e0f", data, 15);
diff --git a/tests/utils/utils_test.ok b/tests/utils/utils_test.ok
index 0f7e7a0..e9be018 100644
--- a/tests/utils/utils_test.ok
+++ b/tests/utils/utils_test.ok
@@ -16,6 +16,10 @@
rc = 256
--> 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
+Hexparse 0..255 with whitespace
+rc = 256
+--> 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f 30 31 32 33 34 35 36 37 38 39 3a 3b 3c 3d 3e 3f 40 41 42 43 44 45 46 47 48 49 4a 4b 4c 4d 4e 4f 50 51 52 53 54 55 56 57 58 59 5a 5b 5c 5d 5e 5f 60 61 62 63 64 65 66 67 68 69 6a 6b 6c 6d 6e 6f 70 71 72 73 74 75 76 77 78 79 7a 7b 7c 7d 7e 7f 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af b0 b1 b2 b3 b4 b5 b6 b7 b8 b9 ba bb bc bd be bf c0 c1 c2 c3 c4 c5 c6 c7 c8 c9 ca cb cc cd ce cf d0 d1 d2 d3 d4 d5 d6 d7 d8 d9 da db dc dd de df e0 e1 e2 e3 e4 e5 e6 e7 e8 e9 ea eb ec ed ee ef f0 f1 f2 f3 f4 f5 f6 f7 f8 f9 fa fb fc fd fe ff
+
Hexparse with buffer too short
rc = -1
Hexparse with uneven amount of digits