Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [3285] trunk/core/src/classpath/java/java/security
|
From: <ls...@us...> - 2007-06-23 04:51:37
|
Revision: 3285
http://jnode.svn.sourceforge.net/jnode/?rev=3285&view=rev
Author: lsantha
Date: 2007-06-22 21:51:34 -0700 (Fri, 22 Jun 2007)
Log Message:
-----------
Openjdk integration.
Modified Paths:
--------------
trunk/core/src/classpath/java/java/security/Security.java
Removed Paths:
-------------
trunk/core/src/classpath/java/java/security/AlgorithmParameters.java
trunk/core/src/classpath/java/java/security/Provider.java
trunk/core/src/classpath/java/java/security/cert/
Deleted: trunk/core/src/classpath/java/java/security/AlgorithmParameters.java
===================================================================
--- trunk/core/src/classpath/java/java/security/AlgorithmParameters.java 2007-06-21 19:33:38 UTC (rev 3284)
+++ trunk/core/src/classpath/java/java/security/AlgorithmParameters.java 2007-06-23 04:51:34 UTC (rev 3285)
@@ -1,304 +0,0 @@
-/* AlgorithmParameters.java --- Algorithm Parameters Implementation Class
- Copyright (C) 1999, 2003, 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 java.security;
-
-import gnu.java.security.Engine;
-
-import java.io.IOException;
-import java.security.spec.AlgorithmParameterSpec;
-import java.security.spec.InvalidParameterSpecException;
-
-/**
- * <code>AlgorithmParameters</code> is an Algorithm Parameters class which
- * provides an interface through which the user can manage the parameters of an
- * Algorithm.
- *
- * @author Mark Benvenuto
- * @since 1.2
- * @see AlgorithmParameterSpec
- * @see java.security.spec.DSAParameterSpec
- * @see KeyPairGenerator
- */
-public class AlgorithmParameters
-{
- /** Service name for algorithm parameters. */
- private static final String ALGORITHM_PARAMETERS = "AlgorithmParameters";
-
- private AlgorithmParametersSpi paramSpi;
- private Provider provider;
- private String algorithm;
-
- /**
- * Constructs a new instance of <code>AlgorithmParameters</code>.
- *
- * @param paramSpi
- * the engine to use.
- * @param provider
- * the provider to use.
- * @param algorithm
- * the algorithm to use.
- */
- protected AlgorithmParameters(AlgorithmParametersSpi paramSpi,
- Provider provider, String algorithm)
- {
- this.paramSpi = paramSpi;
- this.provider = provider;
- this.algorithm = algorithm;
- }
-
- /** @return A string with the name of the algorithm used. */
- public final String getAlgorithm()
- {
- return algorithm;
- }
-
- /**
- * Returns a new instance of <code>AlgorithmParameters</code> representing
- * the specified algorithm parameters.
- *
- * <p>The returned <code>AlgorithmParameters</code> must still be initialized
- * with an <code>init()</code> method.</p>
- *
- * @param algorithm
- * the algorithm to use.
- * @return the new instance repesenting the desired algorithm.
- * @throws NoSuchAlgorithmException
- * if the algorithm is not implemented by any provider.
- */
- public static AlgorithmParameters getInstance(String algorithm)
- throws NoSuchAlgorithmException
- {
- Provider[] p = Security.getProviders();
-
- for (int i = 0; i < p.length; i++)
- try
- {
- return getInstance(algorithm, p[i]);
- }
- catch (NoSuchAlgorithmException e)
- {
- // Ignore this.
- }
-
- throw new NoSuchAlgorithmException(algorithm);
- }
-
- /**
- * Returns a new instance of <code>AlgorithmParameters</code> representing
- * the specified algorithm parameters from a named provider.
- *
- * <p>The returned <code>AlgorithmParameters</code> must still be intialized
- * with an <code>init()</code> method.</p>
- *
- * @param algorithm
- * the algorithm to use.
- * @param provider
- * the name of the {@link Provider} to use.
- * @return the new instance repesenting the desired algorithm.
- * @throws NoSuchAlgorithmException
- * if the algorithm is not implemented by the named provider.
- * @throws NoSuchProviderException
- * if the named provider was not found.
- * @throws IllegalArgumentException
- * if <code>provider</code> is <code>null</code> or is an empty
- * string.
- */
- public static AlgorithmParameters getInstance(String algorithm, String provider)
- throws NoSuchAlgorithmException, NoSuchProviderException
- {
- if (provider == null || provider.length() == 0)
- throw new IllegalArgumentException("Illegal provider");
-
- Provider p = Security.getProvider(provider);
- if (p == null)
- throw new NoSuchProviderException(provider);
-
- return getInstance(algorithm, p);
- }
-
- /**
- * Returns a new instance of <code>AlgorithmParameters</code> representing
- * the specified algorithm parameters from the specified {@link Provider}.
- *
- * <p>The returned <code>AlgorithmParameters</code> must still be intialized
- * with an <code>init()</code> method.</p>
- *
- * @param algorithm
- * the algorithm to use.
- * @param provider
- * the {@link Provider} to use.
- * @return the new instance repesenting the desired algorithm.
- * @throws NoSuchAlgorithmException
- * if the algorithm is not implemented by the {@link Provider}.
- * @throws IllegalArgumentException
- * if <code>provider</code> is <code>null</code>.
- * @since 1.4
- */
- public static AlgorithmParameters getInstance(String algorithm,
- Provider provider)
- throws NoSuchAlgorithmException
- {
- if (provider == null)
- throw new IllegalArgumentException("Illegal provider");
-
- try
- {
- return new AlgorithmParameters((AlgorithmParametersSpi)
- Engine.getInstance(ALGORITHM_PARAMETERS, algorithm, provider),
- provider, algorithm);
- }
- catch (java.lang.reflect.InvocationTargetException ite)
- {
- throw new NoSuchAlgorithmException(algorithm);
- }
- catch (ClassCastException cce)
- {
- throw new NoSuchAlgorithmException(algorithm);
- }
- }
-
- /** @return the provider of this parameter object. */
- public final Provider getProvider()
- {
- return provider;
- }
-
- /**
- * Initializes the engine with the specified {@link AlgorithmParameterSpec}.
- *
- * @param paramSpec
- * A {@link AlgorithmParameterSpec} to use.
- * @throws InvalidParameterSpecException
- * if <code>paramSpec</code> is invalid.
- */
- public final void init(AlgorithmParameterSpec paramSpec)
- throws InvalidParameterSpecException
- {
- paramSpi.engineInit(paramSpec);
- }
-
- /**
- * Initializes the engine with the specified parameters stored in the byte
- * array and decodes them according to the ASN.1 specification. If the ASN.1
- * specification exists then it succeeds otherwise an {@link IOException} is
- * thrown.
- *
- * @param params
- * the parameters to use.
- * @throws IOException
- * if a decoding error occurs.
- */
- public final void init(byte[]params) throws IOException
- {
- paramSpi.engineInit(params);
- }
-
- /**
- * Initializes the engine with the specified parameters stored in the byte
- * array and decodes them according to the specified decoding specification.
- * If <code>format</code> is <code>null</code>, then this method decodes the
- * byte array using the ASN.1 specification if it exists, otherwise it throws
- * an {@link IOException}.
- *
- * @param params
- * the parameters to use.
- * @param format
- * the name of decoding format to use.
- * @throws IOException
- * if a decoding error occurs.
- */
- public final void init(byte[]params, String format) throws IOException
- {
- paramSpi.engineInit(params, format);
- }
-
- /**
- * Returns a new instance of <code>AlgorithmParameters</code> as a
- * designated parameter specification {@link Class}.
- *
- * @param paramSpec
- * the {@link Class} to use.
- * @return the parameter specification.
- * @throws InvalidParameterSpecException
- * if <code>paramSpec</code> is invalid.
- */
- public final AlgorithmParameterSpec getParameterSpec(Class paramSpec)
- throws InvalidParameterSpecException
- {
- return paramSpi.engineGetParameterSpec(paramSpec);
- }
-
- /**
- * Returns the parameters in the default encoding format. The primary encoding
- * format is ASN.1 if it exists for the specified type.
- *
- * @return byte array representing the parameters.
- */
- public final byte[] getEncoded() throws IOException
- {
- return paramSpi.engineGetEncoded();
- }
-
- /**
- * Returns the parameters in the specified encoding format. If
- * <code>format</code> is <code>null</code> then the ASN.1 encoding
- * format is used if it exists for the specified type.
- *
- * @param format
- * the name of the encoding format to use.
- * @return the parameters encoded using the specified encoding scheme.
- * @throws IOException
- * if an encoding exception occurs, or if this parameter object has
- * not been initialized.
- */
- public final byte[] getEncoded(String format) throws IOException
- {
- return paramSpi.engineGetEncoded(format);
- }
-
- /**
- * Returns a string representation of the encoded form.
- *
- * @return a string representation of the encoded form.
- */
- public final String toString()
- {
- return paramSpi.engineToString();
- }
-}
Deleted: trunk/core/src/classpath/java/java/security/Provider.java
===================================================================
--- trunk/core/src/classpath/java/java/security/Provider.java 2007-06-21 19:33:38 UTC (rev 3284)
+++ trunk/core/src/classpath/java/java/security/Provider.java 2007-06-23 04:51:34 UTC (rev 3285)
@@ -1,202 +0,0 @@
-/* Provider.java -- Security provider information
- Copyright (C) 1998, 1999, 2000, 2002 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 java.security;
-
-import java.io.Serializable;
-import java.util.Properties;
-
-/**
- * This class represents a Java security architecture service provider.
- * The services provided by a such a provider can range from security
- * algorithms to key generation.
- * <p>
- * Providers are installed by name and version number. There is one
- * standard provider supplied with the class library. This is the
- * "GNU" provider, which can also be accessed by the alias "SUN" for
- * compatibility with the JDK.
- *
- * @version 0.0
- *
- * @author Aaron M. Renn (ar...@ur...)
- */
-public abstract class Provider extends Properties implements Serializable
-{
- private static final long serialVersionUID = -4298000515446427739L;
-
- /**
- * This is a textual description of the provider
- */
- private String info;
-
- /**
- * This is the name of the provider
- */
- private String name;
-
- /**
- * This is the version number of the provider
- */
- private double version;
-
- /**
- * This method initializes a new instance of <code>Provider</code> to have
- * the specified name, version, and description information.
- *
- * @param name The name to assign to this <code>Provider</code>.
- * @param version The version number for this <code>Provider</code>.
- * @param info A textual description of this provider.
- */
- protected Provider(String name, double version, String info)
- {
- this.name = name;
- this.version = version;
- this.info = info;
- }
-
- /**
- * This method returns the name assigned to this <code>Provider</code>.
- *
- * @return The <code>Provider</code>'s name.
- */
- public String getName()
- {
- return (name);
- }
-
- /**
- * This method retunrs the version number of this <code>Provider</code>.
- *
- * @return The <code>Provider</code>'s version number.
- */
- public double getVersion()
- {
- return (version);
- }
-
- /**
- * This method returns a textual description of the <code>Provider</code>.
- *
- * @return A description of the <code>Provider</code>.
- */
- public String getInfo()
- {
- return (info);
- }
-
- /**
- * Sets the key property to have the specified value.
- * <p>
- * <bold>NOT IMPLEMENTED YET</bold>[
- * First, if there is a security manager, its <code>checkSecurityAccess</code>
- * method is called with the string "putProviderProperty."+name, where name is
- * the provider name, to see if it's ok to set this provider's property
- * values.
- * If the default implementation of <code>checkSecurityAccess</code> is used
- * (that is, that method is not overriden), then this results in a call to the
- * security manager's <code>checkPermission</code> method with a
- * <code>SecurityPermission("putProviderProperty."+name)</code>
- * permission.<br>]
- *
- * @param key The property key.
- * @param value The property value.
- *
- * @return The previous value of the specified property (<code>key</code>),
- * or <code>null</code> if it did not have one.
- * @throws SecurityException If a security manager exists and its
- * {@link java.lang.SecurityManager.checkSecurityAccess(java.lang.String)}
- * method denies access to set property values.
- * @since Classpath 0.4+cvs, JDK 1.2
- * @see java.lang.Object.equals(Object)
- * @see java.util.Hashtable.get(Object)
- */
- public Object put(Object key, Object value)
- {
- return super.put(toCanonicalKey(key), value);
- }
-
- // overrides same in java.util.Hashtable
- public Object get(Object key)
- {
- return super.get(toCanonicalKey(key));
- }
-
- /**
- * This method removes the specified key entry (and its associated value)
- * from the property mapping list.
- *
- * @param key The key to remove
- *
- * @return The previous value for this key, or <code>null</code> if no
- * previous value.
- */
- public Object remove(Object key)
- {
- return super.remove(toCanonicalKey(key));
- }
-
- /**
- * This method clears the entire property list such that it no longer
- * contains the properties used to look up the services provided by
- * the <code>Provider</code>.
- */
- public void clear()
- {
- super.clear();
- }
-
- /**
- * This method returns a <code>String</code> representation of this
- * object. This will include the <code>Provider</code> name and
- * version number.
- *
- * @return A <code>String</code> representation of this object.
- */
- public String toString()
- {
- return (getClass().getName() + ": name=" + getName() + " version=" +
- version);
- }
-
- private Object toCanonicalKey(Object key)
- {
- if (key.getClass().isAssignableFrom(String.class)) // is it ours?
- return ((String) key).toUpperCase(); // use default locale
- else
- return key;
- }
-}
Modified: trunk/core/src/classpath/java/java/security/Security.java
===================================================================
--- trunk/core/src/classpath/java/java/security/Security.java 2007-06-21 19:33:38 UTC (rev 3284)
+++ trunk/core/src/classpath/java/java/security/Security.java 2007-06-23 04:51:34 UTC (rev 3285)
@@ -57,6 +57,7 @@
import java.util.Properties;
import java.util.Set;
import java.util.Vector;
+import sun.security.jca.GetInstance;
/**
* This class centralizes all security properties and common security methods.
@@ -707,4 +708,67 @@
return false;
}
+
+ //jnode openjdk
+ /*
+ * Returns an array of objects: the first object in the array is
+ * an instance of an implementation of the requested algorithm
+ * and type, and the second object in the array identifies the provider
+ * of that implementation.
+ * The <code>provider</code> argument can be null, in which case all
+ * configured providers will be searched in order of preference.
+ */
+ static Object[] getImpl(String algorithm, String type, String provider)
+ throws NoSuchAlgorithmException, NoSuchProviderException {
+ if (provider == null) {
+ return GetInstance.getInstance
+ (type, getSpiClass(type), algorithm).toArray();
+ } else {
+ return GetInstance.getInstance
+ (type, getSpiClass(type), algorithm, provider).toArray();
+ }
+ }
+
+ // Map containing cached Spi Class objects of the specified type
+ private static final Map<String,Class> spiMap =
+ new java.util.Hashtable<String,Class>();
+
+ /**
+ * Return the Class object for the given engine type
+ * (e.g. "MessageDigest"). Works for Spis in the java.security package
+ * only.
+ */
+ private static Class getSpiClass(String type) {
+ Class clazz = spiMap.get(type);
+ if (clazz != null) {
+ return clazz;
+ }
+ try {
+ clazz = Class.forName("java.security." + type + "Spi");
+ spiMap.put(type, clazz);
+ return clazz;
+ } catch (ClassNotFoundException e) {
+ throw (Error)new AssertionError("Spi class not found").initCause(e);
+ }
+ }
+
+ /*
+ * Returns an array of objects: the first object in the array is
+ * an instance of an implementation of the requested algorithm
+ * and type, and the second object in the array identifies the provider
+ * of that implementation.
+ * The <code>provider</code> argument cannot be null.
+ */
+ static Object[] getImpl(String algorithm, String type, Provider provider)
+ throws NoSuchAlgorithmException {
+ return GetInstance.getInstance
+ (type, getSpiClass(type), algorithm, provider).toArray();
+ }
+
+ static Object[] getImpl(String algorithm, String type, Provider provider,
+ Object params) throws NoSuchAlgorithmException,
+ InvalidAlgorithmParameterException {
+ return GetInstance.getInstance
+ (type, getSpiClass(type), algorithm, params, provider).toArray();
+ }
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
