openharmony/security_asset
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_asset synced 2025-03-03 13:50:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Modify params check function

Browse Source 
Match-id-394dbdecf10c497f4ad80871e19d0f72b7a8708c
This commit is contained in:
authName 2023-09-28 18:10:34 +08:00 committed by userName
parent b570505b05
commit dc3491ef21
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
services/crypto_manager/crypto_manager_wrapper/src/crypto_wrapper.cpp
View File

@ -95,7 +95,20 @@ static struct HksParam g_decryptParams[] = {
}
};
int32_t UpdateLoopFinish(const struct HksBlob *handle, const struct HksParamSet *paramSet,
static int32_t CheckCryptParma(const struct CryptParam *data)
{
if ((data == NULL) || (data->keyLen == 0 || data->keyData == NULL) ||
(data->dataInLen == 0 || data->dataIn == NULL) ||
(data->aadLen == 0 || data->aad == NULL) ||
(data->dataOutLen ==0 || data->dataOut == NULL)) {
LOGE("hks invalid argument\n");
return HKS_FAILURE;
}
return HKS_SUCCESS;
}
static int32_t UpdateLoopFinish(const struct HksBlob *handle, const struct HksParamSet *paramSet,
const struct HksBlob *inData, struct HksBlob *outData)
{
/* donnot need update, just finish */
@ -119,16 +132,18 @@ int32_t UpdateLoopFinish(const struct HksBlob *handle, const struct HksParamSet
return HKS_SUCCESS;
}
int EncryptWrapper(const struct CryptParam *data)
int32_t EncryptWrapper(const struct CryptParam *data)
{
if ((data == NULL) || (data->keyLen == 0 || data->keyData == NULL) ||
(data->dataInLen == 0 || data->dataIn == NULL) ||
(data->aadLen == 0 || data->aad == NULL) ||
(data->dataOutLen != (data->dataInLen + AEAD_SIZE + NONCE_SIZE) || data->dataOut == NULL)) {
if (CheckCryptParma(data) != HKS_SUCCESS) {
LOGE("hks encrypt invalid argument\n");
return HKS_FAILURE;
}
if (data->dataOutLen != data->dataInLen + AEAD_SIZE + NONCE_SIZE) {
LOGE("hks encrypt cipher len not match\n");
return HKS_FAILURE;
}
int32_t ret;
struct HksBlob keyAlias = { data->keyLen, (uint8_t *)data->keyData };
struct HksBlob inData = { data->dataInLen, (uint8_t *)data->dataIn };
@ -168,16 +183,19 @@ END:
return ret;
}
int DecryptWrapper(const struct CryptParam *data)
int32_t DecryptWrapper(const struct CryptParam *data)
{
if ((data == NULL) || (data->keyLen == 0 || data->keyData == NULL) ||
(data->dataInLen <= AEAD_SIZE + NONCE_SIZE || data->dataIn == NULL) ||
(data->aadLen == 0 || data->aad == NULL) ||
(data->dataOutLen != data->dataInLen - AEAD_SIZE - NONCE_SIZE || data->dataOut == NULL)) {
if (CheckCryptParma(data) != HKS_SUCCESS) {
LOGE("hks decrypt invalid argument\n");
return HKS_FAILURE;
}
if ((data->dataInLen <= AEAD_SIZE + NONCE_SIZE) ||
(data->dataOutLen != data->dataInLen - AEAD_SIZE - NONCE_SIZE)) {
LOGE("hks decrypt cipher len or plain len not match\n");
return HKS_FAILURE;
}
int32_t ret;
struct HksBlob keyAlias = { data->keyLen, (uint8_t *)data->keyData };
struct HksBlob inData = { data->dataOutLen, (uint8_t *)data->dataIn };