From 5efc2eced680c9d83f7099c06e6f0965c56ee0cf Mon Sep 17 00:00:00 2001
From: merlokk <807634+merlokk@users.noreply.github.com>
Date: Tue, 27 Nov 2018 12:28:36 +0200
Subject: [PATCH] refactoring

---
 client/fido/cbortools.c | 10 ++++++++++
 client/fido/cbortools.h |  2 ++
 client/fido/fidocore.c  | 10 ----------
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/client/fido/cbortools.c b/client/fido/cbortools.c
index 1693e6858..ad6931030 100644
--- a/client/fido/cbortools.c
+++ b/client/fido/cbortools.c
@@ -453,3 +453,13 @@ CborError CborGetStringValueBuf(CborValue *elm) {
 	
 	return CborGetStringValue(elm, stringBuf, sizeof(stringBuf), NULL);
 };
+
+int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
+	json_t *elm = json_object_get(root, rootElmId);
+	if (!elm)
+		return 1;
+	
+	int res = JsonToCbor(elm, encoder);
+
+	return res;
+}
diff --git a/client/fido/cbortools.h b/client/fido/cbortools.h
index a57b4b761..c7ef7658a 100644
--- a/client/fido/cbortools.h
+++ b/client/fido/cbortools.h
@@ -32,4 +32,6 @@ extern CborError CborGetArrayStringValue(CborValue *elm, char *data, size_t maxd
 extern CborError CborGetStringValue(CborValue *elm, char *data, size_t maxdatalen, size_t *datalen);
 extern CborError CborGetStringValueBuf(CborValue *elm);
 
+extern int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder);
+
 #endif /* __CBORTOOLS_H__ */
diff --git a/client/fido/fidocore.c b/client/fido/fidocore.c
index 22aee7c9f..651208441 100644
--- a/client/fido/fidocore.c
+++ b/client/fido/fidocore.c
@@ -298,16 +298,6 @@ int CBOREncodeClientDataHash(json_t *root, CborEncoder *encoder) {
 	return 0;
 }
 
-int CBOREncodeElm(json_t *root, char *rootElmId, CborEncoder *encoder) {
-	json_t *elm = json_object_get(root, rootElmId);
-	if (!elm)
-		return 1;
-	
-	int res = JsonToCbor(elm, encoder);
-
-	return res;
-}
-
 int FIDO2CreateMakeCredentionalReq(json_t *root, uint8_t *data, size_t maxdatalen, size_t *datalen) {
 	if (datalen)
 		*datalen = 0;