Revert back cbor related patches.

[platform/upstream/iotivity.git] / resource / csdk / security / unittest / srmtestcommon.cpp

diff --git a/resource/csdk/security/unittest/srmtestcommon.cpp b/resource/csdk/security/unittest/srmtestcommon.cpp
index 8e8f186..6f51329 100644 (file)
--- a/resource/csdk/security/unittest/srmtestcommon.cpp
+++ b/resource/csdk/security/unittest/srmtestcommon.cpp
@@ -21,12 +21,7 @@
 #include "gtest/gtest.h"
 #include "oic_malloc.h"
 #include "ocstack.h"
-#include <stdlib.h>
 
-#define STRINGIZE2(x) #x
-#define STRINGIZE(x) STRINGIZE2(x)
-
-// TODO: Remove this, once all cbor related are completed.
 char* ReadFile(const char* filename)
 {
 
@@ -59,61 +54,6 @@ char* ReadFile(const char* filename)
     return data;
 }
 
-bool ReadCBORFile(const char* filename, uint8_t **data, size_t *size)
-{
-    bool status = false;
-    if (!data || !size)
-    {
-        printf("Passed parameter are INVALID \n");
-        return status;
-    }
-    int len = strlen(STRINGIZE(SECURITY_BUILD_UNITTEST_DIR)) + strlen(filename) + 1;
-    char *filepath = (char *)OICCalloc(1, len);
-    if (!filepath)
-    {
-        printf("filepath memory allocation failed. \n");
-        return false;
-    }
-    int ret = snprintf(filepath, len, "%s%s", STRINGIZE(SECURITY_BUILD_UNITTEST_DIR), filename);
-    printf("Root build path: %s \n", filepath);
-
-    if (ret == len-1)
-    {
-        FILE *fp = fopen(filepath, "rb");
-        if (fp)
-        {
-            struct stat st;
-            if (stat(filepath, &st) == 0)
-            {
-                *data = (uint8_t *)OICMalloc(st.st_size);
-                if (*data)
-                {
-                    if (fread(*data, 1, st.st_size, fp) != (size_t)st.st_size)
-                    {
-                        printf("Error in reading file %s\n", filename);
-                    }
-                    else
-                    {
-                        *size = st.st_size;
-                        status = true;
-                    }
-                }
-            }
-            fclose(fp);
-        }
-        else
-        {
-            printf("Unable to open %s file\n", filepath);
-        }
-    }
-    else
-    {
-        printf("Filepath copy failed.\n");
-    }
-    OICFree(filepath);
-    return status;
-}
-
 void SetPersistentHandler(OCPersistentStorage *ps, bool set)
 {
     if (set)