make use of C++ error in C API
authorDong Sun Lee <ds73.lee@samsung.com>
Mon, 7 Jul 2014 23:59:03 +0000 (08:59 +0900)
committerBartlomiej Grzelewski <b.grzelewski@samsung.com>
Fri, 12 Sep 2014 12:58:49 +0000 (14:58 +0200)
Change-Id: I32e2579ce15c97ede76b7bdc0ab33df6e654ac77
Signed-off-by: Dong Sun Lee <ds73.lee@samsung.com>
src/include/ckm/ckm-error.h
src/include/ckmc/ckmc-error.h
src/manager/client-capi/ckmc-error.cpp
src/manager/client-capi/ckmc-manager.cpp
src/manager/client-capi/ckmc-type.cpp
src/manager/client/client-error.cpp

index 538edca..e919976 100644 (file)
@@ -81,6 +81,12 @@ extern "C" {
 /*! \brief   indicating that CA certificate(s) were unknown and chain could not be created */
 #define CKM_API_ERROR_VERIFICATION_FAILED -16
 
+/*! \brief   indicating that a provided file or binary has not a valid format */
+#define CKM_API_ERROR_INVALID_FORMAT -17
+
+/*! \brief   indicating that provided file doesn't exists or cannot be accessed in the file system */
+#define CKM_API_ERROR_FILE_ACCESS_DENIED -18
+
 /*! \brief   indicating the error with unknown reason */
 #define CKM_API_ERROR_UNKNOWN -255
 /** @}*/
index 940d389..bb98d0d 100644 (file)
@@ -17,7 +17,7 @@
  *  limitations under the License
  *
  * @file        ckmc-error.h
- * @author      Bartlomiej Grzelewski (b.grzelewski@samsung.com)
+ * @author      Yuseok Jeon(yuseok.jeon@samsung.com)
  * @version     1.0
  * @brief       This file is implementation of client-common functions.
  */
 #ifndef CKMC_ERROR_H
 #define CKMC_ERROR_H
 
-#include <sys/types.h>
-
-/**
- * \name Return Codes
- * exported by the foundation API.
- * result codes begin with the start error code and extend into negative direction.
- * @{
-*/
-#define KEY_MANAGER_API_SUCCESS 0
-/*! \brief   indicating the result of the one specific API is successful */
-#define KEY_MANAGER_API_ERROR_SOCKET -1
-
-/*! \brief   indicating the socket between client and Central Key Manager failed  */
-#define KEY_MANAGER_API_ERROR_BAD_REQUEST -2
-
-/*! \brief   indicating the response from Central Key Manager is malformed */
-#define KEY_MANAGER_API_ERROR_BAD_RESPONSE -3
-
-/*! \brief   indicating the transmitting request failed */
-/* deprecated unused */
-#define KEY_MANAGER_API_ERROR_SEND_FAILED -4
-
-/*! \brief   indicating the receiving response failed */
-/* deprecated unused */
-#define KEY_MANAGER_API_ERROR_RECV_FAILED -5
-
-/*! \brief   indicating the authentication between client and manager failed */
-#define KEY_MANAGER_API_ERROR_AUTHENTICATION_FAILED -6
-
-/*! \brief   indicating the API's input parameter is malformed */
-#define KEY_MANAGER_API_ERROR_INPUT_PARAM -7
-
-/*! \brief   indicating the output buffer size which is passed as parameter is too small */
-#define KEY_MANAGER_API_ERROR_BUFFER_TOO_SMALL -8
-
-/*! \brief   indicating system  is running out of memory state */
-#define KEY_MANAGER_API_ERROR_OUT_OF_MEMORY -9
-
-/*! \brief   indicating the access has been denied by Central Key Manager */
-#define KEY_MANAGER_API_ERROR_ACCESS_DENIED -10
-
-/*! \brief   indicating Central Key Manager has been failed for some reason */
-#define KEY_MANAGER_API_ERROR_SERVER_ERROR -11
-
-/*! \brief   indicating the database was not unlocked - user did not login */
-#define KEY_MANAGER_API_ERROR_DB_LOCKED -12
-
-/*! \brief   indicating that request give to database returned no result */
-#define KEY_MANAGER_API_ERROR_DB_BAD_REQUEST -13
-
-/*! \brief   indicating an internal error inside the database */
-#define KEY_MANAGER_API_ERROR_DB_ERROR -14
-
-/*! \brief   indicating that provided alias already exists in the database */
-#define KEY_MANAGER_API_ERROR_DB_ALIAS_EXISTS -15
-
-/*! \brief   indicating that provided file doesn't exists or cannot be accessed in the file system */
-#define KEY_MANAGER_API_ERROR_FILE_ACCESS_DENIED -16
-
-/*! \brief   indicating that a provided file or binary has not a valid format */
-#define KEY_MANAGER_API_ERROR_INVALID_FORMAT -17
-
-
-/*! \brief   indicating the error with unknown reason */
-#define KEY_MANAGER_API_ERROR_UNKNOWN -255
-/** @}*/
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-const char * ckm_error_to_string(int error);
-
-
-#ifdef __cplusplus
-}
-#endif
-
-/**
- * @}
-*/
-
-/**
- * @}
-*/
+#include <ckm/ckm-error.h>
 
 #endif /* CKMC_ERROR_H */
index 95bc8bf..b002de3 100644 (file)
@@ -21,7 +21,7 @@
  */
 
 #include <ckmc/ckmc-error.h>
-#include <ckm/ckm-error.h>
+#include <ckm/ckm-type.h>
 
 const char * ckm_error_to_string(int error) {
        return CKM::ErrorToString(error);
index b88af12..128b202 100644 (file)
@@ -70,12 +70,12 @@ int ckm_save_key(const char *alias, const ckm_key key, const ckm_policy policy)
        CKM::Manager mgr;
 
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
        if(key.raw_key == NULL || key.key_size <= 0) {
-                       return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+                       return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::RawBuffer buffer(key.raw_key, key.raw_key + key.key_size);
        std::string password(key.password);
@@ -93,7 +93,7 @@ int ckm_remove_key(const char *alias)
        CKM::Manager mgr;
 
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
@@ -107,12 +107,12 @@ int ckm_get_key(const char *alias, const char *password, ckm_key **key)
        CKM::Key ckmKey;
 
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
        CKM::Manager mgr;
-       if( (ret = mgr.getKey(ckmAlias, std::string(password), ckmKey)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getKey(ckmAlias, std::string(password), ckmKey)) != CKM_API_SUCCESS) {
                return ret;
        }
 
@@ -120,9 +120,9 @@ int ckm_get_key(const char *alias, const char *password, ckm_key **key)
        ckm_key_type keyType = static_cast<ckm_key_type>(static_cast<int>(ckmKey.getType()));
        *key = ckm_key_new( rawKey, ckmKey.getDER().size(), keyType, NULL);
        if(*key == NULL) {
-               return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+               return CKM_API_ERROR_OUT_OF_MEMORY;
        }else {
-               return KEY_MANAGER_API_SUCCESS;
+               return CKM_API_SUCCESS;
        }
 }
 
@@ -134,7 +134,7 @@ int ckm_get_key_alias_list(const ckm_alias_list** alias_list)
 
        CKM::AliasVector aliasVector;
        CKM::Manager mgr;
-       if( (ret = mgr.getKeyAliasVector(aliasVector)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getKeyAliasVector(aliasVector)) != CKM_API_SUCCESS) {
                return ret;
        }
 
@@ -149,19 +149,19 @@ int ckm_get_key_alias_list(const ckm_alias_list** alias_list)
                }
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
 int ckm_save_cert(const char *alias, const ckm_cert cert, const ckm_policy policy)
 {
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
        if(cert.raw_cert == NULL || cert.cert_size <= 0) {
-                       return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+                       return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Certificate ckmCert = _toCkmCertificate(&cert);
 
@@ -175,7 +175,7 @@ KEY_MANAGER_CAPI
 int ckm_remove_cert(const char *alias)
 {
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
@@ -190,21 +190,21 @@ int ckm_get_cert(const char *alias, const char *password, const ckm_cert **cert)
        int ret;
 
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
        CKM::Manager mgr;
-       if( (ret = mgr.getCertificate(ckmAlias, std::string(password), ckmCert)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getCertificate(ckmAlias, std::string(password), ckmCert)) != CKM_API_SUCCESS) {
                return ret;
        }
 
        unsigned char *rawCert = reinterpret_cast<unsigned char*>(ckmCert.getDER().data());
        *cert = ckm_cert_new( rawCert, ckmCert.getDER().size(), CKM_CERT_FORM_DER);
        if(*cert == NULL) {
-               return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+               return CKM_API_ERROR_OUT_OF_MEMORY;
        }else {
-               return KEY_MANAGER_API_SUCCESS;
+               return CKM_API_SUCCESS;
        }
 }
 
@@ -215,7 +215,7 @@ int ckm_get_cert_alias_list(const ckm_alias_list** alias_list) {
 
        CKM::AliasVector aliasVector;
        CKM::Manager mgr;
-       if( (ret = mgr.getCertificateAliasVector(aliasVector)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getCertificateAliasVector(aliasVector)) != CKM_API_SUCCESS) {
                return ret;
        }
 
@@ -230,19 +230,19 @@ int ckm_get_cert_alias_list(const ckm_alias_list** alias_list) {
                }
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
 int ckm_save_data(const char *alias, ckm_raw_buffer data, const ckm_policy policy)
 {
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
        if(data.data == NULL || data.size <= 0) {
-                       return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+                       return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::RawBuffer buffer(data.data, data.data + data.size);
 
@@ -256,7 +256,7 @@ KEY_MANAGER_CAPI
 int ckm_remove_data(const char *alias)
 {
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
@@ -271,21 +271,21 @@ int ckm_get_data(const char *alias, const char *password, ckm_raw_buffer **data)
        int ret;
 
        if(alias == NULL) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::Alias ckmAlias(alias);
 
        CKM::Manager mgr;
-       if( (ret = mgr.getData(ckmAlias, std::string(password), ckmBuff)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getData(ckmAlias, std::string(password), ckmBuff)) != CKM_API_SUCCESS) {
                return ret;
        }
 
        unsigned char *rawBuff = reinterpret_cast<unsigned char*>(ckmBuff.data());
        *data = ckm_buffer_new( rawBuff, ckmBuff.size());
        if(*data == NULL) {
-               return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+               return CKM_API_ERROR_OUT_OF_MEMORY;
        }else {
-               return KEY_MANAGER_API_SUCCESS;
+               return CKM_API_SUCCESS;
        }
 }
 
@@ -296,7 +296,7 @@ int ckm_get_data_alias_list(const ckm_alias_list** alias_list){
 
        CKM::AliasVector aliasVector;
        CKM::Manager mgr;
-       if( (ret = mgr.getDataAliasVector(aliasVector)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getDataAliasVector(aliasVector)) != CKM_API_SUCCESS) {
                return ret;
        }
 
@@ -311,7 +311,7 @@ int ckm_get_data_alias_list(const ckm_alias_list** alias_list){
                }
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -330,11 +330,11 @@ int ckm_create_key_pair_rsa(const int size,
        CKM::Policy ckmPublicKeyPolicy(policy_public_key.password, _toBool(policy_public_key.extractable), _toBool(policy_public_key.restricted));
 
        if( (mgr.createKeyPairRSA(size, ckmPrivakeKeyAlias, ckmPublicKeyAlias, ckmPrivateKeyPolicy, ckmPublicKeyPolicy))
-                       != KEY_MANAGER_API_SUCCESS) {
+                       != CKM_API_SUCCESS) {
                return ret;
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -354,11 +354,11 @@ int ckm_create_key_pair_ecdsa(const ckm_ec_type type,
        CKM::Policy ckmPublicKeyPolicy(policy_public_key.password, _toBool(policy_public_key.extractable), _toBool(policy_public_key.restricted));
 
        if( (mgr.createKeyPairECDSA(ckmType, ckmPrivakeKeyAlias, ckmPublicKeyAlias, ckmPrivateKeyPolicy, ckmPublicKeyPolicy))
-                       != KEY_MANAGER_API_SUCCESS) {
+                       != CKM_API_SUCCESS) {
                return ret;
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -384,19 +384,19 @@ int ckm_create_signature(const char *private_key_alias,
                        ckmMessage,
                        ckmHashAlgo,
                        ckmPadding,
-                       ckmSignature)) != KEY_MANAGER_API_SUCCESS) {
+                       ckmSignature)) != CKM_API_SUCCESS) {
                return ret;
        }
 
        unsigned char *rawBuff = reinterpret_cast<unsigned char*>(ckmSignature.data());
        *signature = ckm_buffer_new( rawBuff, ckmSignature.size());
        if(*signature == NULL) {
-               return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+               return CKM_API_ERROR_OUT_OF_MEMORY;
        }else {
-               return KEY_MANAGER_API_SUCCESS;
+               return CKM_API_SUCCESS;
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -422,11 +422,11 @@ int ckm_verify_signature(const char *public_key_alias,
                        ckmMessage,
                        ckmSignature,
                        ckmHashAlgo,
-                       ckmPadding)) != KEY_MANAGER_API_SUCCESS) {
+                       ckmPadding)) != CKM_API_SUCCESS) {
                return ret;
        }
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -438,7 +438,7 @@ int ckm_get_cert_chain(const ckm_cert *cert, const ckm_cert_list *untrustedcerts
 
 
        if(cert->raw_cert == NULL || cert->cert_size <= 0) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::RawBuffer buffer(cert->raw_cert, cert->raw_cert + cert->cert_size);
        CKM::DataFormat dataFormat = static_cast<CKM::DataFormat>(static_cast<int>(cert->data_format));
@@ -453,20 +453,20 @@ int ckm_get_cert_chain(const ckm_cert *cert, const ckm_cert_list *untrustedcerts
                        next = current->next;
 
                        if(current->cert == NULL){
-                               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+                               return CKM_API_ERROR_INPUT_PARAM;
                        }
                        CKM::Certificate ckmCert = _toCkmCertificate(current->cert);
                        ckmUntrustedCerts.push_back(ckmCert);
                }while(next != NULL);
        }
 
-       if( (ret = mgr.getCertificateChain(ckmCert, ckmUntrustedCerts, ckmCertChain)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getCertificateChain(ckmCert, ckmUntrustedCerts, ckmCertChain)) != CKM_API_SUCCESS) {
                return ret;
        }
 
        *cert_chain_list = _toNewCkmCertList(ckmCertChain);
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -478,7 +478,7 @@ int ckm_get_cert_chain_with_alias(const ckm_cert *cert, const ckm_alias_list *un
 
 
        if(cert->raw_cert == NULL || cert->cert_size <= 0) {
-               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+               return CKM_API_ERROR_INPUT_PARAM;
        }
        CKM::RawBuffer buffer(cert->raw_cert, cert->raw_cert + cert->cert_size);
        CKM::DataFormat dataFormat = static_cast<CKM::DataFormat>(static_cast<int>(cert->data_format));
@@ -493,19 +493,19 @@ int ckm_get_cert_chain_with_alias(const ckm_cert *cert, const ckm_alias_list *un
                        next = current->next;
 
                        if(current->alias == NULL){
-                               return KEY_MANAGER_API_ERROR_INPUT_PARAM;
+                               return CKM_API_ERROR_INPUT_PARAM;
                        }
                        CKM::Alias ckmAlias(current->alias);
                        ckmUntrustedAliases.push_back(ckmAlias);
                }while(next != NULL);
        }
 
-       if( (ret = mgr.getCertificateChain(ckmCert, ckmUntrustedAliases, ckmCertChain)) != KEY_MANAGER_API_SUCCESS) {
+       if( (ret = mgr.getCertificateChain(ckmCert, ckmUntrustedAliases, ckmCertChain)) != CKM_API_SUCCESS) {
                return ret;
        }
 
        *cert_chain_list = _toNewCkmCertList(ckmCertChain);
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
index 9b25446..56dcfa7 100644 (file)
@@ -137,7 +137,7 @@ int ckm_load_cert_from_file(const char *file_path, ckm_cert **cert)
 
        FILE *fp = fopen(file_path, "r");
        if(fp == NULL)
-               return KEY_MANAGER_API_ERROR_FILE_ACCESS_DENIED;
+               return CKM_API_ERROR_FILE_ACCESS_DENIED;
        X509 *pcert = NULL;
        if(!(pcert = d2i_X509_fp(fp, NULL))) {
                fseek(fp, 0, SEEK_SET);
@@ -145,11 +145,11 @@ int ckm_load_cert_from_file(const char *file_path, ckm_cert **cert)
        }
        fclose(fp);
        if(pcert == NULL) {
-               return KEY_MANAGER_API_ERROR_INVALID_FORMAT;
+               return CKM_API_ERROR_INVALID_FORMAT;
        }
 
        int ret = _ckm_load_cert_from_x509(pcert, cert);
-       if(ret != KEY_MANAGER_API_SUCCESS) {
+       if(ret != CKM_API_SUCCESS) {
                X509_free(pcert);
        }
        return ret;
@@ -178,7 +178,7 @@ int ckm_load_from_pkcs12_file(const char *file_path, const char *passphrase, ckm
                        pkey = NULL;
                        x509Cert = NULL;
                        ca = NULL;
-                       ret = KEY_MANAGER_API_SUCCESS;
+                       ret = CKM_API_SUCCESS;
                        retPrivateKey = NULL;
                        retCkmCert = NULL;
                        retCaCertList = NULL;
@@ -196,7 +196,7 @@ int ckm_load_from_pkcs12_file(const char *file_path, const char *passphrase, ckm
                                sk_X509_pop_free(ca, X509_free);
                        EVP_cleanup();
 
-                       if(ret != KEY_MANAGER_API_SUCCESS) {
+                       if(ret != CKM_API_SUCCESS) {
                                if(retPrivateKey != NULL)
                                        ckm_key_free(retPrivateKey);
                                if(retCkmCert != NULL)
@@ -209,36 +209,36 @@ int ckm_load_from_pkcs12_file(const char *file_path, const char *passphrase, ckm
                int parsePkcs12(const char *filePath, const char *pass) {
                        fp_in = NULL;
                        if(!(fp_in = fopen(filePath, "rb"))) {
-                               return KEY_MANAGER_API_ERROR_FILE_ACCESS_DENIED;
+                               return CKM_API_ERROR_FILE_ACCESS_DENIED;
                        }
 
                        if(!(p12 = d2i_PKCS12_fp(fp_in, NULL))) {
-                               return KEY_MANAGER_API_ERROR_INVALID_FORMAT;
+                               return CKM_API_ERROR_INVALID_FORMAT;
                        }
 
                        /* parse PKCS#12 certificate */
                        if((ret = PKCS12_parse(p12, pass, &pkey, &x509Cert, &ca)) != 1) {
-                               return KEY_MANAGER_API_ERROR_INVALID_FORMAT;
+                               return CKM_API_ERROR_INVALID_FORMAT;
                        }
-                       return KEY_MANAGER_API_SUCCESS;
+                       return CKM_API_SUCCESS;
                }
 
                int toCkmCert() {
-                       if( (ret =_ckm_load_cert_from_x509(x509Cert,&retCkmCert)) != KEY_MANAGER_API_SUCCESS) {
+                       if( (ret =_ckm_load_cert_from_x509(x509Cert,&retCkmCert)) != CKM_API_SUCCESS) {
                                return ret;
                        }
-                       return KEY_MANAGER_API_SUCCESS;
+                       return CKM_API_SUCCESS;
                }
 
                int toCkmKey() {
                        int prikeyLen = 0;
                        if((prikeyLen = i2d_PrivateKey(pkey, NULL)) < 0) {
-                               return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+                               return CKM_API_ERROR_OUT_OF_MEMORY;
                        }
                        unsigned char arrayPrikey[sizeof(unsigned char) * prikeyLen];
                        unsigned char *pPrikey = arrayPrikey;
                        if((prikeyLen = i2d_PrivateKey(pkey, &pPrikey)) < 0) {
-                               return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+                               return CKM_API_ERROR_OUT_OF_MEMORY;
                        }
 
                        int type = EVP_PKEY_type(pkey->type);
@@ -252,13 +252,13 @@ int ckm_load_from_pkcs12_file(const char *file_path, const char *passphrase, ckm
                                break;
                        }
                        if(key_type == CKM_KEY_NONE) {
-                               return KEY_MANAGER_API_ERROR_INVALID_FORMAT;
+                               return CKM_API_ERROR_INVALID_FORMAT;
                        }
 
                        char *nullPassword = NULL;
                        retPrivateKey = ckm_key_new(pPrikey, sizeof(unsigned char) * prikeyLen, key_type, nullPassword);
 
-                       return KEY_MANAGER_API_SUCCESS;
+                       return CKM_API_SUCCESS;
                }
 
                int toCaCkmCertList() {
@@ -267,36 +267,36 @@ int ckm_load_from_pkcs12_file(const char *file_path, const char *passphrase, ckm
                        ckm_cert_list *tmpCertList = NULL;
                        retCaCertList = tmpCertList;
                        while((popedCert = sk_X509_pop(ca)) != NULL) {
-                               if( (ret =_ckm_load_cert_from_x509(popedCert, &popedCkmCert)) != KEY_MANAGER_API_SUCCESS) {
-                                       return KEY_MANAGER_API_ERROR_OUT_OF_MEMORY;
+                               if( (ret =_ckm_load_cert_from_x509(popedCert, &popedCkmCert)) != CKM_API_SUCCESS) {
+                                       return CKM_API_ERROR_OUT_OF_MEMORY;
                                }
                                tmpCertList = ckm_cert_list_add(tmpCertList, popedCkmCert);
                        }
-                       return KEY_MANAGER_API_SUCCESS;
+                       return CKM_API_SUCCESS;
                }
 
        };
 
-       int ret = KEY_MANAGER_API_SUCCESS;
+       int ret = CKM_API_SUCCESS;
 
        Pkcs12Converter converter;
-       if((ret = converter.parsePkcs12(file_path, passphrase)) != KEY_MANAGER_API_SUCCESS) {
+       if((ret = converter.parsePkcs12(file_path, passphrase)) != CKM_API_SUCCESS) {
                return ret;
        }
-       if((ret = converter.toCkmCert()) != KEY_MANAGER_API_SUCCESS) {
+       if((ret = converter.toCkmCert()) != CKM_API_SUCCESS) {
                return ret;
        }
-       if((ret = converter.toCkmKey()) != KEY_MANAGER_API_SUCCESS) {
+       if((ret = converter.toCkmKey()) != CKM_API_SUCCESS) {
                return ret;
        }
-       if((ret = converter.toCaCkmCertList()) != KEY_MANAGER_API_SUCCESS) {
+       if((ret = converter.toCaCkmCertList()) != CKM_API_SUCCESS) {
                return ret;
        }
        *private_key = converter.retPrivateKey;
        *ckmcert = converter.retCkmCert;
        *ca_cert_list = converter.retCaCertList;
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
 
 KEY_MANAGER_CAPI
@@ -424,12 +424,12 @@ int _ckm_load_cert_from_x509(X509 *xCert, ckm_cert **cert)
        unsigned char* bufCert = NULL;
 
        if(xCert == NULL) {
-               return KEY_MANAGER_API_ERROR_INVALID_FORMAT;
+               return CKM_API_ERROR_INVALID_FORMAT;
        }
 
        /* load certificate into buffer */
        if((certLen = i2d_X509(xCert, NULL)) < 0) {
-               return KEY_MANAGER_API_ERROR_INVALID_FORMAT;
+               return CKM_API_ERROR_INVALID_FORMAT;
        }
        unsigned char arrayCert[sizeof(unsigned char) * certLen];
        bufCert = arrayCert;
@@ -437,5 +437,5 @@ int _ckm_load_cert_from_x509(X509 *xCert, ckm_cert **cert)
 
        *cert = ckm_cert_new(bufCert, certLen, CKM_CERT_FORM_DER);
 
-       return KEY_MANAGER_API_SUCCESS;
+       return CKM_API_SUCCESS;
 }
index c25b003..079417b 100644 (file)
@@ -44,6 +44,8 @@ const char * ErrorToString(int error) {
         ERRORDESCRIBE(CKM_API_ERROR_DB_ALIAS_EXISTS);
         ERRORDESCRIBE(CKM_API_ERROR_DB_ALIAS_UNKNOWN);
         ERRORDESCRIBE(CKM_API_ERROR_VERIFICATION_FAILED);
+        ERRORDESCRIBE(CKM_API_ERROR_INVALID_FORMAT);
+        ERRORDESCRIBE(CKM_API_ERROR_FILE_ACCESS_DENIED);
         ERRORDESCRIBE(CKM_API_ERROR_UNKNOWN);
     default:
         return "Error not defined";