/**
- * Copyright (c) 2016 - 2018 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016 - 2019 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.
exit:
- if (query)
- sqlite3_free(query);
-
- if (stmt)
- sqlite3_finalize(stmt);
+ sqlite3_free(query);
+ sqlite3_finalize(stmt);
return result;
}
if (result != CERTSVC_SUCCESS)
SLOGE("Insert schema version to database failed.");
- if (query)
- sqlite3_free(query);
+ sqlite3_free(query);
return result;
}
/**
- * Copyright (c) 2016 - 2017 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016 - 2019 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.
if (result != CERTSVC_SUCCESS)
free(tempBuffer);
- if (query)
- sqlite3_free(query);
-
- if (stmt)
- sqlite3_finalize(stmt);
+ sqlite3_free(query);
+ sqlite3_finalize(stmt);
return result;
}
result = execute_select_query(query, &stmt);
- if (query) {
- sqlite3_free(query);
- query = NULL;
- }
+ sqlite3_free(query);
+ query = NULL;
if (result != CERTSVC_SUCCESS) {
SLOGE("Querying database failed.");
counter);
error_and_exit:
- if (stmt)
- sqlite3_finalize(stmt);
+ sqlite3_finalize(stmt);
return result;
}
goto error;
}
- if (query) {
- sqlite3_free(query);
- query = NULL;
- }
+ sqlite3_free(query);
+ query = NULL;
- if (stmt) {
- sqlite3_finalize(stmt);
- stmt = NULL;
- }
+ sqlite3_finalize(stmt);
+ stmt = NULL;
query = sqlite3_mprintf("delete from %Q where gname=%Q",
storetype_to_string(storeType), gname);
goto error;
}
- if (query) {
- sqlite3_free(query);
- query = NULL;
- }
+ sqlite3_free(query);
+ query = NULL;
CertStoreType other = ALL_STORE & ~SYSTEM_STORE & ~storeType;
CertStoreType current;
result = CERTSVC_SUCCESS;
error:
- if (query)
- sqlite3_free(query);
- if (stmt)
- sqlite3_finalize(stmt);
+ sqlite3_free(query);
+ sqlite3_finalize(stmt);
free(private_key_name);
return result;
} else if (reqType == CERTSVC_GET_USER_CERTIFICATE_LIST) {
if (storeType == SYSTEM_STORE) {
SLOGE("Invalid store type passed.");
- return CERTSVC_WRONG_ARGUMENT;
+ result = CERTSVC_WRONG_ARGUMENT;
+ goto error;
} else {
query = sqlite3_mprintf("select gname, common_name, enabled from %Q where "\
"private_key_gname IS NOT NULL and is_root_app_enabled=%d and enabled=%d",
goto error;
}
- if (query) {
- sqlite3_free(query);
- query = NULL;
- }
+ sqlite3_free(query);
+ query = NULL;
- if (stmt) {
- sqlite3_finalize(stmt);
- stmt = NULL;
- }
+ sqlite3_finalize(stmt);
+ stmt = NULL;
}
*certCount = count;
result = CERTSVC_SUCCESS;
error:
- if (query)
- sqlite3_free(query);
-
- if (stmt)
- sqlite3_finalize(stmt);
+ sqlite3_free(query);
+ sqlite3_finalize(stmt);
if (rootCertHead) {
currentNode = rootCertHead;
SLOGD("success : getCertificateAliasFromStore");
error:
- if (query)
- sqlite3_free(query);
-
- if (stmt)
- sqlite3_finalize(stmt);
+ sqlite3_free(query);
+ sqlite3_finalize(stmt);
return result;
}
SLOGD("success: loadCertificatesFromStore. CERT_COUNT=%d", gnameSize);
error:
- if (query)
- sqlite3_free(query);
-
- if (stmt)
- sqlite3_finalize(stmt);
-
- if (columnText)
- free(columnText);
+ sqlite3_free(query);
+ sqlite3_finalize(stmt);
+ free(columnText);
if (certs) {
for (i = 0; i < gnameSize; i++)
/**
- * Copyright (c) 2016 Samsung Electronics Co., Ltd All Rights Reserved
+ * Copyright (c) 2016 - 2019 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.
recvData = cert_svc_client_comm(pSendData);
- if (recvData.result < 0) {
+ if (recvData.result != CERTSVC_SUCCESS) {
LogError("An error occurred from server side err : " << recvData.result);
free(pSendData);
return recvData.result;
*certData = outData;
*certSize = recvData.dataBlockLen;
- return recvData.result;
+ return CERTSVC_SUCCESS;
} else {
LogError("revcData length is wrong : " << recvData.dataBlockLen);
return CERTSVC_WRONG_ARGUMENT;