Skip to content

Commit 54850f9

Browse files
OracleLabsAutomationOracleLabsAutomation
committed
Merge tag 'jdk-22+33' into labsjdk/automation-1-25-2024-7092
Added tag jdk-22+33 for changeset 23301d5
2 parents a381e85 + 23301d5 commit 54850f9

File tree

22 files changed

+156
-63
lines changed

22 files changed

+156
-63
lines changed

‎src/hotspot/share/classfile/loaderConstraints.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -387,7 +387,7 @@ bool LoaderConstraintTable::add_entry(Symbol* class_name,
387387
} else if (pp1 == nullptr) {
388388
pp2->extend_loader_constraint(class_name, loader1, klass);
389389
} else if (pp2 == nullptr) {
390-
pp1->extend_loader_constraint(class_name, loader1, klass);
390+
pp1->extend_loader_constraint(class_name, loader2, klass);
391391
} else {
392392
merge_loader_constraints(class_name, pp1, pp2, klass);
393393
}

‎src/hotspot/share/runtime/continuationFreezeThaw.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2181,7 +2181,7 @@ void ThawBase::clear_bitmap_bits(address start, address end) {
21812181
log_develop_trace(continuations)("clearing bitmap for " INTPTR_FORMAT " - " INTPTR_FORMAT, p2i(start), p2i(effective_end));
21822182
stackChunkOop chunk = _cont.tail();
21832183
chunk->bitmap().clear_range(chunk->bit_index_for(start), chunk->bit_index_for(effective_end));
2184-
assert(chunk->bitmap().count_one_bits(chunk->bit_index_for(effective_end), chunk->bit_index_for(end)) == 0, "bits should not be set");
2184+
assert(effective_end == end || !chunk->bitmap().at(chunk->bit_index_for(effective_end)), "bit should not be set");
21852185
}
21862186

21872187
NOINLINE void ThawBase::recurse_thaw_interpreted_frame(const frame& hf, frame& caller, int num_frames) {

‎test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaMethod.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -41,7 +41,7 @@
4141
* java.base/jdk.internal.misc
4242
* java.base/jdk.internal.vm
4343
* java.base/sun.reflect.annotation
44-
* @run junit/othervm -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaMethod
44+
* @run junit/othervm/timeout=240 -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:-UseJVMCICompiler jdk.vm.ci.runtime.test.TestResolvedJavaMethod
4545
*/
4646

4747
package jdk.vm.ci.runtime.test;

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load002/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
4747
* /test/lib
4848
* @comment generate and compile LoadableClassXXX classes
4949
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
50-
* @run main/othervm
50+
* @run main/othervm/timeout=180
5151
* -XX:-UseGCOverheadLimit
5252
* nsk.monitoring.stress.classload.load001
5353
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load003/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
4747
* /test/lib
4848
* @comment generate and compile LoadableClassXXX classes
4949
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
50-
* @run main/othervm
50+
* @run main/othervm/timeout=180
5151
* -XX:-UseGCOverheadLimit
5252
* nsk.monitoring.stress.classload.load001
5353
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load007/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
4747
* /test/lib
4848
* @comment generate and compile LoadableClassXXX classes
4949
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
50-
* @run main/othervm/timeout=180
50+
* @run main/othervm/timeout=360
5151
* -XX:-UseGCOverheadLimit
5252
* nsk.monitoring.stress.classload.load001
5353
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load008/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
4545
* /test/lib
4646
* @comment generate and compile LoadableClassXXX classes
4747
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
48-
* @run main/othervm/timeout=180
48+
* @run main/othervm/timeout=420
4949
* -XX:-UseGCOverheadLimit
5050
* nsk.monitoring.stress.classload.load001
5151
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load009/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
4545
* /test/lib
4646
* @comment generate and compile LoadableClassXXX classes
4747
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
48-
* @run main/othervm/timeout=180
48+
* @run main/othervm/timeout=420
4949
* -XX:-UseGCOverheadLimit
5050
* nsk.monitoring.stress.classload.load001
5151
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load010/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
4747
* /test/lib
4848
* @comment generate and compile LoadableClassXXX classes
4949
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
50-
* @run main/othervm
50+
* @run main/othervm/timeout=300
5151
* -XX:-UseGCOverheadLimit
5252
* nsk.monitoring.stress.classload.load001
5353
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load011/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
4545
* /test/lib
4646
* @comment generate and compile LoadableClassXXX classes
4747
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
48-
* @run main/othervm/timeout=180
48+
* @run main/othervm/timeout=360
4949
* -XX:-UseGCOverheadLimit
5050
* nsk.monitoring.stress.classload.load001
5151
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/load012/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -45,7 +45,7 @@
4545
* /test/lib
4646
* @comment generate and compile LoadableClassXXX classes
4747
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
48-
* @run main/othervm/timeout=180
48+
* @run main/othervm/timeout=300
4949
* -XX:-UseGCOverheadLimit
5050
* nsk.monitoring.stress.classload.load001
5151
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload003/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
4747
* /test/lib
4848
* @comment generate and compile LoadableClassXXX classes
4949
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
50-
* @run main/othervm
50+
* @run main/othervm/timeout=180
5151
* -XX:-UseGCOverheadLimit
5252
* nsk.monitoring.stress.classload.unload001
5353
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload007/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -49,7 +49,7 @@
4949
* /test/lib
5050
* @comment generate and compile LoadableClassXXX classes
5151
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
52-
* @run main/othervm
52+
* @run main/othervm/timeout=180
5353
* -XX:-UseGCOverheadLimit
5454
* nsk.monitoring.stress.classload.unload001
5555
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/classload/unload009/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -47,7 +47,7 @@
4747
* /test/lib
4848
* @comment generate and compile LoadableClassXXX classes
4949
* @run driver nsk.monitoring.stress.classload.GenClassesBuilder
50-
* @run main/othervm
50+
* @run main/othervm/timeout=180
5151
* -XX:-UseGCOverheadLimit
5252
* nsk.monitoring.stress.classload.unload001
5353
* classes

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/cmon001/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -62,6 +62,6 @@
6262
*
6363
* @library /vmTestbase
6464
* /test/lib
65-
* @run main/othervm nsk.monitoring.stress.thread.cmon001 -threadCount=400
65+
* @run main/othervm/timeout=240 nsk.monitoring.stress.thread.cmon001 -threadCount=400
6666
*/
6767

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/cmon002/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -63,6 +63,6 @@
6363
*
6464
* @library /vmTestbase
6565
* /test/lib
66-
* @run main/othervm nsk.monitoring.stress.thread.cmon001 -testMode=server -threadCount=400
66+
* @run main/othervm/timeout=240 nsk.monitoring.stress.thread.cmon001 -testMode=server -threadCount=400
6767
*/
6868

‎test/hotspot/jtreg/vmTestbase/nsk/monitoring/stress/thread/cmon003/TestDescription.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2017, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -63,7 +63,7 @@
6363
*
6464
* @library /vmTestbase
6565
* /test/lib
66-
* @run main/othervm
66+
* @run main/othervm/timeout=240
6767
* nsk.monitoring.stress.thread.cmon001
6868
* -testMode=server
6969
* -MBeanServer=custom

‎test/jdk/com/sun/crypto/provider/Cipher/AEAD/AEADBufferTest.java

Lines changed: 71 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -873,6 +873,76 @@ static void initTest() {
873873
"3c819d9a9bed087615030b65",
874874
new byte[0], null, null,
875875
"250327c674aaf477aef2675748cf6971"),
876+
// Random test data
877+
new Data(AES, 4, "272f16edb81a7abbea887357a58c1917",
878+
"794ec588176c703d3d2a7a07",
879+
new byte[2075], null,
880+
"15b461672153270e8ba1e6789f7641c5411f3e642abda731b6086f535c216457" +
881+
"e87305bc59a1ff1f7e1e0bbdf302b75549b136606c67d7e5f71277aeca4bc670" +
882+
"07a98f78e0cfa002ed183e62f07893ad31fe67aad1bb37e15b957a14d145f14f" +
883+
"7483d041f2c3612ad5033155984470bdfc64d18df73c2745d92f28461bb09832" +
884+
"33524811321ba87d213692825815dd13f528dba601a3c319cac6be9b48686c23" +
885+
"a0ce23d5062916ea8827bbb243f585e446131489e951354c8ab24661f625c02e" +
886+
"15536c5bb602244e98993ff745f3e523399b2059f0e062d8933fad2366e7e147" +
887+
"510a931282bb0e3f635efe7bf05b1dd715f95f5858261b00735224256b6b3e80" +
888+
"7364cb53ff6d4e88f928cf67ac70da127718a8a35542efbae9dd7567c818a074" +
889+
"9a0c74bd69014639f59768bc55056d1166ea5523e8c66f9d78d980beb8f0d83b" +
890+
"a9e2c5544b94dc3a1a4b6f0f95f897b010150e89ebcacf0daee3c2793d6501a0" +
891+
"b58b411de273dee987e8e8cf8bb29ef2e7f655b46b55fabf64c6a4295e0d080b" +
892+
"6a570ace90eb0fe0f5b5d878bdd90eddaa1150e4d5a6505b350aac814fe99615" +
893+
"317ecd0516a464c7904011ef5922409c0d65b1e43b69d7c3293a8f7d3e9fbee9" +
894+
"eb91ec0007a7d6f72e64deb675d459c5ba07dcfd58d08e6820b100465e6e04f0" +
895+
"663e310584a00d36d23699c1bffc6afa094c75184fc7cde7ad35909c0f49f2f3" +
896+
"fe1e6d745ab628d74ea56b757047de57ce18b4b3c71e8af31a6fac16189cb0a3" +
897+
"a97a1bea447042ce382fcf726560476d759c24d5c735525ea26a332c2094408e" +
898+
"671c7deb81d5505bbfd178f866a6f3a011b3cfdbe089b4957a790688028dfdf7" +
899+
"9a096b3853f9d0d6d3feef230c7f5f46ffbf7486ebdaca5804dc5bf9d202415e" +
900+
"e0d67b365c2f92a17ea740807e4f0b198b42b54f15faa9dff2c7c35d2cf8d72e" +
901+
"b8f8b18875a2e7b5c43d1e0aa5139c461e8153c7f632895aa46ffe2b134e6a0d" +
902+
"dfbf6a336e709adfe951bd52c4dfc7b07a15fb3888fc35b7e758922f87a104c4" +
903+
"563c5c7839cfe5a7edbdb97264a7c4ebc90367b10cbe09dbf2390767ad7afaa8" +
904+
"8fb46b39d3f55f216d2104e5cf040bf3d39b758bea28e2dbce576c808d17a8eb" +
905+
"e2fd183ef42a774e39119dff1f539efeb6ad15d889dfcb0d54d0d4d4cc03c8d9" +
906+
"aa6c9ebd157f5e7170183298d6a30ada8792dcf793d931e2a1eafccbc63c11c0" +
907+
"c5c5ed60837f30017d693ccb294df392a8066a0594a56954aea7b78a16e9a11f" +
908+
"4a8bc2104070a7319f5fab0d2c4ccad8ec5cd8f47c839179bfd54a7bf225d502" +
909+
"cd0a318752fe763e8c09eb88fa57fc5399ad1f797d0595c7b8afdd23f13603e9" +
910+
"6802192bb51433b7723f4e512bd4f799feb94b458e7f9792f5f9bd6733828f70" +
911+
"a6b7ffbbc0bb7575021f081ec2a0d37fecd7cda2daec9a3a9d9dfe1c8034cead" +
912+
"e4b56b581cc82bd5b74b2b30817967d9da33850336f171a4c68e2438e03f4b11" +
913+
"96da92f01b3b7aeab795180ccf40a4b090b1175a1fc0b67c95f93105c3aef00e" +
914+
"13d76cc402539192274fee703730cd0d1c5635257719cc96cacdbad00c6255e2" +
915+
"bd40c775b43ad09599e84f2c3205d75a6661ca3f151183be284b354ce21457d1" +
916+
"3ba65b9b2cdb81874bd14469c2008b3ddec78f7225ecc710cc70de7912ca6a6d" +
917+
"348168322ab59fdafcf5c833bfa0ad4046f4b6da90e9f263db7079af592eda07" +
918+
"5bf16c6b1a8346da9c292a48bf660860a4fc89eaef40bc132779938eca294569" +
919+
"787c740af2b5a8de7f5e10ac750d1e3d0ef3ed168ba408a676e10b8a20bd4be8" +
920+
"3e8336b45e54481726d73e1bd19f165a98e242aca0d8387f2dd22d02d74e23db" +
921+
"4cef9a523587413e0a44d7e3260019a34d3a6b38426ae9fa4655be338d721970" +
922+
"cb9fe76c073f26f9303093a033022cd2c62b2790bce633ba9026a1c93b6535f1" +
923+
"1882bf5880e511b9e1b0b7d8f23a993aae5fd275faac3a5b4ccaf7c06b0b266a" +
924+
"ee970a1e3a4cd7a41094f516960630534e692545b25a347c30e3f328bba4825f" +
925+
"ed754e5525d846131ecba7ca120a6aeabc7bab9f59c890c80b7e31f9bc741591" +
926+
"55d292433ce9558e104102f2cc63ee267c1c8333e841522707ea6d595cb802b9" +
927+
"61697da77bbc4cb404ea62570ab335ebffa2023730732ac5ddba1c3dbb5be408" +
928+
"3c50aea462c1ffa166d7cc3db4b742b747e81b452db2363e91374dee8c6b40f0" +
929+
"e7fbf50e60eaf5cc5649f6bb553aae772c185026ceb052af088c545330a1ffbf" +
930+
"50615b8c7247c6cd386afd7440654f4e15bcfae0c45442ec814fe88433a9d616" +
931+
"ee6cc3f163f0d3d325526d05f25d3b37ad5eeb3ca77248ad86c9042b16c65554" +
932+
"aebb6ad3e17b981492b13f42c5a5dc088e991da303e5a273fdbb8601aece4267" +
933+
"47b01f6cb972e6da1743a0d7866cf206e95f23c6f8e337c901b9cd34a9a1fbbe" +
934+
"1694f2c26b00dfa4d02c0d54540163e798fbdc9c25f30d6406f5b4c13f7ed619" +
935+
"34e350f4059c13aa5e973307a9e3058917cda96fdd082e9c629ccfb2a9f98d12" +
936+
"5c6e4703a7b0f348f5cdeb63cef2133d1c6c1a087591e0a2bca29d09c6565e66" +
937+
"e91042f83b0e74e60a5d57562c23e2fbcd6599c29d7c19e47cf625c2ce24bb8a" +
938+
"13f8e54041498437eec2cedd1e3d8e57a051baa962c0a62d70264d99c5ee716d" +
939+
"5c8b9078db08c8b2c5613f464198a7aff43f76c5b4612b46a4f1cd2a494386c5" +
940+
"7fd28f3d199f0ba8d8e39116cc7db16ce6188205ee49a9dce3d4fa32ea394919" +
941+
"f6e91ef58b84d00b99596b4306c2d9f432d917bb4ac73384c42ae12adb4920d8" +
942+
"c33a816febcb299dcddf3ec7a8eb6e04cdc90891c6e145bd9fc5f41dc4061a46" +
943+
"9feba38545b64ec8203f386ceef52785619e991d274ae80af7e54af535e0b011" +
944+
"5effdf847472992875e09398457604d04e0bb965db692c0cdcf11a",
945+
"687cc09c89298491deb51061d709af"),
876946
// Randomly generated data at the time of execution.
877947
new Data(AES, 5, "11754cd72aec309bf52f7687212e8957",
878948
16, 12345)));

‎test/jdk/com/sun/crypto/provider/Cipher/AEAD/GCMIncrementByte4.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -25,18 +25,18 @@
2525

2626
/*
2727
* @test
28-
* @summary Uses GCMBufferTest to run a long test with incrementing through
29-
* each byte in each byte array
28+
* @summary Uses AEADBufferTest to run a long test with incrementing through
29+
* each byte in each byte array using AES GCM
3030
* @run main/manual GCMIncrementByte4
3131
*/
3232

3333
public class GCMIncrementByte4 {
3434

3535
public static void main(String args[]) throws Exception {
36-
GCMBufferTest.initTest();
37-
new GCMBufferTest("AES/GCM/NoPadding",
38-
List.of(GCMBufferTest.dtype.BYTE, GCMBufferTest.dtype.BYTE,
39-
GCMBufferTest.dtype.BYTE)).incrementalSegments().dataSet(4).
36+
AEADBufferTest.initTest();
37+
new AEADBufferTest("AES/GCM/NoPadding",
38+
List.of(AEADBufferTest.dtype.BYTE, AEADBufferTest.dtype.BYTE,
39+
AEADBufferTest.dtype.BYTE)).incrementalSegments().dataSet(4).
4040
test();
4141

4242
}

0 commit comments

Comments
 (0)