From: <ls...@us...> - 2007-06-25 19:30:52
|
Revision: 3318 http://jnode.svn.sourceforge.net/jnode/?rev=3318&view=rev Author: lsantha Date: 2007-06-25 12:30:49 -0700 (Mon, 25 Jun 2007) Log Message: ----------- Openjdk integration. Removed Paths: ------------- trunk/core/src/classpath/javax/javax/net/ssl/SSLContext.java trunk/core/src/classpath/javax/javax/net/ssl/SSLContextSpi.java trunk/core/src/classpath/javax/javax/net/ssl/SSLSocket.java Deleted: trunk/core/src/classpath/javax/javax/net/ssl/SSLContext.java =================================================================== --- trunk/core/src/classpath/javax/javax/net/ssl/SSLContext.java 2007-06-25 12:34:41 UTC (rev 3317) +++ trunk/core/src/classpath/javax/javax/net/ssl/SSLContext.java 2007-06-25 19:30:49 UTC (rev 3318) @@ -1,293 +0,0 @@ -/* SSLContext.java -- an SSL protocol context. - Copyright (C) 2004 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - - -package javax.net.ssl; - -import gnu.java.security.Engine; - -import java.lang.reflect.InvocationTargetException; -import java.security.KeyManagementException; -import java.security.NoSuchAlgorithmException; -import java.security.NoSuchProviderException; -import java.security.Provider; -import java.security.SecureRandom; -import java.security.Security; - -/** - * A "meta-factory" for protocol-specific socket and server socket - * factories. This class serves as a clearinghouse for socket - * factories and cached session contexts for a particular protocol, - * such as SSLv3. - * - * @author Casey Marshall (rs...@me...) - */ -public class SSLContext -{ - // Constants and fields. - // ------------------------------------------------------------------ - - /** Service name for SSL contexts. */ - private static final String SSL_CONTEXT = "SSLContext"; - - /** The underlying engine. */ - private final SSLContextSpi ctxSpi; - - /** The provider of the engine class. */ - private final Provider provider; - - /** The protocal name. */ - private final String protocol; - - // Constructor. - // ------------------------------------------------------------------ - - /** - * Create a new SSL context. - * - * @param ctxSpi The context engine. - * @param provider The provider of the implementation. - * @param protocol The name of the SSL protocol. - */ - protected SSLContext(SSLContextSpi ctxSpi, Provider provider, - String protocol) - { - this.ctxSpi = ctxSpi; - this.provider = provider; - this.protocol = protocol; - } - - /** - * Get an instance of a context for the specified protocol from the first - * provider that implements it. - * - * @param protocol The name of the protocol to get a context for. - * @return The new context. - * @throws NoSuchAlgorithmException If no provider implements the given - * protocol. - * @throws IllegalArgumentException if <code>protocol</code> is - * <code>null</code> or is an empty string. - */ - public static final SSLContext getInstance(String protocol) - throws NoSuchAlgorithmException - { - Provider[] p = Security.getProviders(); - NoSuchAlgorithmException lastException = null; - for (int i = 0; i < p.length; i++) - try - { - return getInstance(protocol, p[i]); - } - catch (NoSuchAlgorithmException x) - { - lastException = x; - } - if (lastException != null) - throw lastException; - throw new NoSuchAlgorithmException(protocol); - } - - /** - * Get an instance of a context for the specified protocol from the named - * provider. - * - * @param protocol The name of the protocol to get a context for. - * @param provider The name of the provider to get the implementation from. - * @return The new context. - * @throws NoSuchAlgorithmException If the provider does not implement the - * given protocol. - * @throws NoSuchProviderException If the named provider does not exist. - * @throws IllegalArgumentException if either <code>protocol</code> or - * <code>provider</code> is <code>null</code>, or if - * <code>protocol</code> is an empty string. - */ - public static final SSLContext getInstance(String protocol, String provider) - throws NoSuchAlgorithmException, NoSuchProviderException - { - if (provider == null) - throw new IllegalArgumentException("provider MUST NOT be null"); - Provider p = Security.getProvider(provider); - if (p == null) - throw new NoSuchProviderException(provider); - return getInstance(protocol, p); - } - - /** - * Get an instance of a context for the specified protocol from the specified - * provider. - * - * @param protocol The name of the protocol to get a context for. - * @param provider The name of the provider to get the implementation from. - * @return The new context. - * @throws NoSuchAlgorithmException If the provider does not implement the - * given protocol. - * @throws IllegalArgumentException if either <code>protocol</code> or - * <code>provider</code> is <code>null</code>, or if - * <code>protocol</code> is an empty string. - */ - public static final SSLContext getInstance(String protocol, Provider provider) - throws NoSuchAlgorithmException - { - StringBuilder sb = new StringBuilder("SSLContext for protocol [") - .append(protocol).append("] from provider[") - .append(provider).append("] could not be created"); - Throwable cause; - try - { - Object spi = Engine.getInstance(SSL_CONTEXT, protocol, provider); - return new SSLContext((SSLContextSpi) spi, provider, protocol); - } - catch (InvocationTargetException x) - { - cause = x.getCause(); - if (cause instanceof NoSuchAlgorithmException) - throw (NoSuchAlgorithmException) cause; - if (cause == null) - cause = x; - } - catch (ClassCastException x) - { - cause = x; - } - NoSuchAlgorithmException x = new NoSuchAlgorithmException(sb.toString()); - x.initCause(cause); - throw x; - } - - /** - * Creates a new {@link SSLEngine} for this context. - * - * @return The new SSLEngine. - * @since 1.5 - */ - public final SSLEngine createSSLEngine () - { - return ctxSpi.engineCreateSSLEngine (); - } - - /** - * Creates a new {@link SSLEngine} for this context, with a given - * host name and port number. - * - * @param host The local host name. - * @param port The local port number. - * @return The new SSLEngine. - * @since 1.5 - */ - public final SSLEngine createSSLEngine (final String host, final int port) - { - return ctxSpi.engineCreateSSLEngine (host, port); - } - - /** - * Returns the set of SSL contexts available for client connections. - * - * @return The set of SSL contexts available for client connections. - */ - public final SSLSessionContext getClientSessionContext() - { - return ctxSpi.engineGetClientSessionContext(); - } - - /** - * Returns the protocol name of this context. - * - * @return The protocol name of this context. - */ - public final String getProtocol() - { - return protocol; - } - - /** - * Returns the provider of this implementation. - * - * @return The provider of this implementation. - */ - public final Provider getProvider() - { - return provider; - } - - /** - * Returns the set of SSL contexts available for server connections. - * - * @return The set of SSL contexts available for server connections. - */ - public final SSLSessionContext getServerSessionContext() - { - return ctxSpi.engineGetServerSessionContext(); - } - - /** - * Returns the factory for server SSL sockets. - * - * @return The factory for server SSL sockets. - */ - public final SSLServerSocketFactory getServerSocketFactory() - { - return ctxSpi.engineGetServerSocketFactory(); - } - - /** - * Returns the factory for client SSL sockets. - * - * @return The factory for client SSL sockets. - */ - public final SSLSocketFactory getSocketFactory() - { - return ctxSpi.engineGetSocketFactory(); - } - - /** - * Initializes this context and prepares it for producing socket - * factories. All of the parameters are optional; default values are - * used if left unspecified. - * - * @param keyManagers The set of key managers to use. - * @param trustManagers The set of trust managers to use. - * @param random A source of random bits to use. - * @throws KeyManagementException If initialization fails. - */ - public final void init(KeyManager[] keyManagers, - TrustManager[] trustManagers, - SecureRandom random) - throws KeyManagementException - { - ctxSpi.engineInit(keyManagers, trustManagers, random); - } -} Deleted: trunk/core/src/classpath/javax/javax/net/ssl/SSLContextSpi.java =================================================================== --- trunk/core/src/classpath/javax/javax/net/ssl/SSLContextSpi.java 2007-06-25 12:34:41 UTC (rev 3317) +++ trunk/core/src/classpath/javax/javax/net/ssl/SSLContextSpi.java 2007-06-25 19:30:49 UTC (rev 3318) @@ -1,131 +0,0 @@ -/* SSLContextSpi.java -- SPI for SSL contexts. - Copyright (C) 2004 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - - -package javax.net.ssl; - -import java.security.KeyManagementException; -import java.security.SecureRandom; - -/** - * The <i>Service Provider Interface</i> (<b>SPI</b>) for SSLContext - * objects. - * - * @author Casey Marshall (rs...@me...) - */ -public abstract class SSLContextSpi -{ - - // Constructor. - // ------------------------------------------------------------------- - - /** - * Create a new SSLContextSpi. - */ - public SSLContextSpi() - { - super(); - } - - // Abstract methods. - // ------------------------------------------------------------------- - - // Sun, you've broken existing applications by introducing new - // abstract methods! Goodjob!!! - - /** - * Returns a new {@link SSLEngine} for this context. - * - * @return A new SSLEngine. - * @since 1.5 - */ - protected abstract SSLEngine engineCreateSSLEngine (); - - /** - * Returns a new {@link SSLEngine} for this context, for the given - * host name and port number. - * - * @param host The local host name. - * @param port The local port number. - * @return A new SSLEngine. - * @since 1.5 - */ - protected abstract SSLEngine engineCreateSSLEngine (String host, int port); - - /** - * Returns the set of SSL sessions available for client connections. - * - * @return The set of SSL sessions available for client connections. - */ - protected abstract SSLSessionContext engineGetClientSessionContext(); - - /** - * Returns the set of SSL sessions available for server connections. - * - * @return The set of SSL sessions available for server connections. - */ - protected abstract SSLSessionContext engineGetServerSessionContext(); - - /** - * Returns the SSL server socket factory. - * - * @return The SSL server socket factory. - */ - protected abstract SSLServerSocketFactory engineGetServerSocketFactory(); - - /** - * Returns the SSL client socket factory. - * - * @return The SSL client socket factory. - */ - protected abstract SSLSocketFactory engineGetSocketFactory(); - - /** - * Initialize this context with key and trust managers, and a source - * of randomness. All of the parameters are optional. - * - * @param keyManagers The set of key managers. - * @param trustManagers The set of trust managers. - * @param random The source of randomness. - * @throws KeyManagementException If this context cannot be - * initialized with these parameters. - */ - protected abstract void engineInit(KeyManager[] keyManagers, - TrustManager[] trustManagers, - SecureRandom random) - throws KeyManagementException; -} Deleted: trunk/core/src/classpath/javax/javax/net/ssl/SSLSocket.java =================================================================== --- trunk/core/src/classpath/javax/javax/net/ssl/SSLSocket.java 2007-06-25 12:34:41 UTC (rev 3317) +++ trunk/core/src/classpath/javax/javax/net/ssl/SSLSocket.java 2007-06-25 19:30:49 UTC (rev 3318) @@ -1,229 +0,0 @@ -/* SSLSocket.java -- an SSL client socket. - Copyright (C) 2004 Free Software Foundation, Inc. - -This file is part of GNU Classpath. - -GNU Classpath is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GNU Classpath is distributed in the hope that it will be useful, but -WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GNU Classpath; see the file COPYING. If not, write to the -Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -02110-1301 USA. - -Linking this library statically or dynamically with other modules is -making a combined work based on this library. Thus, the terms and -conditions of the GNU General Public License cover the whole -combination. - -As a special exception, the copyright holders of this library give you -permission to link this library with independent modules to produce an -executable, regardless of the license terms of these independent -modules, and to copy and distribute the resulting executable under -terms of your choice, provided that you also meet, for each linked -independent module, the terms and conditions of the license of that -module. An independent module is a module which is not derived from -or based on this library. If you modify this library, you may extend -this exception to your version of the library, but you are not -obligated to do so. If you do not wish to do so, delete this -exception statement from your version. */ - - -package javax.net.ssl; - -import java.io.IOException; -import java.net.InetAddress; -import java.net.Socket; -import java.net.UnknownHostException; - -/** - * A socket that communicates over the secure socket layer protocol. - */ -public abstract class SSLSocket extends Socket -{ - - // Constructors. - // ------------------------------------------------------------------------- - - protected SSLSocket() - { - super(); - } - - protected SSLSocket(String host, int port) - throws IOException, UnknownHostException - { - super(host, port); - } - - protected SSLSocket(InetAddress address, int port) throws IOException - { - super(address, port); - } - - protected SSLSocket(String host, int port, - InetAddress localAddr, int localPort) - throws IOException, UnknownHostException - { - super(host, port, localAddr, localPort); - } - - protected SSLSocket(InetAddress address, int port, - InetAddress localAddr, int localPort) - throws IOException - { - super(address, port, localAddr, localPort); - } - - // Abstract methods. - // ------------------------------------------------------------------------- - - /** - * Adds a handshake completed listener that wants to be notified when the - * SSL handshake completes. - * - * @param listener The listener to add. - */ - public abstract void - addHandshakeCompletedListener(HandshakeCompletedListener listener); - - /** - * Removes a handshake listener from this socket. - * - * @param listener The listener to remove. - */ - public abstract void - removeHandshakeCompletedListener(HandshakeCompletedListener listener); - - /** - * Returns the list of currently enabled cipher suites. - * - * @return The list of enabled cipher suites. - */ - public abstract String[] getEnabledCipherSuites(); - - /** - * Sets the list of enabled cipher suites. - * - * @param suites The list of suites to enable. - */ - public abstract void setEnabledCipherSuites(String[] suites); - - /** - * Returns the list of enabled SSL protocols. - * - * @return The list of enabled protocols. - */ - public abstract String[] getEnabledProtocols(); - - /** - * Sets the list of enabled SSL protocols. - * - * @param protocols The list of protocols to enable. - */ - public abstract void setEnabledProtocols(String[] protocols); - - /** - * Returns whether or not sessions will be created by this socket, and thus - * allow sessions to be continued later. - * - * @return Whether or not sessions will be created. - */ - public abstract boolean getEnableSessionCreation(); - - /** - * Sets whether or not sessions will be created by this socket. - * - * @param enable The new value. - */ - public abstract void setEnableSessionCreation(boolean enable); - - /** - * Returns whether or not this socket will require connecting clients to - * authenticate themselves. This value only applies to sockets in server - * mode. - * - * @return Whether or not this socket requires client authentication. - */ - public abstract boolean getNeedClientAuth(); - - /** - * Sets whether or not this socket will require connecting clients to - * authenticate themselves. This value only applies to sockets in server - * mode. - * - * @param needAuth The new need auth value. - */ - public abstract void setNeedClientAuth(boolean needAuth); - - /** - * Returns this socket's session object. - * - * @return The session. - */ - public abstract SSLSession getSession(); - - /** - * Returns the list of cipher suites supported by this socket. - * - * @return The list of supported cipher suites. - */ - public abstract String[] getSupportedCipherSuites(); - - /** - * Returns the list of protocols supported by this socket. - * - * @return The list of supported protocols. - */ - public abstract String[] getSupportedProtocols(); - - /** - * Returns whether or not this socket will connect in client mode. - * - * @return True if this is a client socket. - */ - public abstract boolean getUseClientMode(); - - /** - * Sets whether or not this socket will connect in client mode. - * - * @param clientMode The new value. - */ - public abstract void setUseClientMode(boolean clientMode); - - /** - * Returns whether or not this socket will request that connecting clients - * authenticate themselves. This value only applies to sockets in server - * mode. - * - * @return The want client auth value. - */ - public abstract boolean getWantClientAuth(); - - /** - * Sets whether or not this socket will request that connecting clients - * authenticate themselves. This value only applies to sockets in server - * mode. - * - * @param wantAuth The new want auth value. - */ - public abstract void setWantClientAuth(boolean wantAuth); - - /** - * Explicitly begins the handshake, or, if the handshake has already - * completed, requests that the handshake be repeated. - * - * <p>The handshake will begin implicitly when any attempt to read or - * write to the socket is made.</p> - * - * @throws IOException If an I/O or SSL error occurs. - */ - public abstract void startHandshake() throws IOException; -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |