|
|
b93447 |
diff -rupN jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java jss-4.2.6.cfu/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java
|
|
|
b93447 |
--- jss-4.2.6/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java 2004-04-25 08:02:26.000000000 -0700
|
|
|
b93447 |
+++ jss-4.2.6.cfu/mozilla/security/jss/org/mozilla/jss/pkix/crmf/CertReqMsg.java 2009-07-27 13:38:38.197422000 -0700
|
|
|
b93447 |
@@ -130,6 +130,16 @@ public class CertReqMsg implements ASN1V
|
|
|
b93447 |
///////////////////////////////////////////////////////////////////////
|
|
|
b93447 |
|
|
|
b93447 |
public void verify() throws SignatureException,
|
|
|
b93447 |
+ InvalidKeyFormatException, NoSuchAlgorithmException,
|
|
|
b93447 |
+ org.mozilla.jss.CryptoManager.NotInitializedException,
|
|
|
b93447 |
+ TokenException, java.security.InvalidKeyException, IOException{
|
|
|
b93447 |
+
|
|
|
b93447 |
+ CryptoToken token = CryptoManager.getInstance()
|
|
|
b93447 |
+ .getInternalCryptoToken();
|
|
|
b93447 |
+ verify(token);
|
|
|
b93447 |
+ }
|
|
|
b93447 |
+
|
|
|
b93447 |
+ public void verify(CryptoToken token) throws SignatureException,
|
|
|
b93447 |
InvalidKeyFormatException, NoSuchAlgorithmException,
|
|
|
b93447 |
org.mozilla.jss.CryptoManager.NotInitializedException,
|
|
|
b93447 |
TokenException, java.security.InvalidKeyException, IOException{
|
|
|
b93447 |
@@ -149,8 +159,6 @@ public class CertReqMsg implements ASN1V
|
|
|
b93447 |
pubkey = (PublicKey) spi.toPublicKey();
|
|
|
b93447 |
}
|
|
|
b93447 |
|
|
|
b93447 |
- CryptoToken token = CryptoManager.getInstance()
|
|
|
b93447 |
- .getInternalCryptoToken();
|
|
|
b93447 |
SignatureAlgorithm sigAlg =
|
|
|
b93447 |
SignatureAlgorithm.fromOID(alg.getOID());
|
|
|
b93447 |
Signature sig = token.getSignatureContext(sigAlg);
|