Skip to content

Commit 96d4342

Browse files
AnarchistHoneybunAnarchistHoneybun
committed
update hex string formatting
1 parent 3610814 commit 96d4342

File tree

5 files changed

+390
-490
lines changed

5 files changed

+390
-490
lines changed

Diff for: ‎kupyna/src/sub_units/t_xor_plus/tests/test_individual_layers.rs

+80-100
Original file line numberDiff line numberDiff line change
@@ -9,28 +9,24 @@ fn setup_hash_params() -> KupynaH {
99
#[test]
1010
fn test_add_constant_xor() {
1111
let input = hex!(
12-
"
13-
00010203 04050607 08090A0B 0C0D0E0F
14-
10111213 14151617 18191A1B 1C1D1E1F
15-
20212223 24252627 28292A2B 2C2D2E2F
16-
30313233 34353637 38393A3B 3C3D3E3F
17-
40414243 44454647 48494A4B 4C4D4E4F
18-
50515253 54555657 58595A5B 5C5D5E5F
19-
60616263 64656667 68696A6B 6C6D6E6F
20-
70717273 74757677 78797A7B 7C7D7E7F
21-
"
12+
"00010203 04050607 08090A0B 0C0D0E0F"
13+
"10111213 14151617 18191A1B 1C1D1E1F"
14+
"20212223 24252627 28292A2B 2C2D2E2F"
15+
"30313233 34353637 38393A3B 3C3D3E3F"
16+
"40414243 44454647 48494A4B 4C4D4E4F"
17+
"50515253 54555657 58595A5B 5C5D5E5F"
18+
"60616263 64656667 68696A6B 6C6D6E6F"
19+
"70717273 74757677 78797A7B 7C7D7E7F"
2220
);
2321
let expected_output = hex!(
24-
"
25-
00010203 04050607 18090A0B 0C0D0E0F
26-
30111213 14151617 28191A1B 1C1D1E1F
27-
60212223 24252627 78292A2B 2C2D2E2F
28-
50313233 34353637 48393A3B 3C3D3E3F
29-
C0414243 44454647 D8494A4B 4C4D4E4F
30-
F0515253 54555657 E8595A5B 5C5D5E5F
31-
A0616263 64656667 B8696A6B 6C6D6E6F
32-
90717273 74757677 88797A7B 7C7D7E7F
33-
"
22+
"00010203 04050607 18090A0B 0C0D0E0F"
23+
"30111213 14151617 28191A1B 1C1D1E1F"
24+
"60212223 24252627 78292A2B 2C2D2E2F"
25+
"50313233 34353637 48393A3B 3C3D3E3F"
26+
"C0414243 44454647 D8494A4B 4C4D4E4F"
27+
"F0515253 54555657 E8595A5B 5C5D5E5F"
28+
"A0616263 64656667 B8696A6B 6C6D6E6F"
29+
"90717273 74757677 88797A7B 7C7D7E7F"
3430
);
3531

3632
let hash_params = setup_hash_params();
@@ -43,28 +39,24 @@ fn test_add_constant_xor() {
4339
#[test]
4440
fn test_add_constant_plus() {
4541
let input = hex!(
46-
"
47-
00010203 04050607 08090A0B 0C0D0E0F
48-
10111213 14151617 18191A1B 1C1D1E1F
49-
20212223 24252627 28292A2B 2C2D2E2F
50-
30313233 34353637 38393A3B 3C3D3E3F
51-
40414243 44454647 48494A4B 4C4D4E4F
52-
50515253 54555657 58595A5B 5C5D5E5F
53-
60616263 64656667 68696A6B 6C6D6E6F
54-
70717273 74757677 78797A7B 7C7D7E7F
55-
"
42+
"00010203 04050607 08090A0B 0C0D0E0F"
43+
"10111213 14151617 18191A1B 1C1D1E1F"
44+
"20212223 24252627 28292A2B 2C2D2E2F"
45+
"30313233 34353637 38393A3B 3C3D3E3F"
46+
"40414243 44454647 48494A4B 4C4D4E4F"
47+
"50515253 54555657 58595A5B 5C5D5E5F"
48+
"60616263 64656667 68696A6B 6C6D6E6F"
49+
"70717273 74757677 78797A7B 7C7D7E7F"
5650
);
5751
let expected_output = hex!(
58-
"
59-
F3F1F2F3 F4F5F6F7 FBF9FAFB FCFDFEEF
60-
03020304 050607E8 0B0A0B0C 0D0E0FE0
61-
13121314 151617D8 1B1A1B1C 1D1E1FD0
62-
23222324 252627C8 2B2A2B2C 2D2E2FC0
63-
33323334 353637B8 3B3A3B3C 3D3E3FB0
64-
43424344 454647A8 4B4A4B4C 4D4E4FA0
65-
53525354 55565798 5B5A5B5C 5D5E5F90
66-
63626364 65666788 6B6A6B6C 6D6E6F80
67-
"
52+
"F3F1F2F3 F4F5F6F7 FBF9FAFB FCFDFEEF"
53+
"03020304 050607E8 0B0A0B0C 0D0E0FE0"
54+
"13121314 151617D8 1B1A1B1C 1D1E1FD0"
55+
"23222324 252627C8 2B2A2B2C 2D2E2FC0"
56+
"33323334 353637B8 3B3A3B3C 3D3E3FB0"
57+
"43424344 454647A8 4B4A4B4C 4D4E4FA0"
58+
"53525354 55565798 5B5A5B5C 5D5E5F90"
59+
"63626364 65666788 6B6A6B6C 6D6E6F80"
6860
);
6961

7062
let hash_params = setup_hash_params();
@@ -77,28 +69,24 @@ fn test_add_constant_plus() {
7769
#[test]
7870
fn test_s_box_layer() {
7971
let input = hex!(
80-
"
81-
00010203 04050607 18090A0B 0C0D0E0F
82-
30111213 14151617 28191A1B 1C1D1E1F
83-
60212223 24252627 78292A2B 2C2D2E2F
84-
50313233 34353637 48393A3B 3C3D3E3F
85-
C0414243 44454647 D8494A4B 4C4D4E4F
86-
F0515253 54555657 E8595A5B 5C5D5E5F
87-
A0616263 64656667 B8696A6B 6C6D6E6F
88-
90717273 74757677 88797A7B 7C7D7E7F
89-
"
72+
"00010203 04050607 18090A0B 0C0D0E0F"
73+
"30111213 14151617 28191A1B 1C1D1E1F"
74+
"60212223 24252627 78292A2B 2C2D2E2F"
75+
"50313233 34353637 48393A3B 3C3D3E3F"
76+
"C0414243 44454647 D8494A4B 4C4D4E4F"
77+
"F0515253 54555657 E8595A5B 5C5D5E5F"
78+
"A0616263 64656667 B8696A6B 6C6D6E6F"
79+
"90717273 74757677 88797A7B 7C7D7E7F"
9080
);
9181
let expected_output = hex!(
92-
"
93-
A8BB9A4D 6BCB452A 793ADFB3 1790511F
94-
92152B3D C91CBB83 1F5C71D5 6F5716BD
95-
34F6C002 B4F4AD11 8E0F7A5E 496DD166
96-
2E26C445 D15DB794 9C140E1A 5810B2DF
97-
2F6BD70E 4233C386 C49B4E85 8F95CB99
98-
81634FEE 963C5530 124918B1 BC37E671
99-
782B8FFD 6A45B9AA 1C0D2FAB 388CDA60
100-
EBDC050C 36B56CEC CD62B17C 14A55E5B
101-
"
82+
"A8BB9A4D 6BCB452A 793ADFB3 1790511F"
83+
"92152B3D C91CBB83 1F5C71D5 6F5716BD"
84+
"34F6C002 B4F4AD11 8E0F7A5E 496DD166"
85+
"2E26C445 D15DB794 9C140E1A 5810B2DF"
86+
"2F6BD70E 4233C386 C49B4E85 8F95CB99"
87+
"81634FEE 963C5530 124918B1 BC37E671"
88+
"782B8FFD 6A45B9AA 1C0D2FAB 388CDA60"
89+
"EBDC050C 36B56CEC CD62B17C 14A55E5B"
10290
);
10391

10492
let hash_params = setup_hash_params();
@@ -111,28 +99,24 @@ fn test_s_box_layer() {
11199
#[test]
112100
fn test_rotate_rows() {
113101
let input = hex!(
114-
"
115-
A8BB9A4D 6BCB452A 793ADFB3 1790511F
116-
92152B3D C91CBB83 1F5C71D5 6F5716BD
117-
34F6C002 B4F4AD11 8E0F7A5E 496DD166
118-
2E26C445 D15DB794 9C140E1A 5810B2DF
119-
2F6BD70E 4233C386 C49B4E85 8F95CB99
120-
81634FEE 963C5530 124918B1 BC37E671
121-
782B8FFD 6A45B9AA 1C0D2FAB 388CDA60
122-
EBDC050C 36B56CEC CD62B17C 14A55E5B
123-
"
102+
"A8BB9A4D 6BCB452A 793ADFB3 1790511F"
103+
"92152B3D C91CBB83 1F5C71D5 6F5716BD"
104+
"34F6C002 B4F4AD11 8E0F7A5E 496DD166"
105+
"2E26C445 D15DB794 9C140E1A 5810B2DF"
106+
"2F6BD70E 4233C386 C49B4E85 8F95CB99"
107+
"81634FEE 963C5530 124918B1 BC37E671"
108+
"782B8FFD 6A45B9AA 1C0D2FAB 388CDA60"
109+
"EBDC050C 36B56CEC CD62B17C 14A55E5B"
124110
);
125111
let expected_output = hex!(
126-
"
127-
A86205AB 6A375566 79BBB10C 3845E694
128-
923A9A7C 368CB9DF 1F15DF4D 14B5DA86
129-
345C2BB3 6BA56C99 8EF6713D 17CB5E30
130-
2E0FC0D5 C9904571 9C267A02 6F1C51AA
131-
2F14C45E B457BB60 C46B0E45 49F416EC
132-
819BD71A D16DAD5B 12634E0E 585DD12A
133-
78494F85 4210B71F 1C2B18EE 8F33B283
134-
EB0D8FB1 9695C3BD CDDC2FFD BC3CCB11
135-
"
112+
"A86205AB 6A375566 79BBB10C 3845E694"
113+
"923A9A7C 368CB9DF 1F15DF4D 14B5DA86"
114+
"345C2BB3 6BA56C99 8EF6713D 17CB5E30"
115+
"2E0FC0D5 C9904571 9C267A02 6F1C51AA"
116+
"2F14C45E B457BB60 C46B0E45 49F416EC"
117+
"819BD71A D16DAD5B 12634E0E 585DD12A"
118+
"78494F85 4210B71F 1C2B18EE 8F33B283"
119+
"EB0D8FB1 9695C3BD CDDC2FFD BC3CCB11"
136120
);
137121

138122
let hash_params = setup_hash_params();
@@ -145,28 +129,24 @@ fn test_rotate_rows() {
145129
#[test]
146130
fn test_mix_columns() {
147131
let input = hex!(
148-
"
149-
A86205AB 6A375566 79BBB10C 3845E694
150-
923A9A7C 368CB9DF 1F15DF4D 14B5DA86
151-
345C2BB3 6BA56C99 8EF6713D 17CB5E30
152-
2E0FC0D5 C9904571 9C267A02 6F1C51AA
153-
2F14C45E B457BB60 C46B0E45 49F416EC
154-
819BD71A D16DAD5B 12634E0E 585DD12A
155-
78494F85 4210B71F 1C2B18EE 8F33B283
156-
EB0D8FB1 9695C3BD CDDC2FFD BC3CCB11
157-
"
132+
"A86205AB 6A375566 79BBB10C 3845E694"
133+
"923A9A7C 368CB9DF 1F15DF4D 14B5DA86"
134+
"345C2BB3 6BA56C99 8EF6713D 17CB5E30"
135+
"2E0FC0D5 C9904571 9C267A02 6F1C51AA"
136+
"2F14C45E B457BB60 C46B0E45 49F416EC"
137+
"819BD71A D16DAD5B 12634E0E 585DD12A"
138+
"78494F85 4210B71F 1C2B18EE 8F33B283"
139+
"EB0D8FB1 9695C3BD CDDC2FFD BC3CCB11"
158140
);
159141
let expected_output = hex!(
160-
"
161-
86C37798 D2C341A0 3D40B8B9 E2D021B8
162-
EDF7EC7C 7624852B E454C7EE 3A2AAD4E
163-
9D55309E D99527D0 9204D40B 63DC5B6F
164-
4D2590F2 22831818 1819A801 E26A9090
165-
2BE1E2D9 F05181F4 596EFABC 35F984EB
166-
0CCB22FC B22ADC5C 98D3ED83 95CD50D4
167-
CE5A5216 8ED88C03 081D60B9 B28BAE4D
168-
FEA83FFB 07F135B5 7178E6C8 9B206AD3
169-
"
142+
"86C37798 D2C341A0 3D40B8B9 E2D021B8"
143+
"EDF7EC7C 7624852B E454C7EE 3A2AAD4E"
144+
"9D55309E D99527D0 9204D40B 63DC5B6F"
145+
"4D2590F2 22831818 1819A801 E26A9090"
146+
"2BE1E2D9 F05181F4 596EFABC 35F984EB"
147+
"0CCB22FC B22ADC5C 98D3ED83 95CD50D4"
148+
"CE5A5216 8ED88C03 081D60B9 B28BAE4D"
149+
"FEA83FFB 07F135B5 7178E6C8 9B206AD3"
170150
);
171151

172152
let hash_params = setup_hash_params();

Diff for: ‎kupyna/src/sub_units/t_xor_plus/tests/test_xor_plus.rs

+32-40
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,25 @@ fn setup_hash_params() -> KupynaH {
99
#[test]
1010
fn test_t_xor_l() {
1111
let input = hex!(
12-
"
13-
00010203 04050607 08090A0B 0C0D0E0F
14-
10111213 14151617 18191A1B 1C1D1E1F
15-
20212223 24252627 28292A2B 2C2D2E2F
16-
30313233 34353637 38393A3B 3C3D3E3F
17-
40414243 44454647 48494A4B 4C4D4E4F
18-
50515253 54555657 58595A5B 5C5D5E5F
19-
60616263 64656667 68696A6B 6C6D6E6F
20-
70717273 74757677 78797A7B 7C7D7E7F
21-
"
12+
"00010203 04050607 08090A0B 0C0D0E0F"
13+
"10111213 14151617 18191A1B 1C1D1E1F"
14+
"20212223 24252627 28292A2B 2C2D2E2F"
15+
"30313233 34353637 38393A3B 3C3D3E3F"
16+
"40414243 44454647 48494A4B 4C4D4E4F"
17+
"50515253 54555657 58595A5B 5C5D5E5F"
18+
"60616263 64656667 68696A6B 6C6D6E6F"
19+
"70717273 74757677 78797A7B 7C7D7E7F"
2220
);
2321

2422
let expected_output = hex!(
25-
"
26-
604B9DCF 7EAA5785 94D183EE F2DD97A3
27-
2C111C81 70C0A508 6A08C9E4 28811132
28-
31BEC7B7 1D0EE31D E8363B4A A6AF890B
29-
DEEE5C96 663A4438 3A400930 60E76515
30-
2DEBECD2 5B8342C4 EF4E750F C3F4814F
31-
A9E1D11F E7F6F8CF 3272E7E1 614F91AD
32-
6F01F728 D8DBBE1F 2AC19777 1E378F8D
33-
D7D13132 7BF1A943 A955F1F7 C832ADF3
34-
"
23+
"604B9DCF 7EAA5785 94D183EE F2DD97A3"
24+
"2C111C81 70C0A508 6A08C9E4 28811132"
25+
"31BEC7B7 1D0EE31D E8363B4A A6AF890B"
26+
"DEEE5C96 663A4438 3A400930 60E76515"
27+
"2DEBECD2 5B8342C4 EF4E750F C3F4814F"
28+
"A9E1D11F E7F6F8CF 3272E7E1 614F91AD"
29+
"6F01F728 D8DBBE1F 2AC19777 1E378F8D"
30+
"D7D13132 7BF1A943 A955F1F7 C832ADF3"
3531
);
3632

3733
let hash_params = setup_hash_params();
@@ -42,29 +38,25 @@ fn test_t_xor_l() {
4238
#[test]
4339
fn test_t_plus_l() {
4440
let input = hex!(
45-
"
46-
00010203 04050607 08090A0B 0C0D0E0F
47-
10111213 14151617 18191A1B 1C1D1E1F
48-
20212223 24252627 28292A2B 2C2D2E2F
49-
30313233 34353637 38393A3B 3C3D3E3F
50-
40414243 44454647 48494A4B 4C4D4E4F
51-
50515253 54555657 58595A5B 5C5D5E5F
52-
60616263 64656667 68696A6B 6C6D6E6F
53-
70717273 74757677 78797A7B 7C7D7E7F
54-
"
41+
"00010203 04050607 08090A0B 0C0D0E0F"
42+
"10111213 14151617 18191A1B 1C1D1E1F"
43+
"20212223 24252627 28292A2B 2C2D2E2F"
44+
"30313233 34353637 38393A3B 3C3D3E3F"
45+
"40414243 44454647 48494A4B 4C4D4E4F"
46+
"50515253 54555657 58595A5B 5C5D5E5F"
47+
"60616263 64656667 68696A6B 6C6D6E6F"
48+
"70717273 74757677 78797A7B 7C7D7E7F"
5549
);
5650

5751
let expected_output = hex!(
58-
"
59-
36575D99 3036AFDE B2654C1E 13660A9D
60-
4F0E105C A2336F2B B3690045 259A1A9D
61-
3F248507 C342A70B 42F74981 ECE46DD0
62-
5E1D309F 774E1ED2 13247CC8 21461673
63-
C7419AE1 2B9361F3 2C7538C1 5909B197
64-
E20F9E09 DD28CDD4 D7C234DB DB479318
65-
A258A718 0B183317 8A20FCFE 05A6064F
66-
D7B1EA96 07995E98 D90D2D55 DCF72F5F
67-
"
52+
"36575D99 3036AFDE B2654C1E 13660A9D"
53+
"4F0E105C A2336F2B B3690045 259A1A9D"
54+
"3F248507 C342A70B 42F74981 ECE46DD0"
55+
"5E1D309F 774E1ED2 13247CC8 21461673"
56+
"C7419AE1 2B9361F3 2C7538C1 5909B197"
57+
"E20F9E09 DD28CDD4 D7C234DB DB479318"
58+
"A258A718 0B183317 8A20FCFE 05A6064F"
59+
"D7B1EA96 07995E98 D90D2D55 DCF72F5F"
6860
);
6961

7062
let hash_params = setup_hash_params();

0 commit comments

Comments
 (0)