From 3f6cec0e7306f6939eb50bf931581d6e98f207ab Mon Sep 17 00:00:00 2001 From: winnie-hu Date: Tue, 20 Sep 2022 22:21:57 +0800 Subject: [PATCH] fix cert(C code) cppcheck Signed-off-by: winnie-hu --- common/inc/hcf_parcel.h | 46 --- common/inc/hcf_string.h | 9 - common/src/hcf_parcel.c | 326 ------------------ common/src/hcf_string.c | 21 -- .../certificate/src/x509_crl_openssl.c | 5 - 5 files changed, 407 deletions(-) diff --git a/common/inc/hcf_parcel.h b/common/inc/hcf_parcel.h index 83d9c09..cc6d809 100644 --- a/common/inc/hcf_parcel.h +++ b/common/inc/hcf_parcel.h @@ -37,58 +37,12 @@ extern "C" { HcParcel CreateParcel(uint32_t size, uint32_t allocUnit); void DeleteParcel(HcParcel *parcel); - void ClearParcel(HcParcel *parcel); - void ResetParcel(HcParcel *parcel, uint32_t size, uint32_t allocUnit); - bool ParcelReadWithoutPopData(HcParcel *parcel, void *dst, uint32_t dataSize); - bool ParcelRead(HcParcel *parcel, void *dst, uint32_t dataSize); bool ParcelWrite(HcParcel *parcel, const void *src, uint32_t dataSize); - bool ParcelReadRevert(HcParcel *parcel, void *dst, uint32_t dataSize); - bool ParcelWriteRevert(HcParcel *parcel, const void *src, uint32_t dataSize); uint32_t GetParcelDataSize(const HcParcel *parcel); const char *GetParcelData(const HcParcel *parcel); - const char* GetParcelLastChar(const HcParcel *parcel); - bool ParcelReadInt32(HcParcel *parcel, int *dst); - bool ParcelReadUint32(HcParcel *parcel, uint32_t *dst); - bool ParcelReadInt16(HcParcel *parcel, short *dst); - bool ParcelReadUint16(HcParcel *parcel, uint16_t *dst); - bool ParcelReadInt8(HcParcel *parcel, char *dst); - bool ParcelReadUint8(HcParcel *parcel, uint8_t *dst); - bool ParcelReadUint64(HcParcel *parcel, uint64_t *dst); - bool ParcelReadInt64(HcParcel *parcel, int64_t *dst); - bool ParcelWriteInt32(HcParcel *parcel, int src); - bool ParcelWriteUint32(HcParcel *parcel, uint32_t src); - bool ParcelWriteInt16(HcParcel *parcel, short src); - bool ParcelWriteUint16(HcParcel *parcel, uint16_t src); bool ParcelWriteInt8(HcParcel *parcel, char src); - bool ParcelWriteUint8(HcParcel *parcel, uint8_t src); - bool ParcelWriteUint64(HcParcel *parcel, uint64_t src); - bool ParcelWriteInt64(HcParcel *parcel, int64_t src); - bool ParcelWriteString(HcParcel *parcel, const char *str); - bool ParcelReadString(HcParcel *parcel, char **str); - bool ParcelReadParcel(HcParcel *src, HcParcel *dst, uint32_t size, bool copy); - bool ParcelCopy(HcParcel *src, HcParcel *dst); - - bool ParcelReadInt32Revert(HcParcel *parcel, int32_t *dst); - bool ParcelReadUint32Revert(HcParcel *parcel, uint32_t *dst); - bool ParcelReadInt16Revert(HcParcel *parcel, short *dst); - bool ParcelReadUint16Revert(HcParcel *parcel, uint16_t *dst); - bool ParcelReadInt8Revert(HcParcel *parcel, char *dst); - bool ParcelReadUint8Revert(HcParcel *parcel, uint8_t *dst); - bool ParcelReadUint64Revert(HcParcel *parcel, uint64_t *dst); - bool ParcelReadInt64Revert(HcParcel *parcel, int64_t *dst); - bool ParcelWriteInt32Revert(HcParcel *parcel, int src); - bool ParcelWriteUint32Revert(HcParcel *parcel, uint32_t src); - bool ParcelWriteInt16Revert(HcParcel *parcel, short src); - bool ParcelWriteUint16Revert(HcParcel *parcel, uint16_t src); - bool ParcelWriteInt8Revert(HcParcel *parcel, char src); - bool ParcelWriteUint8Revert(HcParcel *parcel, uint8_t src); - bool ParcelWriteUint64Revert(HcParcel *parcel, uint64_t src); - bool ParcelWriteInt64Revert(HcParcel *parcel, int64_t src); - - void DataRevert(void *data, uint32_t length); bool ParcelPopBack(HcParcel *parcel, uint32_t size); - bool ParcelPopFront(HcParcel *parcel, uint32_t size); #ifdef __cplusplus } diff --git a/common/inc/hcf_string.h b/common/inc/hcf_string.h index eb19c52..29eceb0 100644 --- a/common/inc/hcf_string.h +++ b/common/inc/hcf_string.h @@ -44,15 +44,6 @@ extern "C" { */ bool StringAppendPointer(HcString *self, const char *str); - /* - * Append a char - * Notice: It will add '\0' automatically. - * @param self: self pointer. - * @param str: char. - * @return true (ok), false (error) - */ - bool StringAppendChar(HcString *self, char c); - /* * Assign a value to the HcString * Notice: It will add '\0' automatically. diff --git a/common/src/hcf_parcel.c b/common/src/hcf_parcel.c index 9d2eba8..beb9667 100644 --- a/common/src/hcf_parcel.c +++ b/common/src/hcf_parcel.c @@ -53,23 +53,6 @@ void DeleteParcel(HcParcel *parcel) parcel->endPos = 0; } -void ClearParcel(HcParcel *parcel) -{ - if (parcel != NULL) { - parcel->beginPos = 0; - parcel->endPos = 0; - } -} - -void ResetParcel(HcParcel *parcel, uint32_t size, uint32_t allocUnit) -{ - if (parcel != NULL) { - DeleteParcel(parcel); - HcParcel newParcel = CreateParcel(size, allocUnit); - (void)memcpy_s(parcel, sizeof(HcParcel), &newParcel, sizeof(HcParcel)); - } -} - uint32_t GetParcelDataSize(const HcParcel *parcel) { if (parcel == NULL) { @@ -89,115 +72,6 @@ const char *GetParcelData(const HcParcel *parcel) return parcel->data + parcel->beginPos; } -const char *GetParcelLastChar(const HcParcel *parcel) -{ - if (parcel == NULL || GetParcelDataSize(parcel) == 0) { - return NULL; - } - return parcel->data + parcel->endPos - 1; -} - -bool ParcelReadWithoutPopData(HcParcel *parcel, void *dst, uint32_t dataSize) -{ -#ifdef IS_BIG_ENDIAN - bool ret = ParcelReadRevert(parcel, dst, dataSize); -#else - bool ret = ParcelRead(parcel, dst, dataSize); -#endif - if (ret == true) { - parcel->beginPos -= dataSize; - } - return ret; -} - -bool ParcelRead(HcParcel *parcel, void *dst, uint32_t dataSize) -{ - errno_t rc; - if (parcel == NULL || dst == NULL || dataSize == 0) { - return false; - } - if (parcel->beginPos > PARCEL_UINT_MAX - dataSize) { - return false; - } - if (parcel->beginPos + dataSize > parcel->endPos) { - return false; - } - rc = memmove_s(dst, dataSize, parcel->data + parcel->beginPos, dataSize); - if (rc != EOK) { - return false; - } - parcel->beginPos += dataSize; - return true; -} - -bool ParcelReadRevert(HcParcel *parcel, void *dst, uint32_t dataSize) -{ - if (ParcelRead(parcel, dst, dataSize)) { - DataRevert(dst, dataSize); - return true; - } else { - return false; - } -} - -bool ParcelWriteRevert(HcParcel *parcel, const void *src, uint32_t dataSize) -{ - errno_t rc; - void *srcCopy = HcfMalloc(dataSize, 0); - if (srcCopy == NULL) { - return false; - } - rc = memmove_s(srcCopy, dataSize, src, dataSize); - if (rc != EOK) { - HcfFree(srcCopy); - return false; - } - DataRevert(srcCopy, dataSize); - bool ret = ParcelWrite(parcel, srcCopy, dataSize); - HcfFree(srcCopy); - return ret; -} - -bool ParcelReadInt32(HcParcel *parcel, int *dst) -{ - return ParcelRead(parcel, dst, sizeof(int)); -} - -bool ParcelReadUint32(HcParcel *parcel, uint32_t *dst) -{ - return ParcelRead(parcel, dst, sizeof(uint32_t)); -} - -bool ParcelReadInt16(HcParcel *parcel, short *dst) -{ - return ParcelRead(parcel, dst, sizeof(short)); -} - -bool ParcelReadUint16(HcParcel *parcel, uint16_t *dst) -{ - return ParcelRead(parcel, dst, sizeof(uint16_t)); -} - -bool ParcelReadInt8(HcParcel *parcel, char *dst) -{ - return ParcelRead(parcel, dst, sizeof(char)); -} - -bool ParcelReadUint8(HcParcel *parcel, uint8_t *dst) -{ - return ParcelRead(parcel, dst, sizeof(uint8_t)); -} - -bool ParcelReadUint64(HcParcel *parcel, uint64_t *dst) -{ - return ParcelRead(parcel, dst, sizeof(uint64_t)); -} - -bool ParcelReadInt64(HcParcel *parcel, int64_t *dst) -{ - return ParcelRead(parcel, dst, sizeof(int64_t)); -} - static bool ParcelRealloc(HcParcel *parcel, uint32_t size) { if (parcel->length >= size) { @@ -294,202 +168,11 @@ bool ParcelWrite(HcParcel *parcel, const void *src, uint32_t dataSize) return true; } -bool ParcelWriteInt32(HcParcel *parcel, int src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - -bool ParcelWriteUint32(HcParcel *parcel, uint32_t src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - -bool ParcelWriteInt16(HcParcel *parcel, short src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - -bool ParcelWriteUint16(HcParcel *parcel, uint16_t src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - bool ParcelWriteInt8(HcParcel *parcel, char src) { return ParcelWrite(parcel, &src, sizeof(src)); } -bool ParcelWriteUint8(HcParcel *parcel, uint8_t src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - -bool ParcelWriteUint64(HcParcel *parcel, uint64_t src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - -bool ParcelWriteInt64(HcParcel *parcel, int64_t src) -{ - return ParcelWrite(parcel, &src, sizeof(src)); -} - -bool ParcelReadParcel(HcParcel *src, HcParcel *dst, uint32_t size, bool copy) -{ - if (src == NULL || dst == NULL) { - return false; - } - if (GetParcelDataSize(src) < size) { - return false; - } - if (!ParcelWrite(dst, (void *)GetParcelData(src), size)) { - return false; - } - - if (!copy) { - src->beginPos += size; - } - return true; -} - -bool ParcelCopy(HcParcel *src, HcParcel *dst) -{ - if (src == NULL || dst == NULL) { - return false; - } - if (GetParcelDataSize(src) == 0) { - return true; - } - return ParcelReadParcel(src, dst, GetParcelDataSize(src), true); -} - -void DataRevert(void *data, uint32_t length) -{ - if (data != NULL) { - uint8_t *pc = (uint8_t *)data; - uint32_t i = 0; - for (; i < length / HALF_LEN; ++i) { /* half of the length */ - /* swap p[i] and p[length-i-1] */ - pc[i] ^= pc[length - i - 1]; - pc[length - i - 1] ^= pc[i]; - pc[i] ^= pc[length - i - 1]; - } - } -} - -bool ParcelReadInt32Revert(HcParcel *parcel, int32_t *dst) -{ - bool ret = ParcelRead(parcel, dst, sizeof(int)); - if (ret) { - DataRevert(dst, sizeof(int)); - } - return ret; -} - -bool ParcelReadUint32Revert(HcParcel *parcel, uint32_t *dst) -{ - bool ret = ParcelRead(parcel, dst, sizeof(uint32_t)); - if (ret) { - DataRevert(dst, sizeof(uint32_t)); - } - return ret; -} - -bool ParcelReadInt16Revert(HcParcel *parcel, short *dst) -{ - bool ret = ParcelRead(parcel, dst, sizeof(short)); - if (ret) { - DataRevert(dst, sizeof(short)); - } - return ret; -} - -bool ParcelReadUint16Revert(HcParcel *parcel, uint16_t *dst) -{ - if (parcel == NULL || dst == NULL) { - return false; - } - bool ret = ParcelRead(parcel, dst, sizeof(uint16_t)); - if (ret) { - DataRevert(dst, sizeof(uint16_t)); - } - return ret; -} - -bool ParcelReadInt8Revert(HcParcel *parcel, char *dst) -{ - return ParcelRead(parcel, dst, sizeof(char)); -} - -bool ParcelReadUint8Revert(HcParcel *parcel, uint8_t *dst) -{ - return ParcelRead(parcel, dst, sizeof(uint8_t)); -} - -bool ParcelReadUint64Revert(HcParcel *parcel, uint64_t *dst) -{ - bool ret = ParcelRead(parcel, dst, sizeof(uint64_t)); - if (ret) { - DataRevert(dst, sizeof(uint64_t)); - } - return ret; -} - -bool ParcelReadInt64Revert(HcParcel *parcel, int64_t *dst) -{ - bool ret = ParcelRead(parcel, dst, sizeof(int64_t)); - if (ret) { - DataRevert(dst, sizeof(int64_t)); - } - return ret; -} - -bool ParcelWriteInt32Revert(HcParcel *parcel, int src) -{ - DataRevert(&src, sizeof(src)); - return ParcelWriteInt32(parcel, src); -} - -bool ParcelWriteUint32Revert(HcParcel *parcel, uint32_t src) -{ - DataRevert(&src, sizeof(src)); - return ParcelWriteUint32(parcel, src); -} - -bool ParcelWriteInt16Revert(HcParcel *parcel, short src) -{ - DataRevert(&src, sizeof(src)); - return ParcelWriteInt16(parcel, src); -} - -bool ParcelWriteUint16Revert(HcParcel *parcel, uint16_t src) -{ - DataRevert(&src, sizeof(src)); - return ParcelWriteUint16(parcel, src); -} - -bool ParcelWriteInt8Revert(HcParcel *parcel, char src) -{ - return ParcelWriteInt8(parcel, src); -} - -bool ParcelWriteUint8Revert(HcParcel *parcel, uint8_t src) -{ - return ParcelWriteUint8(parcel, src); -} - -bool ParcelWriteUint64Revert(HcParcel *parcel, uint64_t src) -{ - DataRevert(&src, sizeof(src)); - return ParcelWriteUint64(parcel, src); -} - -bool ParcelWriteInt64Revert(HcParcel *parcel, int64_t src) -{ - DataRevert(&src, sizeof(src)); - return ParcelWriteInt64(parcel, src); -} - bool ParcelPopBack(HcParcel *parcel, uint32_t size) { if (parcel != NULL && size > 0 && GetParcelDataSize(parcel) >= size) { @@ -498,12 +181,3 @@ bool ParcelPopBack(HcParcel *parcel, uint32_t size) } return false; } - -bool ParcelPopFront(HcParcel *parcel, uint32_t size) -{ - if ((parcel != NULL) && (size > 0) && (GetParcelDataSize(parcel) >= size)) { - parcel->beginPos += size; - return true; - } - return false; -} diff --git a/common/src/hcf_string.c b/common/src/hcf_string.c index 8ed5c62..5d3eb61 100644 --- a/common/src/hcf_string.c +++ b/common/src/hcf_string.c @@ -61,27 +61,6 @@ bool StringAppendPointer(HcString *self, const char *str) return false; } -/* -* Append a char -* Notice: It will add '\0' automatically. -* @param self: self pointer. -* @param str: char. -* @return true (ok), false (error) -*/ -bool StringAppendChar(HcString *self, char c) -{ - if (self != NULL && c != STRING_END_CHAR) { - // remove '\0' - ParcelPopBack(&self->parcel, STRING_END_CHAR_LENGTH); - - if (ParcelWriteInt8(&self->parcel, c)) { - return ParcelWriteInt8(&self->parcel, (uint32_t)STRING_END_CHAR); - } - } - - return false; -} - /* * Assign a value to the HcString * Notice: It will add '\0' automatically. diff --git a/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c b/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c index 3eb9451..aa9a46c 100644 --- a/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c +++ b/plugin/openssl_plugin/certificate/src/x509_crl_openssl.c @@ -36,11 +36,6 @@ #include "x509_crl_entry_openssl.h" #include "x509_crl_spi.h" -typedef struct { - HcfPubKey base; - EVP_PKEY *pubKey; -} X509PubKeyOpensslImpl; - typedef struct { HcfX509CrlSpi base; X509_CRL *crl; -- Gitee