diff options
author | Jack Magne <jmagne@localhost.localdomain> | 2015-08-24 11:23:04 -0700 |
---|---|---|
committer | Jack Magne <jmagne@localhost.localdomain> | 2015-08-24 18:27:08 -0700 |
commit | 3158e1279b210d9f409918b24180bf20b0774614 (patch) | |
tree | 92507dc683c516adedd3901b380e347a4c9af5cc /base/tps | |
parent | 26a23f16f2d28bb8588f14c45bf81a871fffcb82 (diff) | |
download | pki-3158e1279b210d9f409918b24180bf20b0774614.tar.gz pki-3158e1279b210d9f409918b24180bf20b0774614.tar.xz pki-3158e1279b210d9f409918b24180bf20b0774614.zip |
SC650 format/enroll fails
Simple fix to correctly identify scp01/gp201 sc650 card.
Diffstat (limited to 'base/tps')
-rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 12 |
1 files changed, 11 insertions, 1 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 14e8eadbf..637cfa394 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -3402,10 +3402,20 @@ public class TPSProcessor { byte protocol = oidSecureChannelProtocol.at(length - 2); byte implementation = oidSecureChannelProtocol.at(length - 1); + if (protocol == SecureChannel.SECURE_PROTO_03) { + throw new TPSException("TPSProcessor.gp211GetSecureChannelProtocolDetails: No support for SCP03 as of yet, bailing.", + TPSStatus.STATUS_ERROR_SECURE_CHANNEL); + } + platProtInfo.setProtocol(protocol); platProtInfo.setImplementation(implementation); platProtInfo.setKeysetInfoData(keyData); - platProtInfo.setPlatform(SecureChannel.GP211); + + if (protocol == SecureChannel.SECURE_PROTO_02) + platProtInfo.setPlatform(SecureChannel.GP211); + else + platProtInfo.setPlatform(SecureChannel.GP201); + CMS.debug("TPSProcessor.gp211GetSecureChannelProtocolDetails: protocol: " + protocol + " implementation: " + implementation + " keyInfoData: " + keyData.toHexString()); |