Resolved Conflicts

[proxmark3-svn] / client / emv / emvjson.c

diff --git a/client/emv/emvjson.c b/client/emv/emvjson.c
index 022974358c4d04d0256a97faeef4334a2864aa86..116e16da1aba34b6e3814a2ab0af46cbb9365b3d 100644 (file)
--- a/client/emv/emvjson.c
+++ b/client/emv/emvjson.c
@@ -68,24 +68,40 @@ char* GetApplicationDataName(tlv_tag_t tag) {
        return NULL;
 }
 
        return NULL;
 }
 

-int JsonSaveStr(json_t *root, char *path, char *value) {
+int JsonSaveJsonObject(json_t *root, char *path, json_t *value) {

        json_error_t error;
 
        if (strlen(path) < 1)
                return 1;
        
        if (path[0] == '$') {
        json_error_t error;
 
        if (strlen(path) < 1)
                return 1;
        
        if (path[0] == '$') {

-               if (json_path_set(root, path, json_string(value), 0, &error)) {
+               if (json_path_set(root, path, value, 0, &error)) {

                        PrintAndLog("ERROR: can't set json path: ", error.text);
                        return 2;
                } else {
                        return 0;
                }
        } else {
                        PrintAndLog("ERROR: can't set json path: ", error.text);
                        return 2;
                } else {
                        return 0;
                }
        } else {

-               return json_object_set_new(root, path, json_string(value));
+               return json_object_set_new(root, path, value);

        }
        }

+}
+
+int JsonSaveInt(json_t *root, char *path, int value) {
+       return JsonSaveJsonObject(root, path, json_integer(value));
+}
+
+int JsonSaveStr(json_t *root, char *path, char *value) {
+       return JsonSaveJsonObject(root, path, json_string(value));

 };
 
 };
 

+int JsonSaveBufAsHexCompact(json_t *elm, char *path, uint8_t *data, size_t datalen) {
+       char * msg = sprint_hex_inrow(data, datalen);
+       if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
+               msg[strlen(msg) - 1] = '\0';
+
+       return JsonSaveStr(elm, path, msg);
+}
+

 int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
        char * msg = sprint_hex(data, datalen);
        if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')
 int JsonSaveBufAsHex(json_t *elm, char *path, uint8_t *data, size_t datalen) {
        char * msg = sprint_hex(data, datalen);
        if (msg && strlen(msg) && msg[strlen(msg) - 1] == ' ')


@@ -248,6 +264,37 @@ bool HexToBuffer(const char *errormsg, const char *hexvalue, uint8_t * buffer, s
        return true;
 }
 
        return true;
 }
 

+int JsonLoadStr(json_t *root, char *path, char *value) {
+       if (!value)
+               return 1;
+
+       json_t *jelm = json_path_get((const json_t *)root, path);
+       if (!jelm || !json_is_string(jelm))
+               return 2;
+       
+       const char * strval = json_string_value(jelm);
+       if (!strval)
+               return 1;
+       
+       memcpy(value, strval, strlen(strval));
+       
+       return 0;
+}
+
+int JsonLoadBufAsHex(json_t *elm, char *path, uint8_t *data, size_t maxbufferlen, size_t *datalen) {
+       if (datalen)
+               *datalen = 0;
+       
+       json_t *jelm = json_path_get((const json_t *)elm, path);
+       if (!jelm || !json_is_string(jelm))
+               return 1;
+       
+       if (!HexToBuffer("ERROR load", json_string_value(jelm), data, maxbufferlen, datalen))
+               return 2;
+       
+       return 0;
+};
+

 bool ParamLoadFromJson(struct tlvdb *tlv) {
        json_t *root;
        json_error_t error;
 bool ParamLoadFromJson(struct tlvdb *tlv) {
        json_t *root;
        json_error_t error;