diff options
author | Jack Magne <jmagne@localhost.localdomain> | 2015-08-24 18:21:50 -0700 |
---|---|---|
committer | Jack Magne <jmagne@localhost.localdomain> | 2015-08-24 18:23:44 -0700 |
commit | 891f4c5e5de76c18736ecb6ad9f73292295dc969 (patch) | |
tree | f43631f4cdfa06c255d059f56697479207bef0aa /base/tps/src | |
parent | 48b05ac5f588a58a75867653a78a844508f2fb3e (diff) | |
download | pki-891f4c5e5de76c18736ecb6ad9f73292295dc969.tar.gz pki-891f4c5e5de76c18736ecb6ad9f73292295dc969.tar.xz pki-891f4c5e5de76c18736ecb6ad9f73292295dc969.zip |
Reverse previous merge commit.
Diffstat (limited to 'base/tps/src')
-rw-r--r-- | base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java | 12 |
1 files changed, 1 insertions, 11 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 637cfa394..14e8eadbf 100644 --- a/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java +++ b/base/tps/src/org/dogtagpki/server/tps/processor/TPSProcessor.java @@ -3402,20 +3402,10 @@ 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); - - if (protocol == SecureChannel.SECURE_PROTO_02) - platProtInfo.setPlatform(SecureChannel.GP211); - else - platProtInfo.setPlatform(SecureChannel.GP201); - + platProtInfo.setPlatform(SecureChannel.GP211); CMS.debug("TPSProcessor.gp211GetSecureChannelProtocolDetails: protocol: " + protocol + " implementation: " + implementation + " keyInfoData: " + keyData.toHexString()); |