diff options
Diffstat (limited to 'base/tps')
-rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 8 | ||||
-rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java | 12 |
2 files changed, 13 insertions, 7 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java index ff6420879..94e6497ce 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -33,6 +33,8 @@ import java.util.List; import java.util.Map; import java.util.Set; +import netscape.security.x509.RevocationReason; + import org.dogtagpki.server.tps.TPSSession; import org.dogtagpki.server.tps.TPSSubsystem; import org.dogtagpki.server.tps.authentication.AuthUIParameter; @@ -96,8 +98,6 @@ import com.netscape.certsrv.tps.token.TokenStatus; import com.netscape.cms.servlet.tks.SecureChannelProtocol; import com.netscape.symkey.SessionKey; -import netscape.security.x509.RevocationReason; - public class TPSProcessor { public static final int RESULT_NO_ERROR = 0; @@ -686,9 +686,6 @@ public class TPSProcessor { sessionKey = (PK11SymKey) protocol.unwrapWrappedSymKeyOnToken(token, sharedSecret, sessionKeyWrapped.toBytesArray(), false); - - - if (sessionKey == null) { CMS.debug("TPSProcessor.generateSecureChannel: Can't extract session key!"); throw new TPSException("TPSProcessor.generateSecureChannel: Can't extract session key!", @@ -708,7 +705,6 @@ public class TPSProcessor { TPSStatus.STATUS_ERROR_SECURE_CHANNEL); } - //CMS.debug("TPSProcessor.generateSecureChannel: retrieved enc session key: " + encSessionKey); CMS.debug("TPSProcessor.generateSecureChannel: retrieved enc session key"); TPSBuffer drmDesKey = null; diff --git a/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java b/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java index dab80e491..068293e60 100644 --- a/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java +++ b/base/tps/src/org/dogtagpki/server/tps/rest/TPSInstallerService.java @@ -142,11 +142,21 @@ public class TPSInstallerService extends SystemConfigService { ConfigurationUtils.exportTransportCert(secdomainURI, tksURI, transportCert); } + String doImportStr = request.getImportSharedSecret(); + CMS.debug("finalizeConfiguration: importSharedSecret:" + doImportStr); // generate shared secret from the tks + + boolean doImport = false; + + if("true".equalsIgnoreCase(doImportStr)) { + CMS.debug("finalizeConfiguration: importSharedSecret: importSharedSecret is true."); + doImport = true; + } + ConfigurationUtils.getSharedSecret( tksURI.getHost(), tksURI.getPort(), - Boolean.getBoolean(request.getImportSharedSecret())); + doImport); } catch (URISyntaxException e) { throw new BadRequestException("Invalid URI for CA, TKS or KRA"); |