Fix false return value about requesting non-existent data

Change-Id: Ibe70d375a6b9eab145c850f40068d0d1c833cfd6
Signed-off-by: yuseok.jeon <yuseok.jeon@samsung.com>

diff --git a/src/manager/client-capi/ckmc-manager.cpp b/src/manager/client-capi/ckmc-manager.cpp
index 77819c0..da8e607 100644 (file)
--- a/src/manager/client-capi/ckmc-manager.cpp
+++ b/src/manager/client-capi/ckmc-manager.cpp
@@ -174,6 +174,11 @@ int ckmc_get_key_alias_list(ckmc_alias_list_s** alias_list)
         }
     }
 
+    if(plist == NULL) { // if the alias_list size is zero
+              return CKMC_ERROR_DB_ALIAS_UNKNOWN ;
+    }
+
+
     return CKMC_ERROR_NONE;
 }
 
@@ -272,6 +277,11 @@ int ckmc_get_cert_alias_list(ckmc_alias_list_s** alias_list) {
         }
     }
 
+    if(plist == NULL) { // if the alias_list size is zero
+            return CKMC_ERROR_DB_ALIAS_UNKNOWN ;
+    }
+
+
     return CKMC_ERROR_NONE;
 }
 
@@ -366,6 +376,10 @@ int ckmc_get_data_alias_list(ckmc_alias_list_s** alias_list){
         }
     }
 
+    if(plist == NULL) { // if the alias_list size is zero
+            return CKMC_ERROR_DB_ALIAS_UNKNOWN ;
+    }
+
     return CKMC_ERROR_NONE;
 }
 

diff --git a/src/manager/client-capi/ckmc-type.cpp b/src/manager/client-capi/ckmc-type.cpp
index 16ee911..6c2d3d5 100644 (file)
--- a/src/manager/client-capi/ckmc-type.cpp
+++ b/src/manager/client-capi/ckmc-type.cpp
@@ -222,7 +222,6 @@ int ckmc_load_from_pkcs12_file(const char *file_path, const char *passphrase, ck
                 EVP_PKEY_free(pkey);
             if(ca != NULL)
                 sk_X509_pop_free(ca, X509_free);
-            EVP_cleanup();
 
             if(ret != CKMC_ERROR_NONE) {
                 if(retPrivateKey != NULL){