diff options
author | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-04 16:55:18 +0000 |
---|---|---|
committer | cfu <cfu@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2010-10-04 16:55:18 +0000 |
commit | 41f7377308d59e574b87b75d842b49d37b323fe3 (patch) | |
tree | e94797de7cb88bfaf3d0fd776f58a1422a09e3a0 /pki/base/kra | |
parent | f63b97108887f486efb7cb5b60bdd85b45c10a53 (diff) | |
download | pki-41f7377308d59e574b87b75d842b49d37b323fe3.tar.gz pki-41f7377308d59e574b87b75d842b49d37b323fe3.tar.xz pki-41f7377308d59e574b87b75d842b49d37b323fe3.zip |
Bug 504061 - ECC: unable to install subsystems (sub-CA, DRM, TKS, etc.) for an ECC CA (installation and starting ONLY. Run time issues are filed as separate bugs)
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1330 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/kra')
-rw-r--r-- | pki/base/kra/shared/webapps/kra/WEB-INF/web.xml | 2 | ||||
-rw-r--r-- | pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml index 3ac470aa1..7f4d72c32 100644 --- a/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml +++ b/pki/base/kra/shared/webapps/kra/WEB-INF/web.xml @@ -52,7 +52,7 @@ </init-param> <init-param> <param-name>panels</param-name> - <param-value>welcome=com.netscape.cms.servlet.csadmin.WelcomePanel,securitydomain=com.netscape.cms.servlet.csadmin.SecurityDomainPanel,securitydomain=com.netscape.cms.servlet.csadmin.DisplayCertChainPanel,subsystem=com.netscape.cms.servlet.csadmin.CreateSubsystemPanel,restorekeys=com.netscape.cms.servlet.csadmin.RestoreKeyCertPanel,databasepanel=com.netscape.cms.servlet.csadmin.DatabasePanel,modulepanel=com.netscape.cms.servlet.csadmin.ModulePanel,config_hsmloginpanel=com.netscape.cms.servlet.csadmin.ConfigHSMLoginPanel,sizepanel=com.netscape.cms.servlet.csadmin.SizePanel,namepanel=com.netscape.cms.servlet.csadmin.NamePanel,certrequestpanel=com.netscape.cms.servlet.csadmin.CertRequestPanel,backupkeys=com.netscape.cms.servlet.csadmin.BackupKeyCertPanel,savepk12=com.netscape.cms.servlet.csadmin.SavePKCS12Panel,adminpanel=com.netscape.cms.servlet.csadmin.AdminPanel,importadmincertpanel=com.netscape.cms.servlet.csadmin.ImportAdminCertPanel,donepanel=com.netscape.cms.servlet.csadmin.DonePanel</param-value> + <param-value>welcome=com.netscape.cms.servlet.csadmin.WelcomePanel,module=com.netscape.cms.servlet.csadmin.ModulePanel,confighsmlogin=com.netscape.cms.servlet.csadmin.ConfigHSMLoginPanel,securitydomain=com.netscape.cms.servlet.csadmin.SecurityDomainPanel,securitydomain=com.netscape.cms.servlet.csadmin.DisplayCertChainPanel,subsystem=com.netscape.cms.servlet.csadmin.CreateSubsystemPanel,restorekeys=com.netscape.cms.servlet.csadmin.RestoreKeyCertPanel,databasepanel=com.netscape.cms.servlet.csadmin.DatabasePanel,sizepanel=com.netscape.cms.servlet.csadmin.SizePanel,namepanel=com.netscape.cms.servlet.csadmin.NamePanel,certrequestpanel=com.netscape.cms.servlet.csadmin.CertRequestPanel,backupkeys=com.netscape.cms.servlet.csadmin.BackupKeyCertPanel,savepk12=com.netscape.cms.servlet.csadmin.SavePKCS12Panel,adminpanel=com.netscape.cms.servlet.csadmin.AdminPanel,importadmincertpanel=com.netscape.cms.servlet.csadmin.ImportAdminCertPanel,donepanel=com.netscape.cms.servlet.csadmin.DonePanel</param-value> </init-param> </servlet> diff --git a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java b/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java index 4fc65fcea..e7e0e9f64 100644 --- a/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java +++ b/pki/base/kra/src/com/netscape/kra/TransportKeyUnit.java @@ -38,6 +38,7 @@ import org.mozilla.jss.util.*; import org.mozilla.jss.crypto.*; import org.mozilla.jss.*; import org.mozilla.jss.crypto.PrivateKey; +import com.netscape.cmsutil.util.Cert; /** @@ -96,11 +97,11 @@ public class TransportKeyUnit extends EncryptionUnit implements try { mManager = CryptoManager.getInstance(); mCert = mManager.findCertByNickname(getNickName()); + String algo = config.getString("signingAlgorithm", "SHA256withRSA"); // #613795 - initialize this; otherwise JSS is not happy CryptoToken token = getToken(); - SignatureAlgorithm sigalg = - SignatureAlgorithm.RSASignatureWithMD5Digest; + SignatureAlgorithm sigalg = Cert.mapAlgorithmToJss(algo); Signature signer = token.getSignatureContext(sigalg); signer.initSign(getPrivateKey()); |