提交 c610241e 编写于 作者: A asaha

8138712: Backout JDK-8030829 and JDK-8136742 from 8u65, and 8u66 release

Summary: Backing out changeset 25108312011d, 372d63c0daaf
Reviewed-by: coffeys
上级 a1fc85e6
...@@ -481,7 +481,7 @@ krb5.kdc.bad.policy = tryLast ...@@ -481,7 +481,7 @@ krb5.kdc.bad.policy = tryLast
# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
# #
# #
jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing # (SSL/TLS) processing
......
...@@ -481,7 +481,7 @@ krb5.kdc.bad.policy = tryLast ...@@ -481,7 +481,7 @@ krb5.kdc.bad.policy = tryLast
# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
# #
# #
jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing # (SSL/TLS) processing
......
...@@ -484,7 +484,7 @@ krb5.kdc.bad.policy = tryLast ...@@ -484,7 +484,7 @@ krb5.kdc.bad.policy = tryLast
# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
# #
# #
jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing # (SSL/TLS) processing
......
...@@ -483,7 +483,7 @@ krb5.kdc.bad.policy = tryLast ...@@ -483,7 +483,7 @@ krb5.kdc.bad.policy = tryLast
# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
# #
# #
jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing # (SSL/TLS) processing
......
...@@ -484,7 +484,7 @@ krb5.kdc.bad.policy = tryLast ...@@ -484,7 +484,7 @@ krb5.kdc.bad.policy = tryLast
# jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048 # jdk.certpath.disabledAlgorithms=MD2, DSA, RSA keySize < 2048
# #
# #
jdk.certpath.disabledAlgorithms=MD2, MD5, RSA keySize < 1024 jdk.certpath.disabledAlgorithms=MD2, RSA keySize < 1024
# Algorithm restrictions for Secure Socket Layer/Transport Layer Security # Algorithm restrictions for Secure Socket Layer/Transport Layer Security
# (SSL/TLS) processing # (SSL/TLS) processing
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,12 +21,6 @@ ...@@ -21,12 +21,6 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* @bug 6852744 * @bug 6852744
...@@ -240,10 +234,6 @@ public final class DisableRevocation { ...@@ -240,10 +234,6 @@ public final class DisableRevocation {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPathBuilder builder = CertPathBuilder.getInstance("PKIX"); CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
X509CertSelector selector = generateSelector(args[0]); X509CertSelector selector = generateSelector(args[0]);
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,12 +21,6 @@ ...@@ -21,12 +21,6 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* @bug 6852744 * @bug 6852744
...@@ -283,10 +277,6 @@ public final class KeyUsageMatters { ...@@ -283,10 +277,6 @@ public final class KeyUsageMatters {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPathBuilder builder = CertPathBuilder.getInstance("PKIX"); CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
X509CertSelector selector = generateSelector(args[0]); X509CertSelector selector = generateSelector(args[0]);
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,12 +21,6 @@ ...@@ -21,12 +21,6 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* @bug 6852744 * @bug 6852744
...@@ -289,10 +283,6 @@ public final class StatusLoopDependency { ...@@ -289,10 +283,6 @@ public final class StatusLoopDependency {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPathBuilder builder = CertPathBuilder.getInstance("PKIX"); CertPathBuilder builder = CertPathBuilder.getInstance("PKIX");
X509CertSelector selector = generateSelector(args[0]); X509CertSelector selector = generateSelector(args[0]);
......
/* /*
* Copyright (c) 2004, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,19 +21,12 @@ ...@@ -21,19 +21,12 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* @bug 5072953 * @bug 5072953
* @summary Verify that the URL for an OCSP responder can be extracted from a * @summary Verify that the URL for an OCSP responder can be extracted from a
* certificate's AuthorityInfoAccess extension when OCSP certifiate * certificate's AuthorityInfoAccess extension when OCSP certifiate
* validation has been enabled. * validation has been enabled.
* @run main/othervm AIACheck
*/ */
import java.io.*; import java.io.*;
...@@ -58,10 +51,6 @@ public class AIACheck { ...@@ -58,10 +51,6 @@ public class AIACheck {
} }
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
X509Certificate aiaCert = loadCertificate("AIACert.pem"); X509Certificate aiaCert = loadCertificate("AIACert.pem");
X509Certificate rootCert = loadCertificate("RootCert.pem"); X509Certificate rootCert = loadCertificate("RootCert.pem");
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,24 +21,16 @@ ...@@ -21,24 +21,16 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* @bug 6383095 * @bug 6383095
* @summary CRL revoked certificate failures masked by OCSP failures * @summary CRL revoked certificate failures masked by OCSP failures
* @run main/othervm FailoverToCRL *
* @author Xuelei Fan
*/
/*
* Note that the certificate validity is from Mar 16 14:55:35 2009 GMT to * Note that the certificate validity is from Mar 16 14:55:35 2009 GMT to
* Dec 1 14:55:35 2028 GMT, please update it with newer certificate if * Dec 1 14:55:35 2028 GMT, please update it with newer certificate if
* expires. * expires.
*
* @author Xuelei Fan
*/ */
/* /*
...@@ -237,10 +229,6 @@ public class FailoverToCRL { ...@@ -237,10 +229,6 @@ public class FailoverToCRL {
} }
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPath path = generateCertificatePath(); CertPath path = generateCertificatePath();
Set<TrustAnchor> anchors = generateTrustAnchors(); Set<TrustAnchor> anchors = generateTrustAnchors();
CertStore crls = generateCertificateStore(); CertStore crls = generateCertificateStore();
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,18 +21,11 @@ ...@@ -21,18 +21,11 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* *
* @bug 6720721 * @bug 6720721
* @summary CRL check with circular depency support needed * @summary CRL check with circular depency support needed
* @run main/othervm CircularCRLOneLevel
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -165,10 +158,6 @@ public class CircularCRLOneLevel { ...@@ -165,10 +158,6 @@ public class CircularCRLOneLevel {
} }
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPath path = generateCertificatePath(); CertPath path = generateCertificatePath();
Set<TrustAnchor> anchors = generateTrustAnchors(); Set<TrustAnchor> anchors = generateTrustAnchors();
CertStore crls = generateCertificateStore(); CertStore crls = generateCertificateStore();
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,18 +21,11 @@ ...@@ -21,18 +21,11 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* *
* @bug 6720721 * @bug 6720721
* @summary CRL check with circular depency support needed * @summary CRL check with circular depency support needed
* @run main/othervm CircularCRLOneLevelRevoked
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -166,10 +159,6 @@ public class CircularCRLOneLevelRevoked { ...@@ -166,10 +159,6 @@ public class CircularCRLOneLevelRevoked {
} }
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPath path = generateCertificatePath(); CertPath path = generateCertificatePath();
Set<TrustAnchor> anchors = generateTrustAnchors(); Set<TrustAnchor> anchors = generateTrustAnchors();
CertStore crls = generateCertificateStore(); CertStore crls = generateCertificateStore();
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,18 +21,11 @@ ...@@ -21,18 +21,11 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* *
* @bug 6720721 * @bug 6720721
* @summary CRL check with circular depency support needed * @summary CRL check with circular depency support needed
* @run main/othervm CircularCRLTwoLevel
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -217,10 +210,6 @@ public class CircularCRLTwoLevel { ...@@ -217,10 +210,6 @@ public class CircularCRLTwoLevel {
} }
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPath path = generateCertificatePath(); CertPath path = generateCertificatePath();
Set<TrustAnchor> anchors = generateTrustAnchors(); Set<TrustAnchor> anchors = generateTrustAnchors();
CertStore crls = generateCertificateStore(); CertStore crls = generateCertificateStore();
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,18 +21,11 @@ ...@@ -21,18 +21,11 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/** /**
* @test * @test
* *
* @bug 6720721 * @bug 6720721
* @summary CRL check with circular depency support needed * @summary CRL check with circular depency support needed
* @run main/othervm CircularCRLTwoLevelRevoked
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -218,10 +211,6 @@ public class CircularCRLTwoLevelRevoked { ...@@ -218,10 +211,6 @@ public class CircularCRLTwoLevelRevoked {
} }
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
CertPath path = generateCertificatePath(); CertPath path = generateCertificatePath();
Set<TrustAnchor> anchors = generateTrustAnchors(); Set<TrustAnchor> anchors = generateTrustAnchors();
CertStore crls = generateCertificateStore(); CertStore crls = generateCertificateStore();
......
/* /*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,23 +21,15 @@ ...@@ -21,23 +21,15 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/* /*
* @test * @test
* @bug 7167988 * @bug 7167988
* @summary PKIX CertPathBuilder in reverse mode doesn't work if more than * @summary PKIX CertPathBuilder in reverse mode doesn't work if more than
* one trust anchor is specified * one trust anchor is specified
* @run main/othervm ReverseBuild
*/ */
import java.io.*; import java.io.*;
import java.util.*; import java.util.*;
import java.security.cert.*; import java.security.cert.*;
import java.security.Security;
import sun.security.provider.certpath.SunCertPathBuilderParameters; import sun.security.provider.certpath.SunCertPathBuilderParameters;
...@@ -287,9 +279,6 @@ public class ReverseBuild { ...@@ -287,9 +279,6 @@ public class ReverseBuild {
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
// generate certificate from cert string // generate certificate from cert string
CertificateFactory cf = CertificateFactory.getInstance("X.509"); CertificateFactory cf = CertificateFactory.getInstance("X.509");
......
/* /*
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,15 +23,13 @@ ...@@ -23,15 +23,13 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 7113275 * @bug 7113275
* @summary compatibility issue with MD2 trust anchor and old X509TrustManager * @summary compatibility issue with MD2 trust anchor and old X509TrustManager
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @run main/othervm MD2InTrustAnchor PKIX TLSv1.1 * @run main/othervm MD2InTrustAnchor PKIX TLSv1.1
* @run main/othervm MD2InTrustAnchor SunX509 TLSv1.1 * @run main/othervm MD2InTrustAnchor SunX509 TLSv1.1
* @run main/othervm MD2InTrustAnchor PKIX TLSv1.2 * @run main/othervm MD2InTrustAnchor PKIX TLSv1.2
...@@ -42,7 +40,6 @@ import java.net.*; ...@@ -42,7 +40,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -286,10 +283,6 @@ public class MD2InTrustAnchor { ...@@ -286,10 +283,6 @@ public class MD2InTrustAnchor {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,15 +23,13 @@ ...@@ -23,15 +23,13 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 7113275 * @bug 7113275
* @summary compatibility issue with MD2 trust anchor and old X509TrustManager * @summary compatibility issue with MD2 trust anchor and old X509TrustManager
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @run main/othervm TrustTrustedCert PKIX TLSv1.1 * @run main/othervm TrustTrustedCert PKIX TLSv1.1
* @run main/othervm TrustTrustedCert SunX509 TLSv1.1 * @run main/othervm TrustTrustedCert SunX509 TLSv1.1
* @run main/othervm TrustTrustedCert PKIX TLSv1.2 * @run main/othervm TrustTrustedCert PKIX TLSv1.2
...@@ -338,10 +336,6 @@ public class TrustTrustedCert { ...@@ -338,10 +336,6 @@ public class TrustTrustedCert {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,18 +21,11 @@ ...@@ -21,18 +21,11 @@
* questions. * questions.
*/ */
//
// Security properties, once set, cannot revert to unset. To avoid
// conflicts with tests running in the same VM isolate this test by
// running it in otherVM mode.
//
/* /*
* @test * @test
* @bug 6302644 * @bug 6302644
* @summary X509KeyManager implementation for NewSunX509 doesn't return most * @summary X509KeyManager implementation for NewSunX509 doesn't return most
* preferable key * preferable key
* @run main/othervm PreferredKey
*/ */
import java.io.*; import java.io.*;
import java.net.*; import java.net.*;
...@@ -56,10 +49,6 @@ public class PreferredKey { ...@@ -56,10 +49,6 @@ public class PreferredKey {
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
KeyStore ks; KeyStore ks;
KeyManagerFactory kmf; KeyManagerFactory kmf;
X509KeyManager km; X509KeyManager km;
......
/* /*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,16 +21,14 @@ ...@@ -21,16 +21,14 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 7166570 * @bug 7166570
* @summary JSSE certificate validation has started to fail for * @summary JSSE certificate validation has started to fail for
* certificate chains * certificate chains
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @run main/othervm BasicConstraints PKIX * @run main/othervm BasicConstraints PKIX
* @run main/othervm BasicConstraints SunX509 * @run main/othervm BasicConstraints SunX509
*/ */
...@@ -39,7 +37,6 @@ import java.net.*; ...@@ -39,7 +37,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.*; import java.security.cert.*;
...@@ -457,10 +454,6 @@ public class BasicConstraints { ...@@ -457,10 +454,6 @@ public class BasicConstraints {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,23 +21,21 @@ ...@@ -21,23 +21,21 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 6916074 * @bug 6916074
* @summary Add support for TLS 1.2 * @summary Add support for TLS 1.2
* @run main/othervm PKIXExtendedTM * @run main/othervm PKIXExtendedTM
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
*/ */
import java.net.*; import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -793,10 +791,6 @@ public class PKIXExtendedTM { ...@@ -793,10 +791,6 @@ public class PKIXExtendedTM {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,17 +21,15 @@ ...@@ -21,17 +21,15 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 6822460 * @bug 6822460
* @summary support self-issued certificate * @summary support self-issued certificate
* @run main/othervm SelfIssuedCert PKIX * @run main/othervm SelfIssuedCert PKIX
* @run main/othervm SelfIssuedCert SunX509 * @run main/othervm SelfIssuedCert SunX509
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -39,7 +37,6 @@ import java.net.*; ...@@ -39,7 +37,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -305,10 +302,6 @@ public class SelfIssuedCert { ...@@ -305,10 +302,6 @@ public class SelfIssuedCert {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,23 +21,20 @@ ...@@ -21,23 +21,20 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 6916074 * @bug 6916074
* @summary Add support for TLS 1.2 * @summary Add support for TLS 1.2
* @run main/othervm SunX509ExtendedTM * @run main/othervm SunX509ExtendedTM
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
*/ */
import java.net.*; import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -795,10 +792,6 @@ public class SunX509ExtendedTM { ...@@ -795,10 +792,6 @@ public class SunX509ExtendedTM {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2001, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2001, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,21 +21,18 @@ ...@@ -21,21 +21,18 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 6668231 * @bug 6668231
* @summary Presence of a critical subjectAltName causes JSSE's SunX509 to * @summary Presence of a critical subjectAltName causes JSSE's SunX509 to
* fail trusted checks * fail trusted checks
* @run main/othervm CriticalSubjectAltName * @run main/othervm CriticalSubjectAltName
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
*
* @author Xuelei Fan * @author Xuelei Fan
*/ *
/*
* This test depends on binary keystore, crisubn.jks and trusted.jks. Because * This test depends on binary keystore, crisubn.jks and trusted.jks. Because
* JAVA keytool cannot generate X509 certificate with SubjectAltName extension, * JAVA keytool cannot generate X509 certificate with SubjectAltName extension,
* the certificates are generated with openssl toolkits and then imported into * the certificates are generated with openssl toolkits and then imported into
...@@ -50,7 +47,6 @@ ...@@ -50,7 +47,6 @@
import java.io.*; import java.io.*;
import java.net.*; import java.net.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.cert.Certificate; import java.security.cert.Certificate;
public class CriticalSubjectAltName implements HostnameVerifier { public class CriticalSubjectAltName implements HostnameVerifier {
...@@ -158,10 +154,6 @@ public class CriticalSubjectAltName implements HostnameVerifier { ...@@ -158,10 +154,6 @@ public class CriticalSubjectAltName implements HostnameVerifier {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
String keyFilename = String keyFilename =
System.getProperty("test.src", "./") + "/" + pathToStores + System.getProperty("test.src", "./") + "/" + pathToStores +
"/" + keyStoreFile; "/" + keyStoreFile;
......
/* /*
* Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -44,7 +44,6 @@ import java.net.*; ...@@ -44,7 +44,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -432,10 +431,6 @@ public class SSLSocketSNISensitive { ...@@ -432,10 +431,6 @@ public class SSLSocketSNISensitive {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -23,16 +23,15 @@ ...@@ -23,16 +23,15 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* /*
* @test * @test
* @bug 4873188 * @bug 4873188
* @summary Support TLS 1.1 * @summary Support TLS 1.1
* @run main/othervm EmptyCertificateAuthorities * @run main/othervm EmptyCertificateAuthorities
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
*
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -229,10 +228,6 @@ public class EmptyCertificateAuthorities { ...@@ -229,10 +228,6 @@ public class EmptyCertificateAuthorities {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String[] args) throws Exception { public static void main(String[] args) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
String keyFilename = String keyFilename =
System.getProperty("test.src", ".") + "/" + pathToStores + System.getProperty("test.src", ".") + "/" + pathToStores +
"/" + keyStoreFile; "/" + keyStoreFile;
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,15 +21,13 @@ ...@@ -21,15 +21,13 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* @test /* @test
* @bug 6766775 * @bug 6766775
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10 * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
* @run main/othervm DNSIdentities * @run main/othervm DNSIdentities
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -37,7 +35,6 @@ import java.net.*; ...@@ -37,7 +35,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -746,10 +743,6 @@ public class DNSIdentities { ...@@ -746,10 +743,6 @@ public class DNSIdentities {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,15 +21,13 @@ ...@@ -21,15 +21,13 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* @test /* @test
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10 * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
* @bug 6766775 * @bug 6766775
* @run main/othervm IPAddressIPIdentities * @run main/othervm IPAddressIPIdentities
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -37,7 +35,6 @@ import java.net.*; ...@@ -37,7 +35,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -747,10 +744,6 @@ public class IPAddressIPIdentities { ...@@ -747,10 +744,6 @@ public class IPAddressIPIdentities {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,15 +21,13 @@ ...@@ -21,15 +21,13 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* @test /* @test
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10 * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
* @bug 6766775 * @bug 6766775
* @run main/othervm IPIdentities * @run main/othervm IPIdentities
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -37,7 +35,6 @@ import java.net.*; ...@@ -37,7 +35,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -746,10 +743,6 @@ public class IPIdentities { ...@@ -746,10 +743,6 @@ public class IPIdentities {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
/* /*
* Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
...@@ -21,15 +21,13 @@ ...@@ -21,15 +21,13 @@
* questions. * questions.
*/ */
//
// SunJSSE does not support dynamic system properties, no way to re-use
// system properties in samevm/agentvm mode.
//
/* @test /* @test
* @bug 6766775 * @bug 6766775
* @summary X509 certificate hostname checking is broken in JDK1.6.0_10 * @summary X509 certificate hostname checking is broken in JDK1.6.0_10
* @run main/othervm Identities * @run main/othervm Identities
*
* SunJSSE does not support dynamic system properties, no way to re-use
* system properties in samevm/agentvm mode.
* @author Xuelei Fan * @author Xuelei Fan
*/ */
...@@ -37,7 +35,6 @@ import java.net.*; ...@@ -37,7 +35,6 @@ import java.net.*;
import java.util.*; import java.util.*;
import java.io.*; import java.io.*;
import javax.net.ssl.*; import javax.net.ssl.*;
import java.security.Security;
import java.security.KeyStore; import java.security.KeyStore;
import java.security.KeyFactory; import java.security.KeyFactory;
import java.security.cert.Certificate; import java.security.cert.Certificate;
...@@ -746,10 +743,6 @@ public class Identities { ...@@ -746,10 +743,6 @@ public class Identities {
volatile Exception clientException = null; volatile Exception clientException = null;
public static void main(String args[]) throws Exception { public static void main(String args[]) throws Exception {
// MD5 is used in this test case, don't disable MD5 algorithm.
Security.setProperty(
"jdk.certpath.disabledAlgorithms", "MD2, RSA keySize < 1024");
if (debug) if (debug)
System.setProperty("javax.net.debug", "all"); System.setProperty("javax.net.debug", "all");
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册