Mercurial > hg > openjdk > jdk8u > jdk
changeset 11460:2ea57ab37a95
8151197: [TEST_BUG] Need to backport fix for test/javax/net/ssl/TLS/TestJSSE.java
Reviewed-by: xuelei
| author | snikandrova |
|---|---|
| date | Fri, 04 Mar 2016 16:26:09 +0300 |
| parents | b69b4d8c149a |
| children | c2c918b0d134 |
| files | test/javax/net/ssl/TLS/TestJSSE.java |
| diffstat | 1 files changed, 5 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/test/javax/net/ssl/TLS/TestJSSE.java Thu May 21 09:35:26 2015 +0000 +++ b/test/javax/net/ssl/TLS/TestJSSE.java Fri Mar 04 16:26:09 2016 +0300 @@ -1,5 +1,5 @@ /** - * Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it under @@ -78,6 +78,10 @@ private static final String LOCAL_IP = "127.0.0.1"; public static void main(String... args) throws Exception { + // reset the security property to make sure that the algorithms + // and keys used in this test are not disabled. + Security.setProperty("jdk.tls.disabledAlgorithms", ""); + String serverProtocol = System.getProperty("SERVER_PROTOCOL"); String clientProtocol = System.getProperty("CLIENT_PROTOCOL"); int port = jdk.testlibrary.Utils.getFreePort();