Merge pull request #676 from fgonzal/fix/ksn-align-with-10-5-5

Serialize KSNs using 10-5-5.

Author: ar

jpos/src/main/java/org/jpos/security/KeySerialNumber.java

@@ -26,7 +26,6 @@
 import java.nio.ByteBuffer;
 import java.util.Objects;
 
-
 /**
  * Key Serial Number (also called Key Name in the ANSI X9.24).
  * Needed for deriving the Transaction Key when  DUKPT (Derived Unique Key Per
@@ -96,7 +95,7 @@ public byte[] getBaseKeyIDBytes () {
      * @return a String representing the device ID.
      */
     public String getDeviceID () {
-        return  String.format ("%06X", deviceId);
+        return  String.format ("%05X", deviceId);
     }
 
     /**
@@ -119,7 +118,7 @@ public byte[] getDeviceIDBytes () {
      * @return a String representing the transaction counter.
      */
     public String getTransactionCounter () {
-        return  String.format ("%06X", transactionCounter);
+        return  String.format ("%05X", transactionCounter);
     }
 
     /**

jpos/src/test/java/org/jpos/security/KeySerialNumberTest.java

@@ -28,14 +28,16 @@
 
 public class KeySerialNumberTest {
 
-
     @Test
-    public void testDump() throws Throwable {
+    public void testStringConstructor() throws Throwable {
         PrintStream p = new PrintStream(new ByteArrayOutputStream(), true, "UTF-8");
         Object[] objects = new Object[1];
         p.format("testKeySerialNumberParam1", objects);
-        new KeySerialNumber("FFFF987654", "3210E", "000008")
-                .dump(p, "testKeySerialNumberIndent");
+        KeySerialNumber ksn = new KeySerialNumber("FFFF987654", "3210E", "00008");
+        ksn.dump(p, "testKeySerialNumberIndent");
+        assertEquals("FFFF987654", ksn.getBaseKeyID());
+        assertEquals("3210E", ksn.getDeviceID());
+        assertEquals("00008", ksn.getTransactionCounter());
         assertTrue(true, "Test completed without Exception");
     }
 
@@ -44,8 +46,8 @@ public void testBinaryConstructor() {
         byte[] ksnBin = ISOUtil.hex2byte("9876543210E00008");
         KeySerialNumber ksn = new KeySerialNumber(ksnBin);
         assertEquals("FFFF987654", ksn.getBaseKeyID());
-        assertEquals("03210E", ksn.getDeviceID());
-        assertEquals("000008", ksn.getTransactionCounter());
+        assertEquals("3210E", ksn.getDeviceID());
+        assertEquals("00008", ksn.getTransactionCounter());
     }
 
     @Test