Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bugscape bug 49314: code cleanup. Throw InvalidKeyException directly

Browse Source 
instead of NoSuchAlgorithmException.
This commit is contained in:
wtc%netscape.com 2003-08-07 21:45:35 +00:00
parent b3f8e51529
commit 1d0969818d
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
security/jss/org/mozilla/jss/provider/java/security/JSSSignatureSpi.java
View File

@ -32,24 +32,10 @@
*/
package org.mozilla.jss.provider.java.security;
/*
import java.security.SecureRandom;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.security.PublicKey;
import java.security.NoSuchProviderException;
import java.security.InvalidKeySpecException;
*/
import org.mozilla.jss.crypto.PrivateKey;
import java.security.*;
import java.security.spec.*;
import org.mozilla.jss.crypto.*;
/*
import java.security.SignatureException;
import java.security.spec.AlgorithmParameterSpec;
import java.security.InvalidAlgorithmParameterException;
import java.security.InvalidParameterException;
*/
class JSSSignatureSpi extends java.security.SignatureSpi {
@ -113,15 +99,15 @@ class JSSSignatureSpi extends java.security.SignatureSpi {
// convert the public key into a JSS public key if necessary
if( ! (publicKey instanceof org.mozilla.jss.pkcs11.PK11PubKey) ) {
KeyFactory fact = KeyFactory.getInstance(
publicKey.getAlgorithm(), "Mozilla-JSS");
if( ! publicKey.getFormat().equalsIgnoreCase("X.509") ) {
throw new NoSuchAlgorithmException(
throw new InvalidKeyException(
"Unsupported public key format: " +
publicKey.getFormat());
}
X509EncodedKeySpec encodedKey =
new X509EncodedKeySpec(publicKey.getEncoded());
KeyFactory fact = KeyFactory.getInstance(
publicKey.getAlgorithm(), "Mozilla-JSS");
publicKey = fact.generatePublic(encodedKey);
}