Skip to content

Commit 32c027b

Browse files
myankelevmyankelev
committed
cleanup and added id to tests
1 parent 77c141d commit 32c027b

File tree

5 files changed

+46
-46
lines changed

5 files changed

+46
-46
lines changed

‎test/jdk/sun/security/pkcs11/Cipher/TestChaChaPolyKAT.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
* @bug 8255410
2727
* @library /test/lib ..
2828
* @modules jdk.crypto.cryptoki
29-
* @build jdk.test.lib.Convert
3029
* @run main/othervm TestChaChaPolyKAT
3130
* @summary ChaCha20-Poly1305 Cipher Implementation (KAT)
3231
*/

‎test/jdk/sun/security/pkcs11/Cipher/TestCipherMode.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* @test
25+
* @test id=AES-ECB
2626
* @bug 8265500
2727
* @summary
2828
* @library /test/lib ..
@@ -31,7 +31,7 @@
3131
*/
3232

3333
/*
34-
* @test
34+
* @test id=AES-GCM
3535
* @bug 8265500
3636
* @summary
3737
* @library /test/lib ..
@@ -40,7 +40,7 @@
4040
*/
4141

4242
/*
43-
* @test
43+
* @test id=RSA-ECB
4444
* @bug 8265500
4545
* @summary
4646
* @library /test/lib ..

‎test/jdk/sun/security/pkcs11/Cipher/TestPKCS5PaddingError.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,14 @@ private static class CI { // class for holding Cipher Information
5252
}
5353

5454
private static final CI[] TEST_LIST = {
55-
// algorithms which use the native padding impl
56-
new CI("DES/CBC/PKCS5Padding", "DES"),
57-
new CI("DESede/CBC/PKCS5Padding", "DESede"),
58-
new CI("AES/CBC/PKCS5Padding", "AES"),
59-
// algorithms which use SunPKCS11's own padding impl
60-
new CI("DES/ECB/PKCS5Padding", "DES"),
61-
new CI("DESede/ECB/PKCS5Padding", "DESede"),
62-
new CI("AES/ECB/PKCS5Padding", "AES"),
55+
// algorithms which use the native padding impl
56+
new CI("DES/CBC/PKCS5Padding", "DES"),
57+
new CI("DESede/CBC/PKCS5Padding", "DESede"),
58+
new CI("AES/CBC/PKCS5Padding", "AES"),
59+
// algorithms which use SunPKCS11's own padding impl
60+
new CI("DES/ECB/PKCS5Padding", "DES"),
61+
new CI("DESede/ECB/PKCS5Padding", "DESede"),
62+
new CI("AES/ECB/PKCS5Padding", "AES"),
6363
};
6464

6565
private static StringBuffer debugBuf = new StringBuffer();
@@ -113,7 +113,7 @@ public void main(Provider p) throws Exception {
113113
System.out.println("DONE");
114114
} catch (NoSuchAlgorithmException nsae) {
115115
System.out.println("Skipping unsupported algorithm: " +
116-
nsae);
116+
nsae);
117117
}
118118
}
119119
} catch (Exception ex) {

‎test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphers.java‎

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@
2222
*/
2323

2424
/*
25-
* @test
25+
* @test id=ARCFOUR-ARCFOUR-400
2626
* @bug 4898461 6604496 8330842
2727
* @summary basic test for symmetric ciphers with padding
2828
* @author Valerie Peng
2929
* @library /test/lib ..
3030
* @key randomness
3131
* @modules jdk.crypto.cryptoki
3232
* @run main/othervm TestSymmCiphers ARCFOUR ARCFOUR 400
33-
*/
33+
*/
3434

3535
/*
36-
* @test
36+
* @test id=RC4-RC4-401
3737
* @bug 4898461 6604496 8330842
3838
* @summary basic test for symmetric ciphers with padding
3939
* @author Valerie Peng
@@ -44,7 +44,7 @@
4444
*/
4545

4646
/*
47-
* @test
47+
* @test id=DES-CBC-NOPADDING-DES-400
4848
* @bug 4898461 6604496 8330842
4949
* @summary basic test for symmetric ciphers with padding
5050
* @author Valerie Peng
@@ -55,7 +55,7 @@
5555
*/
5656

5757
/*
58-
* @test
58+
* @test id=DESEDE-CBC-NOPADDING-DESEDE-160
5959
* @bug 4898461 6604496 8330842
6060
* @summary basic test for symmetric ciphers with padding
6161
* @author Valerie Peng
@@ -66,7 +66,7 @@
6666
*/
6767

6868
/*
69-
* @test
69+
* @test id=AES-CBC-NOPADDING-AES-4800
7070
* @bug 4898461 6604496 8330842
7171
* @summary basic test for symmetric ciphers with padding
7272
* @author Valerie Peng
@@ -77,7 +77,7 @@
7777
*/
7878

7979
/*
80-
* @test
80+
* @test id=BLOWFISH-CBC-NOPADDING-BLOWFISH-24
8181
* @bug 4898461 6604496 8330842
8282
* @summary basic test for symmetric ciphers with padding
8383
* @author Valerie Peng
@@ -88,7 +88,7 @@
8888
*/
8989

9090
/*
91-
* @test
91+
* @test id=DES-CBC-PKCS5PADDING-DES-6401
9292
* @bug 4898461 6604496 8330842
9393
* @summary basic test for symmetric ciphers with padding
9494
* @author Valerie Peng
@@ -99,7 +99,7 @@
9999
*/
100100

101101
/*
102-
* @test
102+
* @test id=DESEDE-CBC-PKCS5PADDING-DESEDE-402
103103
* @bug 4898461 6604496 8330842
104104
* @summary basic test for symmetric ciphers with padding
105105
* @author Valerie Peng
@@ -110,7 +110,7 @@
110110
*/
111111

112112
/*
113-
* @test
113+
* @test id=AES-CBC-PKCS5PADDING-AES-30
114114
* @bug 4898461 6604496 8330842
115115
* @summary basic test for symmetric ciphers with padding
116116
* @author Valerie Peng
@@ -121,7 +121,7 @@
121121
*/
122122

123123
/*
124-
* @test
124+
* @test id=BLOWFISH-CBC-PKCS5PADDING-BLOWFISH-19
125125
* @bug 4898461 6604496 8330842
126126
* @summary basic test for symmetric ciphers with padding
127127
* @author Valerie Peng
@@ -132,7 +132,7 @@
132132
*/
133133

134134
/*
135-
* @test
135+
* @test id=DES-ECB-NOPADDING-DES-400
136136
* @bug 4898461 6604496 8330842
137137
* @summary basic test for symmetric ciphers with padding
138138
* @author Valerie Peng
@@ -143,7 +143,7 @@
143143
*/
144144

145145
/*
146-
* @test
146+
* @test id=DESEDE-ECB-NOPADDING-DESEDE-160
147147
* @bug 4898461 6604496 8330842
148148
* @summary basic test for symmetric ciphers with padding
149149
* @author Valerie Peng
@@ -154,7 +154,7 @@
154154
*/
155155

156156
/*
157-
* @test
157+
* @test id=AES-ECB-NOPADDING-AES-4800
158158
* @bug 4898461 6604496 8330842
159159
* @summary basic test for symmetric ciphers with padding
160160
* @author Valerie Peng
@@ -165,7 +165,7 @@
165165
*/
166166

167167
/*
168-
* @test
168+
* @test id=DES-ECB-PKCS5PADDING-DES-32
169169
* @bug 4898461 6604496 8330842
170170
* @summary basic test for symmetric ciphers with padding
171171
* @author Valerie Peng
@@ -176,7 +176,7 @@
176176
*/
177177

178178
/*
179-
* @test
179+
* @test id=DES-ECB-PKCS5PADDING-DES-6400
180180
* @bug 4898461 6604496 8330842
181181
* @summary basic test for symmetric ciphers with padding
182182
* @author Valerie Peng
@@ -187,7 +187,7 @@
187187
*/
188188

189189
/*
190-
* @test
190+
* @test id=DESEDE-ECB-PKCS5PADDING-DESEDE-400
191191
* @bug 4898461 6604496 8330842
192192
* @summary basic test for symmetric ciphers with padding
193193
* @author Valerie Peng
@@ -198,7 +198,7 @@
198198
*/
199199

200200
/*
201-
* @test
201+
* @test id=AES-ECB-PKCS5PADDING-AES-64
202202
* @bug 4898461 6604496 8330842
203203
* @summary basic test for symmetric ciphers with padding
204204
* @author Valerie Peng
@@ -209,7 +209,7 @@
209209
*/
210210

211211
/*
212-
* @test
212+
* @test id=DES-DES-6400
213213
* @bug 4898461 6604496 8330842
214214
* @summary basic test for symmetric ciphers with padding
215215
* @author Valerie Peng
@@ -218,8 +218,9 @@
218218
* @modules jdk.crypto.cryptoki
219219
* @run main/othervm TestSymmCiphers DES DES 6400
220220
*/
221+
221222
/*
222-
* @test
223+
* @test id=DESEDE-DESEDE-408
223224
* @bug 4898461 6604496 8330842
224225
* @summary basic test for symmetric ciphers with padding
225226
* @author Valerie Peng
@@ -230,7 +231,7 @@
230231
*/
231232

232233
/*
233-
* @test
234+
* @test id=AES-AES-128
234235
* @bug 4898461 6604496 8330842
235236
* @summary basic test for symmetric ciphers with padding
236237
* @author Valerie Peng
@@ -241,7 +242,7 @@
241242
*/
242243

243244
/*
244-
* @test
245+
* @test id=AES-CTR-NOPADDING-AES-3200
245246
* @bug 4898461 6604496 8330842
246247
* @summary basic test for symmetric ciphers with padding
247248
* @author Valerie Peng
@@ -252,7 +253,7 @@
252253
*/
253254

254255
/*
255-
* @test
256+
* @test id=AES-CTS-NOPADDING-AES-3200
256257
* @bug 4898461 6604496 8330842
257258
* @summary basic test for symmetric ciphers with padding
258259
* @author Valerie Peng

‎test/jdk/sun/security/pkcs11/Cipher/TestSymmCiphersNoPad.java‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
*/
2323

2424
/*
25-
* @test
25+
* @test id=ARCFOUR-ARCFOUR-400
2626
* @bug 4898484 6604496 8001284 8330842
2727
* @summary basic test for symmetric ciphers with no padding
2828
* @author Valerie Peng
@@ -33,7 +33,7 @@
3333
*/
3434

3535
/*
36-
* @test
36+
* @test id=RC4-RC4-401
3737
* @bug 4898484 6604496 8001284 8330842
3838
* @summary basic test for symmetric ciphers with no padding
3939
* @author Valerie Peng
@@ -44,7 +44,7 @@
4444
*/
4545

4646
/*
47-
* @test
47+
* @test id=DES-CBC-NOPADDING-DES-400
4848
* @bug 4898484 6604496 8001284 8330842
4949
* @summary basic test for symmetric ciphers with no padding
5050
* @author Valerie Peng
@@ -55,7 +55,7 @@
5555
*/
5656

5757
/*
58-
* @test
58+
* @test id=DESEDE-CBC-NOPADDING-DESEDE-160
5959
* @bug 4898484 6604496 8001284 8330842
6060
* @summary basic test for symmetric ciphers with no padding
6161
* @author Valerie Peng
@@ -66,7 +66,7 @@
6666
*/
6767

6868
/*
69-
* @test
69+
* @test id=AES-CBC-NOPADDING-AES-4800
7070
* @bug 4898484 6604496 8001284 8330842
7171
* @summary basic test for symmetric ciphers with no padding
7272
* @author Valerie Peng
@@ -77,7 +77,7 @@
7777
*/
7878

7979
/*
80-
* @test
80+
* @test id=BLOWFISH-CBC-NOPADDING-BLOWFISH-24
8181
* @bug 4898484 6604496 8001284 8330842
8282
* @summary basic test for symmetric ciphers with no padding
8383
* @author Valerie Peng
@@ -88,7 +88,7 @@
8888
*/
8989

9090
/*
91-
* @test
91+
* @test id=AES-CTR-NOPADDING-AES-1600
9292
* @bug 4898484 6604496 8001284 8330842
9393
* @summary basic test for symmetric ciphers with no padding
9494
* @author Valerie Peng
@@ -99,7 +99,7 @@
9999
*/
100100

101101
/*
102-
* @test
102+
* @test id=AES-CTR-NOPADDING-AES-65
103103
* @bug 4898484 6604496 8001284 8330842
104104
* @summary basic test for symmetric ciphers with no padding
105105
* @author Valerie Peng
@@ -110,7 +110,7 @@
110110
*/
111111

112112
/*
113-
* @test
113+
* @test id=AES-CTS-NOPADDING-AES-1600
114114
* @bug 4898484 6604496 8001284 8330842
115115
* @summary basic test for symmetric ciphers with no padding
116116
* @author Valerie Peng
@@ -121,7 +121,7 @@
121121
*/
122122

123123
/*
124-
* @test
124+
* @test id=AES-CTS-NOPADDING-AES-65
125125
* @bug 4898484 6604496 8001284 8330842
126126
* @summary basic test for symmetric ciphers with no padding
127127
* @author Valerie Peng

0 commit comments

Comments
 (0)