From 655a517a7f8ae2c563d5115087aad55719598b7b Mon Sep 17 00:00:00 2001 From: Anju Date: Wed, 27 Mar 2013 10:25:36 +0530 Subject: [PATCH] [Pkcs] Fixed the TC's failure Change-Id: I2f92fadeff4a3aaca0411e7accc1231623b360a4 Signed-off-by: Anju --- src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.cpp | 1 - src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.cpp | 1 - src/security/pkcs/FSecPkcs_Rc2CbcParametersImpl.cpp | 3 --- 3 files changed, 5 deletions(-) diff --git a/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.cpp b/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.cpp index 7eb20c4..f82d0ac 100644 --- a/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.cpp +++ b/src/security/pkcs/FSecPkcs_Pkcs08AttributeImpl.cpp @@ -52,7 +52,6 @@ _Pkcs08AttributeImpl::_Pkcs08AttributeImpl(void) _Pkcs08AttributeImpl::~_Pkcs08AttributeImpl(void) { //do nothing - __attributeValues.RemoveAll(true); } result diff --git a/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.cpp b/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.cpp index ff46b81..d5ab859 100644 --- a/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.cpp +++ b/src/security/pkcs/FSecPkcs_Pkcs08PrivateKeyInfoImpl.cpp @@ -56,7 +56,6 @@ _Pkcs08PrivateKeyInfoImpl::_Pkcs08PrivateKeyInfoImpl(void) _Pkcs08PrivateKeyInfoImpl::~_Pkcs08PrivateKeyInfoImpl(void) { //do nothing - __attributes.RemoveAll(true); } diff --git a/src/security/pkcs/FSecPkcs_Rc2CbcParametersImpl.cpp b/src/security/pkcs/FSecPkcs_Rc2CbcParametersImpl.cpp index 6ebee37..2060a5a 100644 --- a/src/security/pkcs/FSecPkcs_Rc2CbcParametersImpl.cpp +++ b/src/security/pkcs/FSecPkcs_Rc2CbcParametersImpl.cpp @@ -185,12 +185,10 @@ _Rc2CbcParametersImpl::GetEncodedDataN(void) const value = i2d_ASN1_OCTET_STRING(pInitialVectorStr, &pTemp); SysTryCatch(NID_SEC_CRYPTO, value > 0, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error."); SysTryCatch(NID_SEC_CRYPTO, pTemp != null, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error."); - ASN1_OCTET_STRING_free(pInitialVectorStr); } else { - pAsn1Type = ASN1_TYPE_new(); SysTryCatch(NID_SEC_CRYPTO, pAsn1Type != null, r = E_OUT_OF_MEMORY, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY] The memory is insufficient."); @@ -201,7 +199,6 @@ _Rc2CbcParametersImpl::GetEncodedDataN(void) const SysTryCatch(NID_SEC_CRYPTO, value > 0, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error."); SysTryCatch(NID_SEC_CRYPTO, pTemp != null, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] The method cannot proceed due to a severe system error."); - ASN1_TYPE_free(pAsn1Type); } pEncRc2CbcParam = std::unique_ptr< ByteBuffer >(new (std::nothrow) ByteBuffer()); -- 2.7.4