--- a/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Thu Apr 07 17:08:16 2011 -0700
+++ b/jdk/src/share/classes/sun/security/ssl/SSLSocketImpl.java Fri Apr 08 02:00:09 2011 -0700
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 1996, 2010, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1996, 2011, 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
@@ -562,8 +562,11 @@
clientVerifyData = new byte[0];
serverVerifyData = new byte[0];
- enabledCipherSuites = CipherSuiteList.getDefault();
- enabledProtocols = ProtocolList.getDefault(roleIsServer);
+ enabledCipherSuites =
+ sslContext.getDefaultCipherSuiteList(roleIsServer);
+ enabledProtocols =
+ sslContext.getDefaultProtocolList(roleIsServer);
+
inrec = null;
// save the acc
@@ -2170,8 +2173,8 @@
* change them to the corresponding default ones.
*/
if (roleIsServer != (!flag) &&
- ProtocolList.isDefaultProtocolList(enabledProtocols)) {
- enabledProtocols = ProtocolList.getDefault(!flag);
+ sslContext.isDefaultProtocolList(enabledProtocols)) {
+ enabledProtocols = sslContext.getDefaultProtocolList(!flag);
}
roleIsServer = !flag;
break;
@@ -2192,8 +2195,8 @@
* change them to the corresponding default ones.
*/
if (roleIsServer != (!flag) &&
- ProtocolList.isDefaultProtocolList(enabledProtocols)) {
- enabledProtocols = ProtocolList.getDefault(!flag);
+ sslContext.isDefaultProtocolList(enabledProtocols)) {
+ enabledProtocols = sslContext.getDefaultProtocolList(!flag);
}
roleIsServer = !flag;
connectionState = cs_START;
@@ -2230,8 +2233,7 @@
* @return an array of cipher suite names
*/
public String[] getSupportedCipherSuites() {
- CipherSuiteList.clearAvailableCache();
- return CipherSuiteList.getSupported().toStringArray();
+ return sslContext.getSuportedCipherSuiteList().toStringArray();
}
/**
@@ -2271,7 +2273,7 @@
* @return an array of protocol names.
*/
public String[] getSupportedProtocols() {
- return ProtocolList.getSupported().toStringArray();
+ return sslContext.getSuportedProtocolList().toStringArray();
}
/**