openharmony/security_crypto_framework
1
0
Fork 0
mirror of https://gitee.com/openharmony/security_crypto_framework synced 2025-02-21 08:24:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!458 修复参数类型错误

Browse Source 
Merge pull request !458 from 萌萌萌新/master
This commit is contained in:
openharmony_ci 2024-11-07 10:21:57 +00:00 committed by Gitee
commit 4ddf6eaa39
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
8 changed files with 49 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/cj/include/cipher_impl.h
View File

@ -32,7 +32,7 @@ public:
HcfResult CipherUpdate(HcfBlob *input, HcfBlob *output);
HcfResult CipherDoFinal(HcfBlob *input, HcfBlob *output);
HcfResult SetCipherSpec(CipherSpecItem item, HcfBlob pSource);
HcfResult GetCipherSpecString(CipherSpecItem item, char *returnString);
HcfResult GetCipherSpecString(CipherSpecItem item, char **returnString);
HcfResult GetCipherSpecUint8Array(CipherSpecItem item, HcfBlob *returnUint8Array);
const char *GetAlgorithm(int32_t* errCode);

7
frameworks/cj/include/crypto_ffi.h
View File

@ -84,7 +84,7 @@ extern "C" {
FFI_EXPORT int32_t FfiOHOSCipherUpdate(int64_t id, HcfBlob *input, HcfBlob *output);
FFI_EXPORT int32_t FfiOHOSCipherDoFinal(int64_t id, HcfBlob *input, HcfBlob *output);
FFI_EXPORT int32_t FfiOHOSSetCipherSpec(int64_t id, int32_t item, HcfBlob pSource);
FFI_EXPORT int32_t FfiOHOSGetCipherSpecString(int64_t id, int32_t item, char *returnString);
FFI_EXPORT char *FfiOHOSGetCipherSpecString(int64_t id, int32_t item, int32_t *errCode);
FFI_EXPORT int32_t FfiOHOSGetCipherSpecUint8Array(int64_t id, int32_t item, HcfBlob *returnUint8Array);
FFI_EXPORT const char *FfiOHOSCipherGetAlgName(int64_t id, int32_t* errCode);
@ -102,7 +102,7 @@ extern "C" {
FFI_EXPORT int32_t FFiOHOSSignSign(int64_t id, HcfBlob *input, HcfBlob *output);
FFI_EXPORT int32_t FFiOHOSSignSetSignSpecByNum(int64_t id, int32_t itemValue);
FFI_EXPORT int32_t FFiOHOSSignSetSignSpecByArr(int64_t id, HcfBlob itemValue);
FFI_EXPORT int32_t FFiOHOSSignGetSignSpecString(int64_t id, SignSpecItem item, char *itemValue);
FFI_EXPORT char *FFiOHOSSignGetSignSpecString(int64_t id, SignSpecItem item, int32_t *errCode);
FFI_EXPORT int32_t FFiOHOSSignGetSignSpecNum(int64_t id, SignSpecItem item, int32_t *itemValue);
// verify
@ -113,7 +113,7 @@ extern "C" {
FFI_EXPORT int32_t FFiOHOSVerifyRecover(int64_t id, HcfBlob input, HcfBlob *output);
FFI_EXPORT int32_t FFiOHOSVerifySetVerifySpecByNum(int64_t id, int32_t itemValue);
FFI_EXPORT int32_t FFiOHOSVerifySetVerifySpecByArr(int64_t id, HcfBlob itemValue);
FFI_EXPORT int32_t FFiOHOSVerifyGetVerifySpecString(int64_t id, SignSpecItem item, char *itemValue);
FFI_EXPORT char *FFiOHOSVerifyGetVerifySpecString(int64_t id, SignSpecItem item, int32_t *errCode);
FFI_EXPORT int32_t FFiOHOSVerifyGetVerifySpecNum(int64_t id, SignSpecItem item, int32_t *itemValue);
// asykeygenerator
@ -163,6 +163,7 @@ extern "C" {
FFI_EXPORT HcfBigInteger FFiOHOSPubKeyGetAsyKeySpecByBigInt(int64_t id, int32_t itemType, int32_t *errCode);
FFI_EXPORT const char *FfiOHOSPubKeyGetFormat(int64_t id, int32_t* errCode);
FFI_EXPORT void *FfiOHOSPubKeyGetRawPointer(int64_t id);
FFI_EXPORT int64_t FfiOHOSPubKeyFromRawPointer(void *ptr, const char **retString, int32_t *errCode);
// keypair
FFI_EXPORT int64_t FFiOHOSKeyPairPubKey(int64_t id, int32_t *errCode);

2
frameworks/cj/include/sign_impl.h
View File

@ -34,7 +34,7 @@ public:
HcfResult Sign(HcfBlob *input, HcfBlob *output);
HcfResult SetSignSpecByNum(int32_t itemValue);
HcfResult SetSignSpecByArr(HcfBlob itemValue);
HcfResult GetSignSpecString(SignSpecItem item, char *itemValue);
HcfResult GetSignSpecString(SignSpecItem item, char **itemValue);
HcfResult GetSignSpecNum(SignSpecItem item, int32_t *itemValue);
private:

2
frameworks/cj/include/verify_impl.h
View File

@ -33,7 +33,7 @@ public:
HcfResult Recover(HcfBlob input, HcfBlob *output);
HcfResult SetVerifySpecByNum(int32_t itemValue);
HcfResult SetVerifySpecByArr(HcfBlob itemValue);
HcfResult GetVerifySpecString(SignSpecItem item, char *itemValue);
HcfResult GetVerifySpecString(SignSpecItem item, char **itemValue);
HcfResult GetVerifySpecNum(SignSpecItem item, int32_t *itemValue);
private:
HcfVerify *verify_ = nullptr;

4
frameworks/cj/src/cipher_impl.cpp
View File

@ -66,13 +66,13 @@ namespace OHOS {
return cipher_->setCipherSpecUint8Array(cipher_, item, pSource);
}
HcfResult CipherImpl::GetCipherSpecString(CipherSpecItem item, char *returnString)
HcfResult CipherImpl::GetCipherSpecString(CipherSpecItem item, char **returnString)
{
if (cipher_ == nullptr) {
LOGE("fail to get cipher obj!");
return HCF_INVALID_PARAMS;
}
return cipher_->getCipherSpecString(cipher_, item, &returnString);
return cipher_->getCipherSpecString(cipher_, item, returnString);
}
HcfResult CipherImpl::GetCipherSpecUint8Array(CipherSpecItem item, HcfBlob *returnUint8Array)

49
frameworks/cj/src/crypto_ffi.cpp
View File

@ -552,18 +552,20 @@ namespace OHOS {
return res;
}
int32_t FfiOHOSGetCipherSpecString(int64_t id, int32_t item, char *returnString)
char *FfiOHOSGetCipherSpecString(int64_t id, int32_t item, int32_t *errCode)
{
LOGD("[Cipher] GetCipherSpecString start");
LOGD("[Cipher] FfiOHOSGetCipherSpecString start");
auto instance = FFIData::GetData<CipherImpl>(id);
if (!instance) {
LOGE("[Cipher] instance not exist.");
return HCF_ERR_MALLOC;
*errCode = HCF_ERR_MALLOC;
return nullptr;
}
CipherSpecItem csi = CipherSpecItem(item);
HcfResult res = instance->GetCipherSpecString(csi, returnString);
LOGD("[Cipher] GetCipherSpecString success");
return res;
CipherSpecItem specItem = CipherSpecItem(item);
char *returnString = nullptr;
*errCode = instance->GetCipherSpecString(specItem, &returnString);
LOGD("[Cipher] FfiOHOSGetCipherSpecString success");
return returnString;
}
int32_t FfiOHOSGetCipherSpecUint8Array(int64_t id, int32_t item, HcfBlob *returnUint8Array)
@ -781,16 +783,19 @@ namespace OHOS {
return sign->SetSignSpecByArr(itemValue);
}
int32_t FFiOHOSSignGetSignSpecString(int64_t id, SignSpecItem item, char *itemValue)
char *FFiOHOSSignGetSignSpecString(int64_t id, SignSpecItem item, int32_t *errCode)
{
LOGD("[Sign] FFiOHOSSignGetSignSpecString start");
auto sign = FFIData::GetData<SignImpl>(id);
if (sign == nullptr) {
LOGE("[Sign] FFiOHOSSignGetSignSpecString failed to get sign obj.");
return HCF_INVALID_PARAMS;
*errCode = HCF_INVALID_PARAMS;
return nullptr;
}
char *returnString = nullptr;
*errCode = sign->GetSignSpecString(item, &returnString);
LOGD("[Sign] FFiOHOSSignGetSignSpecString success");
return sign->GetSignSpecString(item, itemValue);
return returnString;
}
int32_t FFiOHOSSignGetSignSpecNum(int64_t id, SignSpecItem item, int32_t *itemValue)
@ -910,16 +915,19 @@ namespace OHOS {
return verify->SetVerifySpecByArr(itemValue);
}
int32_t FFiOHOSVerifyGetVerifySpecString(int64_t id, SignSpecItem item, char *itemValue)
char *FFiOHOSVerifyGetVerifySpecString(int64_t id, SignSpecItem item, int32_t *errCode)
{
LOGD("[Verify] FFiOHOSVerifyGetVerifySpecString start");
auto verify = FFIData::GetData<VerifyImpl>(id);
if (verify == nullptr) {
LOGE("[Verify] FFiOHOSVerifyGetVerifySpecString failed to get verify obj.");
return HCF_INVALID_PARAMS;
*errCode = HCF_INVALID_PARAMS;
return nullptr;
}
char *returnString = nullptr;
*errCode = verify->GetVerifySpecString(item, &returnString);
LOGD("[Verify] FFiOHOSVerifyGetVerifySpecString success");
return verify->GetVerifySpecString(item, itemValue);
return returnString;
}
int32_t FFiOHOSVerifyGetVerifySpecNum(int64_t id, SignSpecItem item, int32_t *itemValue)
@ -1634,6 +1642,21 @@ namespace OHOS {
return key;
}
int64_t FfiOHOSPubKeyFromRawPointer(void *ptr, const char **retString, int32_t *errCode)
{
LOGD("[PubKey] FfiOHOSPubKeyFromRawPointer start");
HcfPubKey *pubKey = static_cast<HcfPubKey *>(ptr);
auto pub = FFIData::Create<PubKeyImpl>(pubKey);
if (pub == nullptr) {
*errCode = HCF_ERR_MALLOC;
LOGE("new pub key failed");
return 0;
}
*retString = pubKey->base.getAlgorithm(&pubKey->base);
LOGD("[PubKey] FfiOHOSPubKeyFromRawPointer success");
return pub->GetID();
}
// ------------------------------------keypair
int64_t FFiOHOSKeyPairPubKey(int64_t id, int32_t *errCode)
{

4
frameworks/cj/src/sign_impl.cpp
View File

@ -67,12 +67,12 @@ HcfResult SignImpl::SetSignSpecByArr(HcfBlob itemValue)
return this->signObj_->setSignSpecUint8Array(signObj_, SM2_USER_ID_UINT8ARR, itemValue);
}
HcfResult SignImpl::GetSignSpecString(SignSpecItem item, char *itemValue)
HcfResult SignImpl::GetSignSpecString(SignSpecItem item, char **itemValue)
{
if (this->signObj_ == nullptr) {
return HCF_INVALID_PARAMS;
}
return this->signObj_->getSignSpecString(signObj_, item, &itemValue);
return this->signObj_->getSignSpecString(signObj_, item, itemValue);
}
HcfResult SignImpl::GetSignSpecNum(SignSpecItem item, int32_t *itemValue)

4
frameworks/cj/src/verify_impl.cpp
View File

@ -77,12 +77,12 @@ HcfResult VerifyImpl::SetVerifySpecByArr(HcfBlob itemValue)
return this->verify_->setVerifySpecUint8Array(verify_, SM2_USER_ID_UINT8ARR, itemValue);
}
HcfResult VerifyImpl::GetVerifySpecString(SignSpecItem item, char *itemValue)
HcfResult VerifyImpl::GetVerifySpecString(SignSpecItem item, char **itemValue)
{
if (this->verify_ == nullptr) {
return HCF_INVALID_PARAMS;
}
return this->verify_->getVerifySpecString(verify_, item, &itemValue);
return this->verify_->getVerifySpecString(verify_, item, itemValue);
}
HcfResult VerifyImpl::GetVerifySpecNum(SignSpecItem item, int32_t *itemValue)