Skip to content

Commit 8e539b5

Browse files
mwcwmwcw
committed
Reduce extent of block cipher agreement test here testing is done over a range.
1 parent 637c882 commit 8e539b5

File tree

4 files changed

+261
-261
lines changed

4 files changed

+261
-261
lines changed

‎jostle/src/test/java/org/openssl/jostle/test/crypto/AESAgreementTest.java‎

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -623,96 +623,96 @@ public void testAes() throws Exception
623623
// The doFinal that returns a byte[]
624624
//
625625

626-
exercise_simpleDoFinal("AES/ECB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, -1);
627-
exercise_simpleDoFinal("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, -1);
628-
629-
exercise_simpleDoFinal("AES/CBC/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, 16);
630-
exercise_simpleDoFinal("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, 16);
631-
exercise_simpleDoFinal("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
632-
exercise_simpleDoFinal("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
633-
exercise_simpleDoFinal("AES/OFB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 1, 16);
634-
635-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 8);
636-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 9);
637-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 10);
638-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 11);
639-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 12);
640-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 13);
641-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 14);
642-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 15);
643-
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
626+
exercise_simpleDoFinal("AES/ECB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, -1);
627+
exercise_simpleDoFinal("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, -1);
628+
629+
exercise_simpleDoFinal("AES/CBC/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, 16);
630+
exercise_simpleDoFinal("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, 16);
631+
exercise_simpleDoFinal("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
632+
exercise_simpleDoFinal("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
633+
exercise_simpleDoFinal("AES/OFB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 1, 16);
634+
635+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 8);
636+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 9);
637+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 10);
638+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 11);
639+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 12);
640+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 13);
641+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 14);
642+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 15);
643+
exercise_simpleDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
644644

645645

646646
//
647647
// Complex doFinal, that takes input and output arrays.
648648
//
649649

650650

651-
exercise_complexDoFinal("AES/ECB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, -1);
652-
exercise_complexDoFinal("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, -1);
651+
exercise_complexDoFinal("AES/ECB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, -1);
652+
exercise_complexDoFinal("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, -1);
653653

654-
exercise_complexDoFinal("AES/CBC/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, 16);
655-
exercise_complexDoFinal("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, 16);
656-
exercise_complexDoFinal("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
657-
exercise_complexDoFinal("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
658-
exercise_complexDoFinal("AES/OFB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 1, 16);
654+
exercise_complexDoFinal("AES/CBC/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, 16);
655+
exercise_complexDoFinal("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, 16);
656+
exercise_complexDoFinal("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
657+
exercise_complexDoFinal("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
658+
exercise_complexDoFinal("AES/OFB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 1, 16);
659659

660-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 8);
661-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 9);
662-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 10);
663-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 11);
664-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 12);
665-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 13);
666-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 14);
667-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 15);
668-
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
660+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 8);
661+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 9);
662+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 10);
663+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 11);
664+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 12);
665+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 13);
666+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 14);
667+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 15);
668+
exercise_complexDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
669669

670670

671671
//
672672
// Spread message between update and doFinal calls.
673673
//
674-
exercise_complexUpdateDoFinal("AES/ECB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, -1);
675-
exercise_complexUpdateDoFinal("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, -1);
676-
677-
exercise_complexUpdateDoFinal("AES/CBC/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, 16);
678-
exercise_complexUpdateDoFinal("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, 16);
679-
exercise_complexUpdateDoFinal("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
680-
exercise_complexUpdateDoFinal("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
681-
exercise_complexUpdateDoFinal("AES/OFB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 1, 16);
682-
683-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 8);
684-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 9);
685-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 10);
686-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 11);
687-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 12);
688-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 13);
689-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 14);
690-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 15);
691-
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
674+
exercise_complexUpdateDoFinal("AES/ECB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, -1);
675+
exercise_complexUpdateDoFinal("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, -1);
676+
677+
exercise_complexUpdateDoFinal("AES/CBC/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, 16);
678+
exercise_complexUpdateDoFinal("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, 16);
679+
exercise_complexUpdateDoFinal("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
680+
exercise_complexUpdateDoFinal("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
681+
exercise_complexUpdateDoFinal("AES/OFB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 1, 16);
682+
683+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 8);
684+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 9);
685+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 10);
686+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 11);
687+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 12);
688+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 13);
689+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 14);
690+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 15);
691+
exercise_complexUpdateDoFinal("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
692692

693693

694694
//
695695
// Where input and output array is the same.
696696
//
697697

698698
exercise_complexDoFinalSameArray("AES/ECB/NoPadding", new int[]{16, 24, 32}, 16 * 17, 16, -1);
699-
exercise_complexDoFinalSameArray("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, -1);
699+
exercise_complexDoFinalSameArray("AES/ECB/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, -1);
700700

701-
exercise_complexDoFinalSameArray("AES/CBC/NoPadding", new int[]{16, 24, 32}, 17 * 16, 16, 16);
702-
exercise_complexDoFinalSameArray("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (17 * 16) + 1, 1, 16);
703-
exercise_complexDoFinalSameArray("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
704-
exercise_complexDoFinalSameArray("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
705-
exercise_complexDoFinalSameArray("AES/OFB/NoPadding", new int[]{16, 24, 32}, 17 * 16, 1, 16);
701+
exercise_complexDoFinalSameArray("AES/CBC/NoPadding", new int[]{16, 24, 32}, 5 * 16, 16, 16);
702+
exercise_complexDoFinalSameArray("AES/CBC/PKCS7Padding", new int[]{16, 24, 32}, (5 * 16) + 1, 1, 16);
703+
exercise_complexDoFinalSameArray("AES/CFB128/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
704+
exercise_complexDoFinalSameArray("AES/CFB8/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
705+
exercise_complexDoFinalSameArray("AES/OFB/NoPadding", new int[]{16, 24, 32}, 5 * 16, 1, 16);
706706

707-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 8);
708-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 9);
709-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 10);
710-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 11);
711-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 12);
712-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 13);
713-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 14);
714-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 15);
715-
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 17 * 16 + 1, 1, 16);
707+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 8);
708+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 9);
709+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 10);
710+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 11);
711+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 12);
712+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 13);
713+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 14);
714+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 15);
715+
exercise_complexDoFinalSameArray("AES/CTR/NoPadding", new int[]{16, 24, 32}, 5 * 16 + 1, 1, 16);
716716

717717

718718
}
@@ -1046,7 +1046,7 @@ public void aesGCMWithTagLen() throws Exception
10461046
for (int tagLen = 64; tagLen < 128; tagLen += 8)
10471047
{
10481048

1049-
for (int mlen = 0; mlen < 1 + 17 * 16; )
1049+
for (int mlen = 0; mlen < 1 + 5 * 16; )
10501050
{
10511051

10521052
byte[] key = new byte[32];

0 commit comments

Comments
 (0)