From 66bd8469e56cbe7c6bed823b376229a02ecdd37d Mon Sep 17 00:00:00 2001
From: J08nY
Date: Mon, 20 Feb 2017 20:46:59 +0100
Subject: removed newlines, changed f2m format, removed old SimpleAPDU

data:
 - now truly csv
 - f2m format now:
   m,e_1,e_2,e_3,a,b,gx,gy,r,k,wx,wy,s

reader:
 - removed SimpleAPDU
 - changed f2m format

applet:
 - changed f2m format
---
 src/cz/crcs/ectester/reader/Util.java | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'src/cz/crcs/ectester/reader/Util.java')

diff --git a/src/cz/crcs/ectester/reader/Util.java b/src/cz/crcs/ectester/reader/Util.java
index f876fe4..e297ab1 100644
--- a/src/cz/crcs/ectester/reader/Util.java
+++ b/src/cz/crcs/ectester/reader/Util.java
@@ -26,16 +26,28 @@ public class Util {
     }
 
     public static byte[] hexToBytes(String hex, boolean bigEndian) {
-        StringBuilder sb = new StringBuilder(hex.replace(" ", ""));
-        if (!bigEndian) {
-            sb.reverse();
-        }
-        int len = sb.length();
+        hex = hex.replace(" ", "");
+        int len = hex.length();
+        StringBuilder sb = new StringBuilder();
+
         if (len % 2 == 1) {
-            sb.insert(0, "0");
+            sb.append("0");
             ++len;
         }
 
+        if (bigEndian) {
+            sb.append(hex);
+        } else {
+            for (int i = 0; i < len / 2; ++i) {
+                if (sb.length() >= 2) {
+                    sb.insert(sb.length() - 2, hex.substring(2 * i, 2 * i + 2));
+                } else {
+                    sb.append(hex.substring(2 * i, 2 * i + 2));
+                }
+
+            }
+        }
+
         String data = sb.toString();
         byte[] result = new byte[len / 2];
         for (int i = 0; i < len; i += 2) {
-- 
cgit v1.2.3-70-g09d2