|
 |
f8ded1 |
From 47fccfaa32bf327c56c5789f373e4d18c714556f Mon Sep 17 00:00:00 2001
|
|
|
f8ded1 |
From: Jack Magne <jmagne@redhat.com>
|
|
|
f8ded1 |
Date: Fri, 10 Nov 2017 15:55:36 -0800
|
|
|
f8ded1 |
Subject: [PATCH] ReFix for #2824 TPS new configuration to allow the protocol
|
|
|
f8ded1 |
of the to determine applet loaded.
|
|
|
f8ded1 |
|
|
|
f8ded1 |
The problem discovered was that in only the external registration case, there was a problem obtaining the protocol
|
|
|
f8ded1 |
information for the token being enrolled. This simple fix makes sure the protocol info is obtained correctly for external
|
|
|
f8ded1 |
reg and non external reg enrollment cases.
|
|
|
f8ded1 |
|
|
|
f8ded1 |
Change-Id: Iccd40adbdafd5e94e04cbb8c391bd2706e483a1f
|
|
|
f8ded1 |
(cherry picked from commit e48374cd8a744fad5a03f64e8685ec3b3c465553)
|
|
|
f8ded1 |
(cherry picked from commit 3718b369598c3ecfdb6733c25b08e4b51042423f)
|
|
|
f8ded1 |
---
|
|
|
f8ded1 |
.../src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 10 ++++++----
|
|
|
f8ded1 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
f8ded1 |
|
|
|
f8ded1 |
diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java
|
|
|
f8ded1 |
index 4ec277e..03d6532 100644
|
|
|
f8ded1 |
--- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java
|
|
|
f8ded1 |
+++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java
|
|
|
f8ded1 |
@@ -33,8 +33,6 @@ import java.util.List;
|
|
|
f8ded1 |
import java.util.Map;
|
|
|
f8ded1 |
import java.util.Set;
|
|
|
f8ded1 |
|
|
|
f8ded1 |
-import netscape.security.x509.RevocationReason;
|
|
|
f8ded1 |
-
|
|
|
f8ded1 |
import org.dogtagpki.server.tps.TPSSession;
|
|
|
f8ded1 |
import org.dogtagpki.server.tps.TPSSubsystem;
|
|
|
f8ded1 |
import org.dogtagpki.server.tps.authentication.AuthUIParameter;
|
|
|
f8ded1 |
@@ -102,6 +100,8 @@ import com.netscape.cms.servlet.tks.SecureChannelProtocol;
|
|
|
f8ded1 |
import com.netscape.cmsutil.crypto.CryptoUtil;
|
|
|
f8ded1 |
import com.netscape.symkey.SessionKey;
|
|
|
f8ded1 |
|
|
|
f8ded1 |
+import netscape.security.x509.RevocationReason;
|
|
|
f8ded1 |
+
|
|
|
f8ded1 |
public class TPSProcessor {
|
|
|
f8ded1 |
|
|
|
f8ded1 |
public static final int RESULT_NO_ERROR = 0;
|
|
|
f8ded1 |
@@ -556,8 +556,10 @@ public class TPSProcessor {
|
|
|
f8ded1 |
CMS.debug("TPSProcessor.setupSecureChannel: obtained randomData");
|
|
|
f8ded1 |
}
|
|
|
f8ded1 |
|
|
|
f8ded1 |
- // We already do this when checking for applet upgrade earlier.
|
|
|
f8ded1 |
- //acquireChannelPlatformAndProtocolInfo();
|
|
|
f8ded1 |
+ // Do this on behalf of external reg, which needs it
|
|
|
f8ded1 |
+ // If already called, the routine will return anyway.
|
|
|
f8ded1 |
+
|
|
|
f8ded1 |
+ acquireChannelPlatformAndProtocolInfo();
|
|
|
f8ded1 |
|
|
|
f8ded1 |
TPSBuffer initUpdateResp = initializeUpdate(keyVersion, keyIndex, randomData);
|
|
|
f8ded1 |
|
|
|
f8ded1 |
--
|
|
|
f8ded1 |
1.8.3.1
|
|
|
f8ded1 |
|