diff --git a/core/src/com/cloud/network/resource/XTrustProvider.java b/core/src/com/cloud/network/resource/XTrustProvider.java deleted file mode 100644 index ec76b6bef5f..00000000000 --- a/core/src/com/cloud/network/resource/XTrustProvider.java +++ /dev/null @@ -1,98 +0,0 @@ -/* - * The contents of this file are subject to the "END USER LICENSE AGREEMENT FOR F5 - * Software Development Kit for iControl"; you may not use this file except in - * compliance with the License. The License is included in the iControl - * Software Development Kit. - * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See - * the License for the specific language governing rights and limitations - * under the License. - * - * The Original Code is iControl Code and related documentation - * distributed by F5. - * - * Portions created by F5 are Copyright (C) 1996-2004 F5 Networks - * Inc. All Rights Reserved. iControl (TM) is a registered trademark of - * F5 Networks, Inc. - * - * Alternatively, the contents of this file may be used under the terms - * of the GNU General Public License (the "GPL"), in which case the - * provisions of GPL are applicable instead of those above. If you wish - * to allow use of your version of this file only under the terms of the - * GPL and not to allow others to use your version of this file under the - * License, indicate your decision by deleting the provisions above and - * replace them with the notice and other provisions required by the GPL. - * If you do not delete the provisions above, a recipient may use your - * version of this file under either the License or the GPL. - */ -package com.cloud.network.resource; - -import java.security.AccessController; -import java.security.InvalidAlgorithmParameterException; -import java.security.KeyStore; -import java.security.KeyStoreException; -import java.security.PrivilegedAction; -import java.security.Security; -import java.security.cert.X509Certificate; - -import javax.net.ssl.ManagerFactoryParameters; -import javax.net.ssl.TrustManager; -import javax.net.ssl.TrustManagerFactorySpi; -import javax.net.ssl.X509TrustManager; - -public final class XTrustProvider extends java.security.Provider -{ - private final static String NAME = "XTrustJSSE"; - private final static String INFO = - "XTrust JSSE Provider (implements trust factory with truststore validation disabled)"; - private final static double VERSION = 1.0D; - - public XTrustProvider() - { - super(NAME, VERSION, INFO); - - AccessController.doPrivileged(new PrivilegedAction() - { - public Object run() - { - put("TrustManagerFactory." + TrustManagerFactoryImpl.getAlgorithm(), - TrustManagerFactoryImpl.class.getName()); - return null; - } - }); - } - - public static void install() - { - if(Security.getProvider(NAME) == null) - { - Security.insertProviderAt(new XTrustProvider(), 2); - Security.setProperty("ssl.TrustManagerFactory.algorithm", - TrustManagerFactoryImpl.getAlgorithm()); - } - } - - public final static class TrustManagerFactoryImpl extends TrustManagerFactorySpi - { - public TrustManagerFactoryImpl() { } - public static String getAlgorithm() { return "XTrust509"; } - protected void engineInit(KeyStore keystore) throws KeyStoreException { } - protected void engineInit(ManagerFactoryParameters mgrparams) - throws InvalidAlgorithmParameterException - { - throw new InvalidAlgorithmParameterException( - XTrustProvider.NAME + " does not use ManagerFactoryParameters"); - } - - protected TrustManager[] engineGetTrustManagers() - { - return new TrustManager[] { new X509TrustManager() - { - public X509Certificate[] getAcceptedIssuers() { return null; } - public void checkClientTrusted(X509Certificate[] certs, String authType) { } - public void checkServerTrusted(X509Certificate[] certs, String authType) { } - }}; - } - } - } diff --git a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java index 501656f372d..bf7719249e2 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java +++ b/plugins/network-elements/f5/src/com/cloud/network/resource/F5BigIpResource.java @@ -134,8 +134,6 @@ public class F5BigIpResource implements ServerResource { @Override public boolean configure(String name, Map params) throws ConfigurationException { try { - XTrustProvider.install(); - _name = (String) params.get("name"); if (_name == null) { throw new ConfigurationException("Unable to find name");