Initial enrollment progress.

1. Changed the names of some message classes.
2. Did some minor refactoring of methods needed by both the enroll and tps processor.
3. Created classes to handle the parsing and archival of PKCS#11 token data.
4. Created prep code for enrollment that reads in a bunch of config params and creates
convenience objects to carry the data instead of lengthy parameter lists we have had before.
5. Code to generate key on token, tested tpsclient so far.
6. Additional review changes, and merging.

Review changes.

21 files changed, 123 insertions, 52 deletions

diff --git a/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyAPDU.java b/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyAPDU.java
index f11f132be..44b942f23 100644
--- a/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyAPDU.java
+++ b/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyAPDU.java
@@ -46,10 +46,15 @@ public class GenerateKeyAPDU extends APDU {
         data.add((byte) wrapped_challenge.size());
         data.add(wrapped_challenge);
 
-        data.add((byte) key_check.size());
+        if (key_check != null) {
+            data.add((byte) key_check.size());
 
-        if (key_check.size() > 0) {
-            data.add(key_check);
+            if (key_check.size() > 0) {
+                data.add(key_check);
+            }
+
+        } else {
+            data.add((byte) 0);
         }
 
     }
diff --git a/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyECCAPDU.java b/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyECCAPDU.java
index 6743822ad..8d4a758ea 100644
--- a/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyECCAPDU.java
+++ b/base/common/src/org/dogtagpki/tps/apdu/GenerateKeyECCAPDU.java
@@ -49,10 +49,15 @@ public class GenerateKeyECCAPDU extends APDU {
 
         data1.add(wrapped_challenge);
 
-        data1.add((byte) key_check.size());
+        if (key_check != null) {
+            data1.add((byte) key_check.size());
 
-        if (key_check.size() > 0) {
-            data1.add(key_check);
+            if (key_check.size() > 0) {
+                data1.add(key_check);
+            }
+
+        } else {
+            data1.add((byte) 0);
         }
 
         setData(data1);
diff --git a/base/common/src/org/dogtagpki/tps/main/TPSBuffer.java b/base/common/src/org/dogtagpki/tps/main/TPSBuffer.java
index ef40a3a36..d522c2ab4 100644
--- a/base/common/src/org/dogtagpki/tps/main/TPSBuffer.java
+++ b/base/common/src/org/dogtagpki/tps/main/TPSBuffer.java
@@ -220,6 +220,15 @@ public class TPSBuffer {
     }
 
     /**
+     * Get the SubString from start to the end
+     * @param start
+     * @return
+     */
+    public TPSBuffer substr(int start) {
+        return substr(start,buf.length -2);
+    }
+
+    /**
      * dump()s this Buffer to stdout.
      */
     public void dump() {
@@ -254,6 +263,58 @@ public class TPSBuffer {
         return result.toString();
     }
 
+    public int getIntFrom1Byte(int offset) {
+
+        if (offset < 0 || offset >= (this.size())) {
+            return 0;
+        }
+
+        int result = (this.at(offset) & 0xff);
+
+        return result;
+    }
+
+    public int getIntFrom2Bytes(int offset) {
+
+        if (offset < 0 || offset >= (this.size() - 1)) {
+            return 0;
+        }
+
+        int i1 = (this.at(offset) & 0xff) << 8;
+        int i2 = this.at(offset + 1) & 0xff;
+
+        return i1 + i2;
+    }
+
+    public void addLong4Bytes(long value) {
+
+        this.add((byte) ((value >> 24) & 0xff));
+
+        this.add((byte) ((value >> 16) & 0xff));
+        this.add((byte) ((value >> 8) & 0xff));
+        this.add((byte) (value & 0xff));
+    }
+
+    public void addInt2Bytes(int value) {
+        this.add((byte) ((value >> 8) & 0xff));
+        this.add((byte) (value & 0xff));
+    }
+
+    public long getLongFrom4Bytes(int offset) {
+
+        if (offset < 0 || offset >= (this.size() - 3)) {
+            return 0;
+        }
+
+        long l1 = (long) (this.at(offset + 0) & 0xff) << 24;
+
+        long l2 = (long) (this.at(offset + 1) & 0xff) << 16;
+        long l3 = (long) (this.at(offset + 2) & 0xff) << 8;
+        long l4 = this.at(offset + 3) & 0xff;
+
+        return l1 + l2 + l3 + l4;
+    }
+
     public static void main(String[] args) {
 
         byte[] first = { 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49, 0x4a };
diff --git a/base/common/src/org/dogtagpki/tps/main/TPSException.java b/base/common/src/org/dogtagpki/tps/main/TPSException.java
index ee3ef5793..0d89aae5b 100644
--- a/base/common/src/org/dogtagpki/tps/main/TPSException.java
+++ b/base/common/src/org/dogtagpki/tps/main/TPSException.java
@@ -17,7 +17,7 @@
 // --- END COPYRIGHT BLOCK ---
 package org.dogtagpki.tps.main;
 
-import org.dogtagpki.tps.msg.EndOp.TPSStatus;
+import org.dogtagpki.tps.msg.EndOpMsg.TPSStatus;
 
 import com.netscape.certsrv.base.EBaseException;
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/ASQRequest.java b/base/common/src/org/dogtagpki/tps/msg/ASQRequestMsg.java
index 2c9be5d86..f6d3aed92 100644
--- a/base/common/src/org/dogtagpki/tps/msg/ASQRequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/ASQRequestMsg.java
@@ -18,8 +18,8 @@
 package org.dogtagpki.tps.msg;
 
 
-public class ASQRequest extends TPSMessage {
-    public ASQRequest(String question) {
+public class ASQRequestMsg extends TPSMessage {
+    public ASQRequestMsg(String question) {
 
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_ASQ_REQUEST));
         put(QUESTION_NAME,question);
diff --git a/base/common/src/org/dogtagpki/tps/msg/ASQResponse.java b/base/common/src/org/dogtagpki/tps/msg/ASQResponseMsg.java
index bbc7d1bf2..1f093ab17 100644
--- a/base/common/src/org/dogtagpki/tps/msg/ASQResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/ASQResponseMsg.java
@@ -18,9 +18,9 @@
 package org.dogtagpki.tps.msg;
 
 
-public class ASQResponse extends TPSMessage {
+public class ASQResponseMsg extends TPSMessage {
 
-    public ASQResponse(String answer) {
+    public ASQResponseMsg(String answer) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_ASQ_RESPONSE));
         put(QUESTION_NAME,answer);
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/BeginOp.java b/base/common/src/org/dogtagpki/tps/msg/BeginOpMsg.java
index de12660f2..250e5c038 100644
--- a/base/common/src/org/dogtagpki/tps/msg/BeginOp.java
+++ b/base/common/src/org/dogtagpki/tps/msg/BeginOpMsg.java
@@ -21,11 +21,11 @@ import java.util.Map;
 
 import com.netscape.certsrv.apps.CMS;
 
-public class BeginOp extends TPSMessage {
+public class BeginOpMsg extends TPSMessage {
 
     private Map<String, String> extensions;
 
-    public BeginOp(OpType theOp, Map<String, String> theExtensions) {
+    public BeginOpMsg(OpType theOp, Map<String, String> theExtensions) {
 
         CMS.debug("BeingOp op: " + theOp + " extensions: " + theExtensions);
         put(OPERATION_TYPE_NAME, opTypeToInt(theOp));
diff --git a/base/common/src/org/dogtagpki/tps/msg/EndOp.java b/base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java
index fbb2f93c6..251898591 100644
--- a/base/common/src/org/dogtagpki/tps/msg/EndOp.java
+++ b/base/common/src/org/dogtagpki/tps/msg/EndOpMsg.java
@@ -19,7 +19,7 @@ package org.dogtagpki.tps.msg;
 
 
 
-public class EndOp extends TPSMessage {
+public class EndOpMsg extends TPSMessage {
 
     public enum TPSStatus {
         STATUS_NO_ERROR,
@@ -75,7 +75,7 @@ public class EndOp extends TPSMessage {
     public static final int  RESULT_ERROR = 1;
 
 
-    public EndOp(OpType theOp, int result, TPSStatus message) {
+    public EndOpMsg(OpType theOp, int result, TPSStatus message) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_END_OP));
         put(OPERATION_TYPE_NAME, opTypeToInt(theOp));
         put(RESULT_NAME, result);
@@ -235,7 +235,7 @@ public class EndOp extends TPSMessage {
 
     public static void main(String[] args) {
 
-        EndOp end_msg = new EndOp(OpType.OP_FORMAT,0,TPSStatus.STATUS_NO_ERROR);
+        EndOpMsg end_msg = new EndOpMsg(OpType.OP_FORMAT,0,TPSStatus.STATUS_NO_ERROR);
         System.out.println(end_msg.encode());
 
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginRequest.java b/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginRequestMsg.java
index 77081654b..e59f80fff 100644
--- a/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginRequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginRequestMsg.java
@@ -24,11 +24,11 @@ import java.util.Set;
 
 import org.dogtagpki.tps.main.Util;
 
-public class ExtendedLoginRequest extends TPSMessage {
+public class ExtendedLoginRequestMsg extends TPSMessage {
 
     private Set<String> params;
 
-    public ExtendedLoginRequest(int invalid_pw, int blocked, Set<String> params, String title, String description) {
+    public ExtendedLoginRequestMsg(int invalid_pw, int blocked, Set<String> params, String title, String description) {
 
         put(INVALID_PWD_NAME, invalid_pw);
         put(BLOCKED_NAME, blocked);
@@ -82,7 +82,7 @@ public class ExtendedLoginRequest extends TPSMessage {
         params.add("id=UID&name=LDAP User ID&desc=LDAP User ID&type=string&option=");
         params.add("id=PASSWORD&name=LDAP Password&desc=LDAP Password&type=password&option=");
 
-        ExtendedLoginRequest ext_login_req = new ExtendedLoginRequest(0, 0, params, title, description);
+        ExtendedLoginRequestMsg ext_login_req = new ExtendedLoginRequestMsg(0, 0, params, title, description);
 
         System.out.println(ext_login_req.encode());
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginResponse.java b/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginResponseMsg.java
index 29e9b72af..173a775f4 100644
--- a/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/ExtendedLoginResponseMsg.java
@@ -20,11 +20,11 @@ package org.dogtagpki.tps.msg;
 import java.util.HashMap;
 import java.util.Map;
 
-public class ExtendedLoginResponse extends TPSMessage {
+public class ExtendedLoginResponseMsg extends TPSMessage {
 
     private Map<String, String> authParams;
 
-    public ExtendedLoginResponse(String msg) {
+    public ExtendedLoginResponseMsg(String msg) {
 
         super(msg);
 
@@ -32,7 +32,7 @@ public class ExtendedLoginResponse extends TPSMessage {
         //ToDo process the actual params
     }
 
-    public ExtendedLoginResponse(OpType theOp, String uid, String password, Map<String, String> theExtensions) {
+    public ExtendedLoginResponseMsg(OpType theOp, String uid, String password, Map<String, String> theExtensions) {
 
         put(OPERATION_TYPE_NAME, opTypeToInt(theOp));
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_EXTENDED_LOGIN_RESPONSE));
diff --git a/base/common/src/org/dogtagpki/tps/msg/LoginRequest.java b/base/common/src/org/dogtagpki/tps/msg/LoginRequestMsg.java
index 857aaacef..922927fc2 100644
--- a/base/common/src/org/dogtagpki/tps/msg/LoginRequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/LoginRequestMsg.java
@@ -18,9 +18,9 @@
 package org.dogtagpki.tps.msg;
 
 
-public class LoginRequest extends TPSMessage {
+public class LoginRequestMsg extends TPSMessage {
 
-    public LoginRequest(int invalid_pwd, int blocked) {
+    public LoginRequestMsg(int invalid_pwd, int blocked) {
 
         put(INVALID_PWD_NAME, invalid_pwd);
         put(BLOCKED_NAME,blocked);
diff --git a/base/common/src/org/dogtagpki/tps/msg/LoginResponse.java b/base/common/src/org/dogtagpki/tps/msg/LoginResponseMsg.java
index afde6849b..71096d261 100644
--- a/base/common/src/org/dogtagpki/tps/msg/LoginResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/LoginResponseMsg.java
@@ -18,9 +18,9 @@
 package org.dogtagpki.tps.msg;
 
 
-public class LoginResponse  extends TPSMessage {
+public class LoginResponseMsg  extends TPSMessage {
 
-    public LoginResponse(String uid, String password ) {
+    public LoginResponseMsg(String uid, String password ) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_LOGIN_RESPONSE));
         put(SCREEN_NAME_NAME,uid);
         put(PASSWORD_NAME, password);
diff --git a/base/common/src/org/dogtagpki/tps/msg/NewPinRequest.java b/base/common/src/org/dogtagpki/tps/msg/NewPinRequestMsg.java
index da4e098c2..5deac3642 100644
--- a/base/common/src/org/dogtagpki/tps/msg/NewPinRequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/NewPinRequestMsg.java
@@ -18,8 +18,8 @@
 package org.dogtagpki.tps.msg;
 
 
-public class NewPinRequest extends TPSMessage {
-    public NewPinRequest(int min_len, int max_len) {
+public class NewPinRequestMsg extends TPSMessage {
+    public NewPinRequestMsg(int min_len, int max_len) {
 
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_NEW_PIN_REQUEST));
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/NewPinResponse.java b/base/common/src/org/dogtagpki/tps/msg/NewPinResponseMsg.java
index eedb9e336..1607a4e1d 100644
--- a/base/common/src/org/dogtagpki/tps/msg/NewPinResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/NewPinResponseMsg.java
@@ -18,8 +18,8 @@
 package org.dogtagpki.tps.msg;
 
 
-public class NewPinResponse  extends TPSMessage {
-    public NewPinResponse(String new_pin) {
+public class NewPinResponseMsg  extends TPSMessage {
+    public NewPinResponseMsg(String new_pin) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_NEW_PIN_RESPONSE));
         put(NEW_PIN_NAME,new_pin);
     }
diff --git a/base/common/src/org/dogtagpki/tps/msg/SecureIdRequest.java b/base/common/src/org/dogtagpki/tps/msg/SecureIdRequestMsg.java
index 12e637e70..c03b3d733 100644
--- a/base/common/src/org/dogtagpki/tps/msg/SecureIdRequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/SecureIdRequestMsg.java
@@ -18,8 +18,8 @@
 package org.dogtagpki.tps.msg;
 
 
-public class SecureIdRequest extends TPSMessage {
-    public SecureIdRequest(int pin_required, int next_value) {
+public class SecureIdRequestMsg extends TPSMessage {
+    public SecureIdRequestMsg(int pin_required, int next_value) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_SECUREID_REQUEST));
 
         put(PIN_REQUIRED_NAME,pin_required);
diff --git a/base/common/src/org/dogtagpki/tps/msg/SecureIdResponse.java b/base/common/src/org/dogtagpki/tps/msg/SecureIdResponseMsg.java
index 47f245c86..507a46f67 100644
--- a/base/common/src/org/dogtagpki/tps/msg/SecureIdResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/SecureIdResponseMsg.java
@@ -17,8 +17,8 @@
 // --- END COPYRIGHT BLOCK ---
 package org.dogtagpki.tps.msg;
 
-public class SecureIdResponse extends TPSMessage {
-    public SecureIdResponse(String value, String pin) {
+public class SecureIdResponseMsg extends TPSMessage {
+    public SecureIdResponseMsg(String value, String pin) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_SECUREID_RESPONSE));
 
         put(VALUE_NAME,value);
diff --git a/base/common/src/org/dogtagpki/tps/msg/StatusUpdateRequest.java b/base/common/src/org/dogtagpki/tps/msg/StatusUpdateRequestMsg.java
index db742c378..12009fd6e 100644
--- a/base/common/src/org/dogtagpki/tps/msg/StatusUpdateRequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/StatusUpdateRequestMsg.java
@@ -17,8 +17,8 @@
 // --- END COPYRIGHT BLOCK ---
 package org.dogtagpki.tps.msg;
 
-public class StatusUpdateRequest extends TPSMessage {
-    public StatusUpdateRequest(int status, String info) {
+public class StatusUpdateRequestMsg extends TPSMessage {
+    public StatusUpdateRequestMsg(int status, String info) {
 
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_STATUS_UPDATE_REQUEST));
         put(STATUS_NAME, status);
@@ -28,7 +28,7 @@ public class StatusUpdateRequest extends TPSMessage {
 
     public static void main(String[] args) {
 
-        StatusUpdateRequest req = new StatusUpdateRequest(10, "PROGRESS_APPLET_BLOCK");
+        StatusUpdateRequestMsg req = new StatusUpdateRequestMsg(10, "PROGRESS_APPLET_BLOCK");
         System.out.println(req.encode());
 
     }
diff --git a/base/common/src/org/dogtagpki/tps/msg/StatusUpdateResponse.java b/base/common/src/org/dogtagpki/tps/msg/StatusUpdateResponseMsg.java
index 1de95b820..7dc0727f6 100644
--- a/base/common/src/org/dogtagpki/tps/msg/StatusUpdateResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/StatusUpdateResponseMsg.java
@@ -18,9 +18,9 @@
 package org.dogtagpki.tps.msg;
 
 
-public class StatusUpdateResponse extends TPSMessage {
+public class StatusUpdateResponseMsg extends TPSMessage {
 
-    public StatusUpdateResponse(int status) {
+    public StatusUpdateResponseMsg(int status) {
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_STATUS_UPDATE_RESPONSE));
         put(STATUS_NAME,status);
     }
diff --git a/base/common/src/org/dogtagpki/tps/msg/TPSMessage.java b/base/common/src/org/dogtagpki/tps/msg/TPSMessage.java
index 39af93c7d..16fec1dd8 100644
--- a/base/common/src/org/dogtagpki/tps/msg/TPSMessage.java
+++ b/base/common/src/org/dogtagpki/tps/msg/TPSMessage.java
@@ -441,7 +441,7 @@ public class TPSMessage {
 
         switch (val) {
         case MSG_BEGIN_OP:
-            result = new BeginOp(op_val, extsMap);
+            result = new BeginOpMsg(op_val, extsMap);
 
             break;
         case MSG_ASQ_REQUEST:
@@ -454,7 +454,7 @@ public class TPSMessage {
             break;
         case MSG_EXTENDED_LOGIN_RESPONSE:
             result =
-                new ExtendedLoginResponse(op_val,
+                new ExtendedLoginResponseMsg(op_val,
                     get(SCREEN_NAME_NAME),
                     get(PASSWORD_NAME),
                     extsMap);
@@ -463,7 +463,7 @@ public class TPSMessage {
             break;
         case MSG_LOGIN_RESPONSE:
             result =
-                new LoginResponse(get(SCREEN_NAME_NAME),
+                new LoginResponseMsg(get(SCREEN_NAME_NAME),
                     get(PASSWORD_NAME));
             break;
         case MSG_NEW_PIN_REQUEST:
@@ -482,12 +482,12 @@ public class TPSMessage {
             CMS.debug("statusValue: " + statusValue);
             int statusInt = Integer.parseInt(statusValue);
             CMS.debug("statusInt: " + statusInt);
-            result = new StatusUpdateResponse(statusInt);
+            result = new StatusUpdateResponseMsg(statusInt);
             break;
         case MSG_TOKEN_PDU_REQUEST:
             break;
         case MSG_TOKEN_PDU_RESPONSE:
-            result = new TokenPDUResponse(encode());
+            result = new TokenPDUResponseMsg(encode());
             break;
         default:
             //Something was garbled with the message coming in
@@ -519,7 +519,7 @@ public class TPSMessage {
 
     public static void main(String[] args) throws IOException {
         String encoded = "s=204&msg_type=2&operation=5&extensions=tokenType%3DuserKey%26clientVersion%3DESC+1%2E0%2E1%26tokenATR%3D3BFF1400FF8131FE458025A00000005657534336353003003B%26statusUpdate%3Dtrue%26extendedLoginRequest%3Dtrue%26";
-        BeginOp testMessage = (BeginOp) TPSMessage.createMessage(encoded);
+        BeginOpMsg testMessage = (BeginOpMsg) TPSMessage.createMessage(encoded);
         System.out.println("Encoded msg: " + testMessage.encode());
         System.out.println("msg Extensions: " + testMessage.getExtensions());
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/TokenPDURequest.java b/base/common/src/org/dogtagpki/tps/msg/TokenPDURequestMsg.java
index e27f98416..42fcf257c 100644
--- a/base/common/src/org/dogtagpki/tps/msg/TokenPDURequest.java
+++ b/base/common/src/org/dogtagpki/tps/msg/TokenPDURequestMsg.java
@@ -22,9 +22,9 @@ import org.dogtagpki.tps.apdu.SelectAPDU;
 import org.dogtagpki.tps.main.TPSBuffer;
 import org.dogtagpki.tps.main.Util;
 
-public class TokenPDURequest extends TPSMessage {
+public class TokenPDURequestMsg extends TPSMessage {
 
-    public TokenPDURequest(APDU apdu) {
+    public TokenPDURequestMsg(APDU apdu) {
 
         put(MSG_TYPE_NAME, msgTypeToInt(MsgType.MSG_TOKEN_PDU_REQUEST));
 
@@ -52,7 +52,7 @@ public class TokenPDURequest extends TPSMessage {
 
         apdu = new SelectAPDU((byte) 0x4, (byte) 0x0, select);
 
-        TokenPDURequest request = new TokenPDURequest(apdu);
+        TokenPDURequestMsg request = new TokenPDURequestMsg(apdu);
 
         System.out.println(request.encode());
 
diff --git a/base/common/src/org/dogtagpki/tps/msg/TokenPDUResponse.java b/base/common/src/org/dogtagpki/tps/msg/TokenPDUResponseMsg.java
index b654e80cc..60e079bf9 100644
--- a/base/common/src/org/dogtagpki/tps/msg/TokenPDUResponse.java
+++ b/base/common/src/org/dogtagpki/tps/msg/TokenPDUResponseMsg.java
@@ -21,11 +21,11 @@ import org.dogtagpki.tps.apdu.APDUResponse;
 import org.dogtagpki.tps.main.TPSBuffer;
 import org.dogtagpki.tps.main.Util;
 
-public class TokenPDUResponse extends TPSMessage {
+public class TokenPDUResponseMsg extends TPSMessage {
 
     private APDUResponse response;
 
-    public TokenPDUResponse(String message) {
+    public TokenPDUResponseMsg(String message) {
 
         super(message);
         response = null;
@@ -54,12 +54,12 @@ public class TokenPDUResponse extends TPSMessage {
     public static void main(String[] args) {
 
         String pdu_data = "s=46&msg_type=10&pdu_size=6&pdu_data=R%B3F%85%90%00";
-        TokenPDUResponse msg = new TokenPDUResponse(pdu_data);
+        TokenPDUResponseMsg msg = new TokenPDUResponseMsg(pdu_data);
 
         System.out.println(msg.encode());
 
         String pdu_data1 = "s=38&msg_type=10&pdu_size=2&pdu_data=%90%00";
-        TokenPDUResponse msg1 = new TokenPDUResponse(pdu_data1);
+        TokenPDUResponseMsg msg1 = new TokenPDUResponseMsg(pdu_data1);
 
         System.out.println(msg1.encode());