Secure Channel final steps.

This patch allows the current secure channel functionality to work with
both tpsclient and esc. In order to get esc to work the following changes
were needed.

1. It turns out the server has been been forcing chunked encoding format upon the
outgoing data. Turns out that the system already knows how to do this so we were
getting double chunk size values and getting twice the amount of CRLF chars.

2. There was a minor error where I was not attempting to select the card manager
applet but the coolkey applet, which does not exist yet.

1 files changed, 4 insertions, 17 deletions

diff --git a/base/common/src/org/dogtagpki/tps/TPSConnection.java b/base/common/src/org/dogtagpki/tps/TPSConnection.java
index 64f8cb906..d93827775 100644
--- a/base/common/src/org/dogtagpki/tps/TPSConnection.java
+++ b/base/common/src/org/dogtagpki/tps/TPSConnection.java
@@ -90,28 +90,15 @@ public class TPSConnection {
         String s = message.encode();
 
         CMS.debug("TPSMessage.write: Writing: " + s);
-
-        if (chunked) {
-            // send message length + EOL
-            out.print(Integer.toHexString(s.length()));
-            out.print("\r\n");
-        }
-
         // send message
         out.print(s);
 
-        /*
-         *
-         * Right now, tpsclient is counting the final crlf as part of the message and ruining the MAC calculations
-         * For now do this and figure out later how to handle this for both tpsclient and esc.
-         *
-        if (chunked) {
-            // send EOL
-            out.print("\r\n");
-        }
+        // We don't have to send any specific chunk format here
+        // The output stream detects chunked encoding and sends
+        // the correct output to the other end.
 
-        */
 
         out.flush();
     }
+
 }