Security-55471.14.4.tar.gz

[apple/security.git] / libsecurity_cdsa_client / lib / keyclient.cpp

diff --git a/libsecurity_cdsa_client/lib/keyclient.cpp b/libsecurity_cdsa_client/lib/keyclient.cpp
index f179e432d1419ab125cd0c081295e30de98d7423..77e56255f75af3878c0fbfb655e1b65b28663e93 100644 (file)
--- 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<uint8>(keyData.Length)) 
+CssmKey((uint32)keyData.Length, csp->allocator().alloc<uint8>((UInt32)keyData.Length))
 {
        memcpy(KeyData.Data, keyData.Data, keyData.Length);
        mActive=true;
 }
 
 KeyImpl::~KeyImpl()
+try
+{
+    deactivate();
+}
+catch (...)
 {
-       try
-       {
-               deactivate();
-       }
-       catch(...) {}
 }
 
 void