summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbcook <>2014-08-16 17:30:12 +0000
committerbcook <>2014-08-16 17:30:12 +0000
commitdd0ff50cd5d30db59d9069a9e0b516c03c456e8e (patch)
tree50b14b54320e028d54357367ceac53f518199ab8
parent3d2b3709ef615f448f930446b6be45e86d99e121 (diff)
downloadopenbsd-dd0ff50cd5d30db59d9069a9e0b516c03c456e8e.tar.gz
openbsd-dd0ff50cd5d30db59d9069a9e0b516c03c456e8e.tar.bz2
openbsd-dd0ff50cd5d30db59d9069a9e0b516c03c456e8e.zip
use C rather than C++ array initialization syntax
this causes errors with stricter C compilers
-rw-r--r--src/regress/lib/libcrypto/gcm128/gcm128test.c74
1 files changed, 37 insertions, 37 deletions
diff --git a/src/regress/lib/libcrypto/gcm128/gcm128test.c b/src/regress/lib/libcrypto/gcm128/gcm128test.c
index 85d81f91b5..ed78366e3c 100644
--- a/src/regress/lib/libcrypto/gcm128/gcm128test.c
+++ b/src/regress/lib/libcrypto/gcm128/gcm128test.c
@@ -78,15 +78,15 @@ struct gcm128_test {
78struct gcm128_test gcm128_tests[] = { 78struct gcm128_test gcm128_tests[] = {
79 { 79 {
80 /* Test Case 1. */ 80 /* Test Case 1. */
81 .K = {}, 81 .K = {0},
82 .K_len = 16, 82 .K_len = 16,
83 .IV = {}, 83 .IV = {0},
84 .IV_len = 12, 84 .IV_len = 12,
85 .P = {}, 85 .P = {0},
86 .P_len = 0, 86 .P_len = 0,
87 .A = {}, 87 .A = {0},
88 .A_len = 0, 88 .A_len = 0,
89 .C = {}, 89 .C = {0},
90 .C_len = 0, 90 .C_len = 0,
91 .T = { 91 .T = {
92 0x58, 0xe2, 0xfc, 0xce, 0xfa, 0x7e, 0x30, 0x61, 92 0x58, 0xe2, 0xfc, 0xce, 0xfa, 0x7e, 0x30, 0x61,
@@ -95,13 +95,13 @@ struct gcm128_test gcm128_tests[] = {
95 }, 95 },
96 { 96 {
97 /* Test Case 2. */ 97 /* Test Case 2. */
98 .K = {}, 98 .K = {0},
99 .K_len = 16, 99 .K_len = 16,
100 .IV = {}, 100 .IV = {0},
101 .IV_len = 12, 101 .IV_len = 12,
102 .P = {}, 102 .P = {0},
103 .P_len = 16, 103 .P_len = 16,
104 .A = {}, 104 .A = {0},
105 .A_len = 0, 105 .A_len = 0,
106 .C = { 106 .C = {
107 0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92, 107 0x03, 0x88, 0xda, 0xce, 0x60, 0xb6, 0xa3, 0x92,
@@ -136,7 +136,7 @@ struct gcm128_test gcm128_tests[] = {
136 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55, 136 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
137 }, 137 },
138 .P_len = 64, 138 .P_len = 64,
139 .A = {}, 139 .A = {0},
140 .A_len = 0, 140 .A_len = 0,
141 .C = { 141 .C = {
142 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24, 142 0x42, 0x83, 0x1e, 0xc2, 0x21, 0x77, 0x74, 0x24,
@@ -298,15 +298,15 @@ struct gcm128_test gcm128_tests[] = {
298 }, 298 },
299 { 299 {
300 /* Test Case 7. */ 300 /* Test Case 7. */
301 .K = {}, 301 .K = {0},
302 .K_len = 24, 302 .K_len = 24,
303 .IV = {}, 303 .IV = {0},
304 .IV_len = 12, 304 .IV_len = 12,
305 .P = {}, 305 .P = {0},
306 .P_len = 0, 306 .P_len = 0,
307 .A = {}, 307 .A = {0},
308 .A_len = 0, 308 .A_len = 0,
309 .C = {}, 309 .C = {0},
310 .C_len = 0, 310 .C_len = 0,
311 .T = { 311 .T = {
312 0xcd, 0x33, 0xb2, 0x8a, 0xc7, 0x73, 0xf7, 0x4b, 312 0xcd, 0x33, 0xb2, 0x8a, 0xc7, 0x73, 0xf7, 0x4b,
@@ -315,13 +315,13 @@ struct gcm128_test gcm128_tests[] = {
315 }, 315 },
316 { 316 {
317 /* Test Case 8. */ 317 /* Test Case 8. */
318 .K = {}, 318 .K = {0},
319 .K_len = 24, 319 .K_len = 24,
320 .IV = {}, 320 .IV = {0},
321 .IV_len = 12, 321 .IV_len = 12,
322 .P = {}, 322 .P = {0},
323 .P_len = 16, 323 .P_len = 16,
324 .A = {}, 324 .A = {0},
325 .A_len = 0, 325 .A_len = 0,
326 .C = { 326 .C = {
327 0x98, 0xe7, 0x24, 0x7c, 0x07, 0xf0, 0xfe, 0x41, 327 0x98, 0xe7, 0x24, 0x7c, 0x07, 0xf0, 0xfe, 0x41,
@@ -357,7 +357,7 @@ struct gcm128_test gcm128_tests[] = {
357 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55, 357 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
358 }, 358 },
359 .P_len = 64, 359 .P_len = 64,
360 .A = {}, 360 .A = {0},
361 .A_len = 0, 361 .A_len = 0,
362 .C = { 362 .C = {
363 0x39, 0x80, 0xca, 0x0b, 0x3c, 0x00, 0xe8, 0x41, 363 0x39, 0x80, 0xca, 0x0b, 0x3c, 0x00, 0xe8, 0x41,
@@ -523,15 +523,15 @@ struct gcm128_test gcm128_tests[] = {
523 }, 523 },
524 { 524 {
525 /* Test Case 13. */ 525 /* Test Case 13. */
526 .K = {}, 526 .K = {0},
527 .K_len = 32, 527 .K_len = 32,
528 .IV = {}, 528 .IV = {0},
529 .IV_len = 12, 529 .IV_len = 12,
530 .P = {}, 530 .P = {0},
531 .P_len = 0, 531 .P_len = 0,
532 .A = {}, 532 .A = {0},
533 .A_len = 0, 533 .A_len = 0,
534 .C = {}, 534 .C = {0},
535 .C_len = 0, 535 .C_len = 0,
536 .T = { 536 .T = {
537 0x53, 0x0f, 0x8a, 0xfb, 0xc7, 0x45, 0x36, 0xb9, 537 0x53, 0x0f, 0x8a, 0xfb, 0xc7, 0x45, 0x36, 0xb9,
@@ -540,13 +540,13 @@ struct gcm128_test gcm128_tests[] = {
540 }, 540 },
541 { 541 {
542 /* Test Case 14. */ 542 /* Test Case 14. */
543 .K = {}, 543 .K = {0},
544 .K_len = 32, 544 .K_len = 32,
545 .IV = {}, 545 .IV = {0},
546 .IV_len = 12, 546 .IV_len = 12,
547 .P = {}, 547 .P = {0},
548 .P_len = 16, 548 .P_len = 16,
549 .A = {}, 549 .A = {0},
550 .A_len = 0, 550 .A_len = 0,
551 .C = { 551 .C = {
552 0xce, 0xa7, 0x40, 0x3d, 0x4d, 0x60, 0x6b, 0x6e, 552 0xce, 0xa7, 0x40, 0x3d, 0x4d, 0x60, 0x6b, 0x6e,
@@ -583,7 +583,7 @@ struct gcm128_test gcm128_tests[] = {
583 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55, 583 0xba, 0x63, 0x7b, 0x39, 0x1a, 0xaf, 0xd2, 0x55,
584 }, 584 },
585 .P_len = 64, 585 .P_len = 64,
586 .A = {}, 586 .A = {0},
587 .A_len = 0, 587 .A_len = 0,
588 .C = { 588 .C = {
589 0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07, 589 0x52, 0x2d, 0xc1, 0xf0, 0x99, 0x56, 0x7d, 0x07,
@@ -752,11 +752,11 @@ struct gcm128_test gcm128_tests[] = {
752 }, 752 },
753 { 753 {
754 /* Test Case 19. */ 754 /* Test Case 19. */
755 .K = {}, 755 .K = {0},
756 .K_len = 16, 756 .K_len = 16,
757 .IV = {}, 757 .IV = {0},
758 .IV_len = 12, 758 .IV_len = 12,
759 .P = {}, 759 .P = {0},
760 .P_len = 0, 760 .P_len = 0,
761 .A = { 761 .A = {
762 0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5, 762 0xd9, 0x31, 0x32, 0x25, 0xf8, 0x84, 0x06, 0xe5,
@@ -777,7 +777,7 @@ struct gcm128_test gcm128_tests[] = {
777 0xbc, 0xc9, 0xf6, 0x62, 0x89, 0x80, 0x15, 0xad, 777 0xbc, 0xc9, 0xf6, 0x62, 0x89, 0x80, 0x15, 0xad,
778 }, 778 },
779 .A_len = 128, 779 .A_len = 128,
780 .C = {}, 780 .C = {0},
781 .C_len = 0, 781 .C_len = 0,
782 .T = { 782 .T = {
783 0x5f, 0xea, 0x79, 0x3a, 0x2d, 0x6f, 0x97, 0x4d, 783 0x5f, 0xea, 0x79, 0x3a, 0x2d, 0x6f, 0x97, 0x4d,
@@ -786,7 +786,7 @@ struct gcm128_test gcm128_tests[] = {
786 }, 786 },
787 { 787 {
788 /* Test Case 20. */ 788 /* Test Case 20. */
789 .K = {}, 789 .K = {0},
790 .K_len = 16, 790 .K_len = 16,
791 .IV = { 791 .IV = {
792 /* This results in 0xff in counter LSB. */ 792 /* This results in 0xff in counter LSB. */
@@ -800,9 +800,9 @@ struct gcm128_test gcm128_tests[] = {
800 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 800 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
801 }, 801 },
802 .IV_len = 64, 802 .IV_len = 64,
803 .P = {}, 803 .P = {0},
804 .P_len = 288, 804 .P_len = 288,
805 .A = {}, 805 .A = {0},
806 .A_len = 0, 806 .A_len = 0,
807 .C = { 807 .C = {
808 0x56, 0xb3, 0x37, 0x3c, 0xa9, 0xef, 0x6e, 0x4a, 808 0x56, 0xb3, 0x37, 0x3c, 0xa9, 0xef, 0x6e, 0x4a,