diff options
| author | Christina Fu <cfu@redhat.com> | 2015-08-26 09:17:55 -0700 |
|---|---|---|
| committer | Christina Fu <cfu@redhat.com> | 2015-08-26 10:12:23 -0700 |
| commit | 0a97324178c8c6353e20dfe35e78699a44e89fd5 (patch) | |
| tree | ebb9700f614982496d63111f2acd77d2c224be69 /base/tps | |
| parent | fed1b713f79abdce56fc5e680c2b90ea8d0ea1af (diff) | |
| download | pki-0a97324178c8c6353e20dfe35e78699a44e89fd5.tar.gz pki-0a97324178c8c6353e20dfe35e78699a44e89fd5.tar.xz pki-0a97324178c8c6353e20dfe35e78699a44e89fd5.zip | |
Ticket 1307 - CUID range issue for [RFE] Support multiple keySets for different cards for ExternalReg
The patch fixes an issue that the CUID comes in from the client has a different
format than that of the config cuid range strings. With the right conversion,
the cuid range would then be evaluated correctly. The issue may only be
discovered with certain cuid data, as it was not reproduceable in the dev
environment.
Diffstat (limited to 'base/tps')
3 files changed, 5 insertions, 5 deletions
diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java index 185430f19..3045b5844 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSEnrollProcessor.java @@ -239,7 +239,7 @@ public class TPSEnrollProcessor extends TPSProcessor { if (!resolverInstName.equals("none") && (selectedKeySet == null)) { FilterMappingParams mappingParams = createFilterMappingParams(resolverInstName, - appletInfo.getCUIDhexString(), appletInfo.getMSNString(), + appletInfo.getCUIDhexStringPlain(), appletInfo.getMSNString(), appletInfo.getMajorVersion(), appletInfo.getMinorVersion()); TPSSubsystem subsystem = (TPSSubsystem) CMS.getSubsystem(TPSSubsystem.ID); @@ -267,7 +267,7 @@ public class TPSEnrollProcessor extends TPSProcessor { if (!resolverInstName.equals("none") && (selectedTokenType == null)) { FilterMappingParams mappingParams = createFilterMappingParams(resolverInstName, - appletInfo.getCUIDhexString(), appletInfo.getMSNString(), + appletInfo.getCUIDhexStringPlain(), appletInfo.getMSNString(), appletInfo.getMajorVersion(), appletInfo.getMinorVersion()); TPSSubsystem subsystem = (TPSSubsystem) CMS.getSubsystem(TPSSubsystem.ID); diff --git a/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java b/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java index 3a6c0df48..da2cab4d7 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSPinResetProcessor.java @@ -110,7 +110,7 @@ public class TPSPinResetProcessor extends TPSProcessor { if (!resolverInstName.equals("none") && (selectedTokenType == null)) { FilterMappingParams mappingParams = createFilterMappingParams(resolverInstName, - appletInfo.getCUIDhexString(), appletInfo.getMSNString(), + appletInfo.getCUIDhexStringPlain(), appletInfo.getMSNString(), appletInfo.getMajorVersion(), appletInfo.getMinorVersion()); TPSSubsystem subsystem = (TPSSubsystem) CMS.getSubsystem(TPSSubsystem.ID); 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 637cfa394..4a4f05c50 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -1866,7 +1866,7 @@ public class TPSProcessor { if (!resolverInstName.equals("none") && (selectedKeySet == null)) { FilterMappingParams mappingParams = createFilterMappingParams(resolverInstName, - appletInfo.getCUIDhexString(), appletInfo.getMSNString(), + appletInfo.getCUIDhexStringPlain(), appletInfo.getMSNString(), appletInfo.getMajorVersion(), appletInfo.getMinorVersion()); TPSSubsystem subsystem = (TPSSubsystem) CMS.getSubsystem(TPSSubsystem.ID); @@ -1894,7 +1894,7 @@ public class TPSProcessor { String resolverInstName = getResolverInstanceName(); if (!resolverInstName.equals("none") && (selectedKeySet == null)) { - FilterMappingParams mappingParams = createFilterMappingParams(resolverInstName, cuid, msn, major_version, minor_version); + FilterMappingParams mappingParams = createFilterMappingParams(resolverInstName, appletInfo.getCUIDhexStringPlain(), msn, major_version, minor_version); TPSSubsystem subsystem = (TPSSubsystem) CMS.getSubsystem(TPSSubsystem.ID); |