diff options
| author | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-05-20 17:59:14 +0000 |
|---|---|---|
| committer | awnuk <awnuk@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> | 2011-05-20 17:59:14 +0000 |
| commit | af8a4c98ad17cfe67d383dbafb01d4f14ffdac6c (patch) | |
| tree | 0fccce3680ceec01ee1e98d292ef76915e74f2cb /pki/base/common/src/com/netscape/cms/servlet/cert | |
| parent | e13c10fa843dc1d00c1a93e8963977eb744980d4 (diff) | |
| download | pki-af8a4c98ad17cfe67d383dbafb01d4f14ffdac6c.tar.gz pki-af8a4c98ad17cfe67d383dbafb01d4f14ffdac6c.tar.xz pki-af8a4c98ad17cfe67d383dbafb01d4f14ffdac6c.zip | |
Fixed bugzilla bug #705914.
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@2002 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
Diffstat (limited to 'pki/base/common/src/com/netscape/cms/servlet/cert')
| -rw-r--r-- | pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java index 97dde1a31..246d9a478 100644 --- a/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java +++ b/pki/base/common/src/com/netscape/cms/servlet/cert/scep/CRSEnrollment.java @@ -173,6 +173,14 @@ public class CRSEnrollment extends HttpServlet mTokenName = scepConfig.getString("tokenname", ""); mUseCA = false; } + if (!(mTokenName.equalsIgnoreCase(Constants.PR_INTERNAL_TOKEN) || + mTokenName.equalsIgnoreCase("Internal Key Storage Token") || + mTokenName.length() == 0)) { + int i = mNickname.indexOf(':'); + if (!((i > -1) && (mTokenName.length() == i) && (mNickname.startsWith(mTokenName)))) { + mNickname = mTokenName + ":" + mNickname; + } + } } } catch (EBaseException e) { CMS.debug("CRSEnrollment: init: EBaseException: "+e); @@ -1979,10 +1987,7 @@ throws EBaseException { } else { keyStorageToken = cm.getTokenByName(mTokenName); internalKeyStorageToken = null; - mNickname = mTokenName + ":" + mNickname; - CMS.debug("CRSEnrollment: CryptoContext: token name: "+mTokenName+"'"); } - CMS.debug("CRSEnrollment: CryptoContext: mNickname: '"+mNickname+"'"); if (!mUseCA && internalKeyStorageToken == null) { PasswordCallback cb = CMS.getPasswordCallback(); keyStorageToken.login(cb); // ONE_TIME by default. |