Skip to content

Commit e559962

Browse files
GoeLinGoeLin
committed
8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree
Reviewed-by: rschmelter Backport-of: fdd0cb550e4345d93c5436404e0a798563d623f1
1 parent 9abc9ce commit e559962

39 files changed

+111
-110
lines changed

‎test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Default.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2001, 2025, 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
@@ -23,7 +23,7 @@
2323

2424
/*
2525
* @test
26-
* @library /test/lib /java/security/testlibrary
26+
* @library /test/lib
2727
* @bug 4470717
2828
* @summary fix default handling and other misc
2929
* @run main/othervm Default
@@ -34,6 +34,7 @@
3434

3535
import javax.security.auth.callback.*;
3636
import java.io.*;
37+
import jdk.test.lib.security.HumanInputStream;
3738

3839
public class Default {
3940
public static void main(String args[]) throws Exception {

‎test/jdk/java/security/KeyFactory/Failover.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -24,16 +24,16 @@
2424
/**
2525
* @test
2626
* @bug 4894125 7054918 8130181
27-
* @library ../testlibrary /test/lib
27+
* @library /test/lib
2828
* @summary test that failover for KeyFactory works
2929
* @author Andreas Sterbenz
3030
*/
3131

3232
import java.util.*;
3333

3434
import java.security.*;
35-
import java.security.interfaces.*;
3635
import java.security.spec.*;
36+
import jdk.test.lib.security.ProvidersSnapshot;
3737
import jdk.test.lib.security.SecurityUtils;
3838

3939
public class Failover {

‎test/jdk/java/security/KeyPairGenerator/Failover.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -24,16 +24,16 @@
2424
/**
2525
* @test
2626
* @bug 4894125 7054918 8130181
27-
* @library ../testlibrary
27+
* @library /test/lib
2828
* @summary test that failover for KeyPairGenerator works
2929
* @author Andreas Sterbenz
3030
*/
3131

3232
import java.util.*;
3333

3434
import java.security.*;
35-
import java.security.interfaces.*;
3635
import java.security.spec.*;
36+
import jdk.test.lib.security.ProvidersSnapshot;
3737

3838
public class Failover {
3939

‎test/jdk/java/security/Provider/ChangeProviders.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -24,14 +24,13 @@
2424
/*
2525
* @test
2626
* @bug 4856968 7054918 8130181
27-
* @library ../testlibrary
27+
* @library /test/lib
2828
* @summary make sure add/insert/removeProvider() work correctly
2929
* @author Andreas Sterbenz
3030
*/
3131

32-
import java.util.*;
33-
3432
import java.security.*;
33+
import jdk.test.lib.security.ProvidersSnapshot;
3534

3635
public class ChangeProviders extends Provider {
3736

‎test/jdk/java/security/Provider/GetInstance.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -24,7 +24,7 @@
2424
/*
2525
* @test
2626
* @bug 4856968 7054918 8130181
27-
* @library ../testlibrary
27+
* @library /test/lib
2828
* @summary make sure getInstance() works correctly, including failover
2929
* and delayed provider selection for Signatures
3030
* @author Andreas Sterbenz
@@ -34,6 +34,7 @@
3434

3535
import java.security.*;
3636
import java.security.cert.*;
37+
import jdk.test.lib.security.ProvidersSnapshot;
3738

3839
public class GetInstance {
3940

‎test/jdk/java/security/Provider/GetServiceRace.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2019, 2025, 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
@@ -24,7 +24,6 @@
2424
/*
2525
* @test
2626
* @bug 8231387
27-
* @library ../testlibrary
2827
* @summary make sure getService() avoids a race
2928
* @author Tianmin Shi
3029
*/

‎test/jdk/java/security/Provider/RemoveProvider.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1998, 2025, 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
@@ -24,13 +24,14 @@
2424
/*
2525
* @test
2626
* @bug 4190873 7054918 8130181
27-
* @library ../testlibrary
27+
* @library /test/lib
2828
* @summary Make sure provider instance can be removed from list of registered
2929
* providers, and "entrySet", "keySet", and "values" methods don't loop
3030
* indefinitely.
3131
*/
3232
import java.security.*;
3333
import java.util.*;
34+
import jdk.test.lib.security.ProvidersSnapshot;
3435

3536
public class RemoveProvider {
3637

‎test/jdk/java/security/Security/NoInstalledProviders.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2025, 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
@@ -24,12 +24,13 @@
2424
/*
2525
* @test
2626
* @bug 4273454 7054918 7052537
27-
* @library ../testlibrary
27+
* @library /test/lib
2828
* @summary Make sure getProviders(filter) doesn't throw NPE
2929
* @run main/othervm NoInstalledProviders
3030
*/
3131

3232
import java.security.*;
33+
import jdk.test.lib.security.ProvidersSnapshot;
3334

3435
public class NoInstalledProviders {
3536

‎test/jdk/java/security/Security/SynchronizedAccess.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 1999, 2025, 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
@@ -24,13 +24,14 @@
2424
/*
2525
* @test
2626
* @bug 4162583 7054918 8130181 8028127
27-
* @library /test/lib ../testlibrary
27+
* @library /test/lib
2828
* @summary Make sure Provider api implementations are synchronized properly
2929
*/
3030

3131
import java.security.*;
3232

3333
import jdk.test.lib.Asserts;
34+
import jdk.test.lib.security.ProvidersSnapshot;
3435

3536
public class SynchronizedAccess {
3637

‎test/jdk/java/security/Security/removing/RemoveProviders.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -24,14 +24,15 @@
2424
/**
2525
* @test
2626
* @bug 4963416 7054918
27-
* @library ../../testlibrary
27+
* @library /test/lib
2828
* @summary make sure removeProvider() always works correctly
2929
* @author Andreas Sterbenz
3030
*/
3131

3232
import java.util.*;
3333

3434
import java.security.*;
35+
import jdk.test.lib.security.ProvidersSnapshot;
3536

3637
public class RemoveProviders {
3738

‎test/jdk/java/security/cert/CertPathValidator/OCSP/GetAndPostTests.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2020, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2020, 2025, 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,8 +25,7 @@
2525
* @test
2626
* @bug 8179503 8328638
2727
* @summary Java should support GET OCSP calls
28-
* @library /javax/net/ssl/templates /java/security/testlibrary
29-
* @build SimpleOCSPServer
28+
* @library /javax/net/ssl/templates /test/lib
3029
* @modules java.base/sun.security.util
3130
* java.base/sun.security.provider.certpath
3231
* java.base/sun.security.x509
@@ -64,7 +63,7 @@
6463
import java.util.Set;
6564
import java.util.concurrent.TimeUnit;
6665

67-
import sun.security.testlibrary.SimpleOCSPServer;
66+
import jdk.test.lib.security.SimpleOCSPServer;
6867
import sun.security.util.DerOutputStream;
6968
import sun.security.util.DerValue;
7069
import sun.security.util.ObjectIdentifier;

‎test/jdk/java/security/cert/CertPathValidator/OCSP/OCSPTimeout.java

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2023, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2023, 2025, 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
@@ -34,8 +34,7 @@
3434
* @modules java.base/sun.security.x509
3535
* java.base/sun.security.provider.certpath
3636
* java.base/sun.security.util
37-
* @library ../../../../../java/security/testlibrary
38-
* @build CertificateBuilder SimpleOCSPServer
37+
* @library /test/lib
3938
* @run main/othervm -Djava.security.debug=certpath OCSPTimeout 1000 true
4039
* @run main/othervm -Djava.security.debug=certpath
4140
* -Dcom.sun.security.ocsp.readtimeout=5 OCSPTimeout 1000 true
@@ -59,8 +58,8 @@
5958
import java.security.cert.*;
6059
import java.util.concurrent.TimeUnit;
6160

62-
import sun.security.testlibrary.SimpleOCSPServer;
63-
import sun.security.testlibrary.CertificateBuilder;
61+
import jdk.test.lib.security.SimpleOCSPServer;
62+
import jdk.test.lib.security.CertificateBuilder;
6463

6564
import static java.security.cert.PKIXRevocationChecker.Option.*;
6665

@@ -84,7 +83,7 @@ public class OCSPTimeout {
8483

8584
public static void main(String[] args) throws Exception {
8685
int ocspTimeout = 15000;
87-
boolean expected = false;
86+
boolean expected;
8887

8988
createPKI();
9089

@@ -195,7 +194,6 @@ private static void createPKI() throws Exception {
195194
rootOcsp = new SimpleOCSPServer(rootKeystore, passwd, ROOT_ALIAS, null);
196195
rootOcsp.enableLog(debug);
197196
rootOcsp.setNextUpdateInterval(3600);
198-
rootOcsp.setDisableContentLength(true);
199197
rootOcsp.start();
200198

201199
// Wait 60 seconds for server ready

‎test/jdk/java/security/cert/CertPathValidator/trustAnchor/ValWithAnchorByName.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@ public class ValWithAnchorByName {
5252

5353
// The following certificates and OCSP responses were captured from
5454
// a test run that used certificates and responses generated by
55-
// sun.security.testlibrary.CertificateBuilder and
56-
// sun.security.testlibrary.SimpleOCSPServer.
55+
// jdk.test.lib.security.CertificateBuilder and
56+
// jdk.test.lib.security.SimpleOCSPServer.
5757

5858
// Subject: CN=SSLCertificate, O=SomeCompany
5959
// Issuer: CN=Intermediate CA Cert, O=SomeCompany

‎test/jdk/javax/crypto/EncryptedPrivateKeyInfo/GetKeySpecException.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2003, 2025, 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
@@ -24,19 +24,20 @@
2424
/**
2525
* @test
2626
* @bug 4508341 7055362
27-
* @library ../../../java/security/testlibrary
27+
* @library /test/lib
2828
* @summary Test the error conditions of
2929
* EncryptedPrivateKeyInfo.getKeySpec(...) methods.
3030
* @author Valerie Peng
3131
* @run main/othervm -DcipherAlg=PBEWithMD5AndDES GetKeySpecException
3232
* @run main/othervm -DcipherAlg=PBEWithSHA1AndDESede GetKeySpecException
3333
*/
34+
3435
import java.security.*;
35-
import java.util.Arrays;
3636
import java.util.Vector;
3737
import java.security.spec.*;
3838
import javax.crypto.*;
3939
import javax.crypto.spec.*;
40+
import jdk.test.lib.security.ProvidersSnapshot;
4041

4142
public class GetKeySpecException {
4243
private static String cipherAlg;

‎test/jdk/javax/crypto/JceSecurity/SunJCE_BC_LoadOrdering.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2006, 2025, 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
@@ -24,7 +24,7 @@
2424
/*
2525
* @test
2626
* @bug 6377058 7055362
27-
* @library ../../../java/security/testlibrary
27+
* @library /test/lib
2828
* @summary SunJCE depends on sun.security.provider.SignatureImpl
2929
* behaviour, BC can't load into 1st slot.
3030
* @author Brad R. Wetmore
@@ -33,7 +33,7 @@
3333

3434
import java.security.*;
3535
import javax.crypto.*;
36-
import java.io.*;
36+
import jdk.test.lib.security.ProvidersSnapshot;
3737

3838
public class SunJCE_BC_LoadOrdering {
3939

‎test/jdk/javax/net/ssl/Stapling/HttpsUrlConnClient.java

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2015, 2023, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2015, 2025, 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
@@ -28,8 +28,7 @@
2828
* @test
2929
* @bug 8046321 8153829
3030
* @summary OCSP Stapling for TLS
31-
* @library ../../../../java/security/testlibrary
32-
* @build CertificateBuilder SimpleOCSPServer
31+
* @library /test/lib
3332
* @run main/othervm HttpsUrlConnClient RSA SHA256withRSA
3433
* @run main/othervm HttpsUrlConnClient RSASSA-PSS RSASSA-PSS
3534
*/
@@ -59,8 +58,8 @@
5958
import java.util.*;
6059
import java.util.concurrent.TimeUnit;
6160

62-
import sun.security.testlibrary.SimpleOCSPServer;
63-
import sun.security.testlibrary.CertificateBuilder;
61+
import jdk.test.lib.security.SimpleOCSPServer;
62+
import jdk.test.lib.security.CertificateBuilder;
6463

6564
public class HttpsUrlConnClient {
6665

0 commit comments

Comments
 (0)