Merged gcj-eclipse branch to trunk.
From-SVN: r120621
This commit is contained in:
parent
c648dedbde
commit
97b8365caf
17478 changed files with 606493 additions and 100744 deletions
|
@ -40,6 +40,7 @@ package java.security;
|
|||
|
||||
import gnu.java.security.Engine;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.security.spec.AlgorithmParameterSpec;
|
||||
|
||||
/**
|
||||
|
@ -90,28 +91,29 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
|
|||
* Returns a new instance of <code>KeyPairGenerator</code> which generates
|
||||
* key-pairs for the specified algorithm.
|
||||
*
|
||||
* @param algorithm
|
||||
* the name of the algorithm to use.
|
||||
* @param algorithm the name of the algorithm to use.
|
||||
* @return a new instance repesenting the desired algorithm.
|
||||
* @throws NoSuchAlgorithmException
|
||||
* if the algorithm is not implemented by any provider.
|
||||
* @throws NoSuchAlgorithmException if the algorithm is not implemented by any
|
||||
* provider.
|
||||
* @throws IllegalArgumentException if <code>algorithm</code> is
|
||||
* <code>null</code> or is an empty string.
|
||||
*/
|
||||
public static KeyPairGenerator getInstance(String algorithm)
|
||||
throws NoSuchAlgorithmException
|
||||
throws NoSuchAlgorithmException
|
||||
{
|
||||
Provider[] p = Security.getProviders();
|
||||
NoSuchAlgorithmException lastException = null;
|
||||
for (int i = 0; i < p.length; i++)
|
||||
{
|
||||
try
|
||||
{
|
||||
return getInstance(algorithm, p[i]);
|
||||
}
|
||||
catch (NoSuchAlgorithmException e)
|
||||
{
|
||||
// Ignored.
|
||||
}
|
||||
}
|
||||
|
||||
try
|
||||
{
|
||||
return getInstance(algorithm, p[i]);
|
||||
}
|
||||
catch (NoSuchAlgorithmException x)
|
||||
{
|
||||
lastException = x;
|
||||
}
|
||||
if (lastException != null)
|
||||
throw lastException;
|
||||
throw new NoSuchAlgorithmException(algorithm);
|
||||
}
|
||||
|
||||
|
@ -119,23 +121,26 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
|
|||
* Returns a new instance of <code>KeyPairGenerator</code> which generates
|
||||
* key-pairs for the specified algorithm from a named provider.
|
||||
*
|
||||
* @param algorithm
|
||||
* the name of the algorithm to use.
|
||||
* @param provider
|
||||
* the name of a {@link Provider} to use.
|
||||
* @param algorithm the name of the algorithm to use.
|
||||
* @param provider the name of a {@link Provider} to use.
|
||||
* @return a 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 NoSuchAlgorithmException if the algorithm is not implemented by the
|
||||
* named provider.
|
||||
* @throws NoSuchProviderException if the named provider was not found.
|
||||
* @throws IllegalArgumentException if either <code>algorithm</code> or
|
||||
* <code>provider</code> is <code>null</code> or empty.
|
||||
*/
|
||||
public static KeyPairGenerator getInstance(String algorithm, String provider)
|
||||
throws NoSuchAlgorithmException, NoSuchProviderException
|
||||
throws NoSuchAlgorithmException, NoSuchProviderException
|
||||
{
|
||||
if (provider == null)
|
||||
throw new IllegalArgumentException("provider MUST NOT be null");
|
||||
provider = provider.trim();
|
||||
if (provider.length() == 0)
|
||||
throw new IllegalArgumentException("provider MUST NOT be empty");
|
||||
Provider p = Security.getProvider(provider);
|
||||
if (p == null)
|
||||
throw new NoSuchProviderException(provider);
|
||||
|
||||
return getInstance(algorithm, p);
|
||||
}
|
||||
|
||||
|
@ -148,10 +153,11 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
|
|||
* @param provider
|
||||
* the {@link Provider} to use.
|
||||
* @return a new insatnce repesenting the desired algorithm.
|
||||
* @throws IllegalArgumentException
|
||||
* if <code>provider</code> is <code>null</code>.
|
||||
* @throws NoSuchAlgorithmException
|
||||
* if the algorithm is not implemented by the {@link Provider}.
|
||||
* @throws IllegalArgumentException if either <code>algorithm</code> or
|
||||
* <code>provider</code> is <code>null</code>, or if
|
||||
* <code>algorithm</code> is an empty string.
|
||||
* @since 1.4
|
||||
* @see Provider
|
||||
*/
|
||||
|
@ -159,20 +165,27 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
|
|||
Provider provider)
|
||||
throws NoSuchAlgorithmException
|
||||
{
|
||||
if (provider == null)
|
||||
throw new IllegalArgumentException("Illegal provider");
|
||||
|
||||
Object o = null;
|
||||
StringBuilder sb = new StringBuilder("KeyPairGenerator for algorithm [")
|
||||
.append(algorithm).append("] from provider[")
|
||||
.append(provider).append("] ");
|
||||
Object o;
|
||||
try
|
||||
{
|
||||
o = Engine.getInstance(KEY_PAIR_GENERATOR, algorithm, provider);
|
||||
}
|
||||
catch (java.lang.reflect.InvocationTargetException ite)
|
||||
catch (InvocationTargetException x)
|
||||
{
|
||||
throw new NoSuchAlgorithmException(algorithm);
|
||||
Throwable cause = x.getCause();
|
||||
if (cause instanceof NoSuchAlgorithmException)
|
||||
throw (NoSuchAlgorithmException) cause;
|
||||
if (cause == null)
|
||||
cause = x;
|
||||
sb.append("could not be created");
|
||||
NoSuchAlgorithmException y = new NoSuchAlgorithmException(sb.toString());
|
||||
y.initCause(cause);
|
||||
throw y;
|
||||
}
|
||||
|
||||
KeyPairGenerator result = null;
|
||||
KeyPairGenerator result;
|
||||
if (o instanceof KeyPairGenerator)
|
||||
{
|
||||
result = (KeyPairGenerator) o;
|
||||
|
@ -180,7 +193,11 @@ public abstract class KeyPairGenerator extends KeyPairGeneratorSpi
|
|||
}
|
||||
else if (o instanceof KeyPairGeneratorSpi)
|
||||
result = new DummyKeyPairGenerator((KeyPairGeneratorSpi) o, algorithm);
|
||||
|
||||
else
|
||||
{
|
||||
sb.append("is of an unexpected Type: ").append(o.getClass().getName());
|
||||
throw new NoSuchAlgorithmException(sb.toString());
|
||||
}
|
||||
result.provider = provider;
|
||||
return result;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue