Fix build break.

Fix error: "undefined reference to_ckmc_error".
This error occure when client was linked with control library only.

Change-Id: I9547290aef5a1ee41c94474d189562adf94ddea5

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 28f50f2..ad6e213 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -82,6 +82,7 @@ SET(KEY_MANAGER_CLIENT_SOURCES
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-error.cpp
     ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-manager.cpp
+    ${KEY_MANAGER_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.cpp
     ${KEY_MANAGER_PATH}/common/base64.cpp
     ${KEY_MANAGER_PATH}/common/digest.cpp
     ${KEY_MANAGER_PATH}/common/protocols.cpp
@@ -139,6 +140,7 @@ SET(KEY_MANAGER_CONTROL_CLIENT_SOURCES
     ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-control.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_SRC_PATH}/client-common.cpp
     ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-control.cpp
+    ${KEY_MANAGER_CONTROL_CLIENT_CAPI_SRC_PATH}/ckmc-type-converter.cpp
     ${KEY_MANAGER_PATH}/common/base64.cpp
     ${KEY_MANAGER_PATH}/common/digest.cpp
     ${KEY_MANAGER_PATH}/common/protocols.cpp

diff --git a/src/manager/client-capi/ckmc-type-converter.cpp b/src/manager/client-capi/ckmc-type-converter.cpp
new file mode 100644 (file)
index 0000000..25ca29b
--- /dev/null
+++ b/src/manager/client-capi/ckmc-type-converter.cpp
@@ -0,0 +1,78 @@
+/*
+ *  Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd All Rights Reserved
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License
+ *
+ *
+ * @file        ckmc-type-converter.cpp
+ * @author      Dongsun Lee(ds73.lee@samsung.com)
+ * @version     1.0
+ * @brief       new and free methods for the struct of CAPI
+ */
+
+#include <ckmc-type-converter.h>
+
+int to_ckm_error(int ckmc_error) {
+       switch(ckmc_error) {
+       case CKMC_ERROR_NONE:                  return CKM_API_SUCCESS;
+       case CKMC_ERROR_SOCKET:                return CKM_API_ERROR_SOCKET;
+       case CKMC_ERROR_BAD_REQUEST:           return CKM_API_ERROR_BAD_REQUEST;
+       case CKMC_ERROR_BAD_RESPONSE:          return CKM_API_ERROR_BAD_RESPONSE;
+       case CKMC_ERROR_SEND_FAILED:           return CKM_API_ERROR_SEND_FAILED;
+       case CKMC_ERROR_RECV_FAILED:           return CKM_API_ERROR_RECV_FAILED;
+       case CKMC_ERROR_AUTHENTICATION_FAILED: return CKM_API_ERROR_AUTHENTICATION_FAILED;
+       case CKMC_ERROR_INVALID_PARAMETER:     return CKM_API_ERROR_INPUT_PARAM;
+       case CKMC_ERROR_BUFFER_TOO_SMALL:      return CKM_API_ERROR_BUFFER_TOO_SMALL;
+       case CKMC_ERROR_OUT_OF_MEMORY:         return CKM_API_ERROR_OUT_OF_MEMORY;
+       case CKMC_ERROR_PERMISSION_DENIED:     return CKM_API_ERROR_ACCESS_DENIED;
+       case CKMC_ERROR_SERVER_ERROR:          return CKM_API_ERROR_SERVER_ERROR;
+       case CKMC_ERROR_DB_LOCKED:             return CKM_API_ERROR_DB_LOCKED;
+       case CKMC_ERROR_DB_ERROR:              return CKM_API_ERROR_DB_ERROR;
+       case CKMC_ERROR_DB_ALIAS_EXISTS:       return CKM_API_ERROR_DB_ALIAS_EXISTS;
+       case CKMC_ERROR_DB_ALIAS_UNKNOWN:      return CKM_API_ERROR_DB_ALIAS_UNKNOWN;
+       case CKMC_ERROR_VERIFICATION_FAILED:   return CKM_API_ERROR_VERIFICATION_FAILED;
+       case CKMC_ERROR_INVALID_FORMAT:        return CKM_API_ERROR_INVALID_FORMAT;
+       case CKMC_ERROR_FILE_ACCESS_DENIED:    return CKM_API_ERROR_FILE_ACCESS_DENIED;
+       case CKMC_ERROR_NOT_EXPORTABLE:        return CKM_API_ERROR_NOT_EXPORTABLE;
+       case CKMC_ERROR_UNKNOWN:               return CKM_API_ERROR_UNKNOWN;
+       }
+       return CKMC_ERROR_UNKNOWN;
+}
+
+int to_ckmc_error(int ckm_error) {
+       switch(ckm_error) {
+       case CKM_API_SUCCESS:                     return CKMC_ERROR_NONE;
+       case CKM_API_ERROR_SOCKET:                return CKMC_ERROR_SOCKET;
+       case CKM_API_ERROR_BAD_REQUEST:           return CKMC_ERROR_BAD_REQUEST;
+       case CKM_API_ERROR_BAD_RESPONSE:          return CKMC_ERROR_BAD_RESPONSE;
+       case CKM_API_ERROR_SEND_FAILED:           return CKMC_ERROR_SEND_FAILED;
+       case CKM_API_ERROR_RECV_FAILED:           return CKMC_ERROR_RECV_FAILED;
+       case CKM_API_ERROR_AUTHENTICATION_FAILED: return CKMC_ERROR_AUTHENTICATION_FAILED;
+       case CKM_API_ERROR_INPUT_PARAM:           return CKMC_ERROR_INVALID_PARAMETER;
+       case CKM_API_ERROR_BUFFER_TOO_SMALL:      return CKMC_ERROR_BUFFER_TOO_SMALL;
+       case CKM_API_ERROR_OUT_OF_MEMORY:         return CKMC_ERROR_OUT_OF_MEMORY;
+       case CKM_API_ERROR_ACCESS_DENIED:         return CKMC_ERROR_PERMISSION_DENIED;
+       case CKM_API_ERROR_SERVER_ERROR:          return CKMC_ERROR_SERVER_ERROR;
+       case CKM_API_ERROR_DB_LOCKED:             return CKMC_ERROR_DB_LOCKED;
+       case CKM_API_ERROR_DB_ERROR:              return CKMC_ERROR_DB_ERROR;
+       case CKM_API_ERROR_DB_ALIAS_EXISTS:       return CKMC_ERROR_DB_ALIAS_EXISTS;
+       case CKM_API_ERROR_DB_ALIAS_UNKNOWN:      return CKMC_ERROR_DB_ALIAS_UNKNOWN;
+       case CKM_API_ERROR_VERIFICATION_FAILED:   return CKMC_ERROR_VERIFICATION_FAILED;
+       case CKM_API_ERROR_INVALID_FORMAT:        return CKMC_ERROR_INVALID_FORMAT;
+       case CKM_API_ERROR_FILE_ACCESS_DENIED:    return CKMC_ERROR_FILE_ACCESS_DENIED;
+    case CKM_API_ERROR_NOT_EXPORTABLE:        return CKMC_ERROR_NOT_EXPORTABLE;
+       case CKM_API_ERROR_UNKNOWN:               return CKMC_ERROR_UNKNOWN;
+       }
+       return CKMC_ERROR_UNKNOWN;
+}
+

diff --git a/src/manager/client-capi/ckmc-type.cpp b/src/manager/client-capi/ckmc-type.cpp
index 584a585..dfb86d7 100644 (file)
--- a/src/manager/client-capi/ckmc-type.cpp
+++ b/src/manager/client-capi/ckmc-type.cpp
@@ -510,56 +510,3 @@ int _ckmc_load_cert_from_x509(X509 *xCert, ckmc_cert_s **cert)
        return ckmc_cert_new(output.data(), output.size(), CKMC_FORM_DER, cert);
 }
 
-int to_ckm_error(int ckmc_error) {
-       switch(ckmc_error) {
-       case CKMC_ERROR_NONE:                  return CKM_API_SUCCESS;
-       case CKMC_ERROR_SOCKET:                return CKM_API_ERROR_SOCKET;
-       case CKMC_ERROR_BAD_REQUEST:           return CKM_API_ERROR_BAD_REQUEST;
-       case CKMC_ERROR_BAD_RESPONSE:          return CKM_API_ERROR_BAD_RESPONSE;
-       case CKMC_ERROR_SEND_FAILED:           return CKM_API_ERROR_SEND_FAILED;
-       case CKMC_ERROR_RECV_FAILED:           return CKM_API_ERROR_RECV_FAILED;
-       case CKMC_ERROR_AUTHENTICATION_FAILED: return CKM_API_ERROR_AUTHENTICATION_FAILED;
-       case CKMC_ERROR_INVALID_PARAMETER:     return CKM_API_ERROR_INPUT_PARAM;
-       case CKMC_ERROR_BUFFER_TOO_SMALL:      return CKM_API_ERROR_BUFFER_TOO_SMALL;
-       case CKMC_ERROR_OUT_OF_MEMORY:         return CKM_API_ERROR_OUT_OF_MEMORY;
-       case CKMC_ERROR_PERMISSION_DENIED:     return CKM_API_ERROR_ACCESS_DENIED;
-       case CKMC_ERROR_SERVER_ERROR:          return CKM_API_ERROR_SERVER_ERROR;
-       case CKMC_ERROR_DB_LOCKED:             return CKM_API_ERROR_DB_LOCKED;
-       case CKMC_ERROR_DB_ERROR:              return CKM_API_ERROR_DB_ERROR;
-       case CKMC_ERROR_DB_ALIAS_EXISTS:       return CKM_API_ERROR_DB_ALIAS_EXISTS;
-       case CKMC_ERROR_DB_ALIAS_UNKNOWN:      return CKM_API_ERROR_DB_ALIAS_UNKNOWN;
-       case CKMC_ERROR_VERIFICATION_FAILED:   return CKM_API_ERROR_VERIFICATION_FAILED;
-       case CKMC_ERROR_INVALID_FORMAT:        return CKM_API_ERROR_INVALID_FORMAT;
-       case CKMC_ERROR_FILE_ACCESS_DENIED:    return CKM_API_ERROR_FILE_ACCESS_DENIED;
-       case CKMC_ERROR_NOT_EXPORTABLE:        return CKM_API_ERROR_NOT_EXPORTABLE;
-       case CKMC_ERROR_UNKNOWN:               return CKM_API_ERROR_UNKNOWN;
-       }
-       return CKMC_ERROR_UNKNOWN;
-}
-
-int to_ckmc_error(int ckm_error) {
-       switch(ckm_error) {
-       case CKM_API_SUCCESS:                     return CKMC_ERROR_NONE;
-       case CKM_API_ERROR_SOCKET:                return CKMC_ERROR_SOCKET;
-       case CKM_API_ERROR_BAD_REQUEST:           return CKMC_ERROR_BAD_REQUEST;
-       case CKM_API_ERROR_BAD_RESPONSE:          return CKMC_ERROR_BAD_RESPONSE;
-       case CKM_API_ERROR_SEND_FAILED:           return CKMC_ERROR_SEND_FAILED;
-       case CKM_API_ERROR_RECV_FAILED:           return CKMC_ERROR_RECV_FAILED;
-       case CKM_API_ERROR_AUTHENTICATION_FAILED: return CKMC_ERROR_AUTHENTICATION_FAILED;
-       case CKM_API_ERROR_INPUT_PARAM:           return CKMC_ERROR_INVALID_PARAMETER;
-       case CKM_API_ERROR_BUFFER_TOO_SMALL:      return CKMC_ERROR_BUFFER_TOO_SMALL;
-       case CKM_API_ERROR_OUT_OF_MEMORY:         return CKMC_ERROR_OUT_OF_MEMORY;
-       case CKM_API_ERROR_ACCESS_DENIED:         return CKMC_ERROR_PERMISSION_DENIED;
-       case CKM_API_ERROR_SERVER_ERROR:          return CKMC_ERROR_SERVER_ERROR;
-       case CKM_API_ERROR_DB_LOCKED:             return CKMC_ERROR_DB_LOCKED;
-       case CKM_API_ERROR_DB_ERROR:              return CKMC_ERROR_DB_ERROR;
-       case CKM_API_ERROR_DB_ALIAS_EXISTS:       return CKMC_ERROR_DB_ALIAS_EXISTS;
-       case CKM_API_ERROR_DB_ALIAS_UNKNOWN:      return CKMC_ERROR_DB_ALIAS_UNKNOWN;
-       case CKM_API_ERROR_VERIFICATION_FAILED:   return CKMC_ERROR_VERIFICATION_FAILED;
-       case CKM_API_ERROR_INVALID_FORMAT:        return CKMC_ERROR_INVALID_FORMAT;
-       case CKM_API_ERROR_FILE_ACCESS_DENIED:    return CKMC_ERROR_FILE_ACCESS_DENIED;
-    case CKM_API_ERROR_NOT_EXPORTABLE:        return CKMC_ERROR_NOT_EXPORTABLE;
-       case CKM_API_ERROR_UNKNOWN:               return CKMC_ERROR_UNKNOWN;
-       }
-       return CKMC_ERROR_UNKNOWN;
-}