added jsontocbor function

client/fido/cbortools.c

@@ -12,7 +12,7 @@
 
 #include "cbortools.h"
 #include <stdlib.h>
-#include "cbor.h"
+#include "emv/emvjson.h"
 #include "util.h"
 #include "fidocore.h"
 
@@ -200,8 +200,6 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length) {
 	if (res)
 		return res;
 		
-	
-	
     CborError err = dumprecursive(cmdCode, &cb, false, 0);
 
 	if (err) {
@@ -210,6 +208,105 @@ int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length) {
 		return 1;
 	}	
 	
+	return 0;
+}
+
+int JsonObjElmCount(json_t *elm) {
+	int res = 0;
+	const char *key;
+	json_t *value;
+	
+	if (!json_is_object(elm))
+		return 0;
+	
+	json_object_foreach(elm, key, value) {
+		if (strlen(key) > 0 && key[0] != '.')
+			res++;		
+	}
+	
+	return res;
+}
+
+int JsonToCbor(json_t *elm, CborEncoder *encoder) {
+	if (!elm || !encoder)
+		return 1;
+
+	int res;
+	
+	// CBOR map == JSON object
+	if (json_is_object(elm)) {
+		CborEncoder map;
+		const char *key;
+		json_t *value;
+
+		res = cbor_encoder_create_map(encoder, &map, JsonObjElmCount(elm));
+		cbor_check(res);
+		
+		json_object_foreach(elm, key, value) {
+			if (strlen(key) > 0 && key[0] != '.') {
+				res = cbor_encode_text_stringz(&map, key);		
+				cbor_check(res);
+				
+				// RECURSION!
+				JsonToCbor(value, &map);
+			}
+		}
+		
+		res = cbor_encoder_close_container(encoder, &map);
+		cbor_check(res);
+	}
+
+	// CBOR array == JSON array
+	if (json_is_array(elm)) {
+		size_t index;
+		json_t *value;
+		CborEncoder array;
+		
+		res = cbor_encoder_create_array(encoder, &array, json_array_size(elm));
+		cbor_check(res);
+		
+		json_array_foreach(elm, index, value) {
+			// RECURSION!
+			JsonToCbor(value, &array);
+		}
+		
+		res = cbor_encoder_close_container(encoder, &array);
+		cbor_check(res);
+	}
+
+	if (json_is_boolean(elm)) {
+		res = cbor_encode_boolean(encoder, json_is_true(elm));
+		cbor_check(res);
+	}
+
+	if (json_is_integer(elm)) {
+		res = cbor_encode_int(encoder, json_integer_value(elm));
+		cbor_check(res);
+	}
+
+	if (json_is_real(elm)) {
+		res = cbor_encode_float(encoder, json_real_value(elm));
+		cbor_check(res);
+	}
+
+	if (json_is_string(elm)) {
+		const char * val = json_string_value(elm);
+		if (CheckStringIsHEXValue(val)) {
+			size_t datalen = 0;
+			uint8_t data[4096] = {0};
+			res = JsonLoadBufAsHex(elm, "$", data, sizeof(data), &datalen);
+			if (res)
+				return 100;
+
+			res = cbor_encode_byte_string(encoder, data, datalen);
+			cbor_check(res);			
+		} else {
+			res = cbor_encode_text_stringz(encoder, val);
+			cbor_check(res);
+		}
+	}
+	
+	
 	
 	return 0;
 }

client/fido/cbortools.h

@@ -15,7 +15,13 @@
 
 #include <stddef.h>
 #include <stdint.h>
+#include <jansson.h>
+#include <cbor.h>
+
+#define cbor_check_if(r) if ((r) != CborNoError) {return r;} else
+#define cbor_check(r) if ((r) != CborNoError) return r;
 
 extern int TinyCborPrintFIDOPackage(uint8_t cmdCode, uint8_t *data, size_t length);
+extern int JsonToCbor(json_t *elm, CborEncoder *encoder);
 
 #endif /* __CBORTOOLS_H__ */