X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/313fa17b58b78d3c26fb986be9e8fce975cec88c..e3d3b979fd185d8303f28a937baa53a187fb8c7d:/libsecurity_cdsa_client/lib/keyclient.cpp?ds=sidebyside diff --git a/libsecurity_cdsa_client/lib/keyclient.cpp b/libsecurity_cdsa_client/lib/keyclient.cpp index f179e432..77e56255 100644 --- a/libsecurity_cdsa_client/lib/keyclient.cpp +++ b/libsecurity_cdsa_client/lib/keyclient.cpp @@ -39,19 +39,19 @@ KeyImpl::KeyImpl(const CSP &csp, const CSSM_KEY &key, bool copy) : ObjectImpl(cs } KeyImpl::KeyImpl(const CSP &csp, const CSSM_DATA &keyData) : ObjectImpl(csp), -CssmKey(keyData.Length, csp->allocator().alloc(keyData.Length)) +CssmKey((uint32)keyData.Length, csp->allocator().alloc((UInt32)keyData.Length)) { memcpy(KeyData.Data, keyData.Data, keyData.Length); mActive=true; } KeyImpl::~KeyImpl() +try +{ + deactivate(); +} +catch (...) { - try - { - deactivate(); - } - catch(...) {} } void