X-Git-Url: https://git.saurik.com/apple/security.git/blobdiff_plain/bac41a7b9a0a9254fa30f8bb6e6038ab71a483e2..9a27adb241486ab7597ffaea2b5613cd3d8e1f60:/cdsa/cdsa_pluginlib/CSPsession.cpp

diff --git a/cdsa/cdsa_pluginlib/CSPsession.cpp b/cdsa/cdsa_pluginlib/CSPsession.cpp
index d18fd08e..ffa64479 100644
--- a/cdsa/cdsa_pluginlib/CSPsession.cpp
+++ b/cdsa/cdsa_pluginlib/CSPsession.cpp
@@ -40,7 +40,7 @@ CSPPluginSession::PluginContext::~PluginContext()
 //
 // Internal utilities
 //
-inline CssmData CSPFullPluginSession::makeBuffer(size_t size, CssmAllocator &alloc)
+CssmData CSPFullPluginSession::makeBuffer(size_t size, CssmAllocator &alloc)
 {
 	return CssmData(alloc.malloc(size), size);
 }
@@ -655,7 +655,10 @@ void CSPFullPluginSession::DigestDataFinal(CSSM_CC_HANDLE ccHandle,
 void CSPFullPluginSession::DigestDataClone(CSSM_CC_HANDLE ccHandle,
                                            CSSM_CC_HANDLE clonedCCHandle)
 {
-	setContext(clonedCCHandle, getStagedContext(ccHandle, CSSM_ALGCLASS_DIGEST)->clone(*this));
+    CSPContext *cloned = getStagedContext(ccHandle, CSSM_ALGCLASS_DIGEST)->clone(*this);
+    cloned->mDirection = true;
+    cloned->mType = CSSM_ALGCLASS_DIGEST;
+    setContext(clonedCCHandle, cloned);
 }
 
 
@@ -711,7 +714,7 @@ void CSPFullPluginSession::QueryKeySizeInBits(CSSM_CC_HANDLE ccHandle,
 						CSSM_KEY_SIZE &keySize)
 {
 	if (context) {
-		getKeySize(context->get<CSSM_KEY>(CSSM_ATTRIBUTE_KEY, CSSMERR_CSP_MISSING_ATTR_KEY),
+		getKeySize(context->get<CssmKey>(CSSM_ATTRIBUTE_KEY, CSSMERR_CSP_MISSING_ATTR_KEY),
 			keySize);
 	} else {
 		getKeySize(CssmKey::required(key), keySize);
@@ -910,7 +913,8 @@ void
 KeyPool::add(ReferencedKey &referencedKey)
 {
 	StLock<Mutex> _(mKeyMapLock);
-	bool inserted = mKeyMap.insert(KeyMap::value_type(referencedKey.keyReference(), &referencedKey)).second;
+	IFDEBUG(bool inserted =)
+		mKeyMap.insert(KeyMap::value_type(referencedKey.keyReference(), &referencedKey)).second;
 	// Since add is only called from the constructor of ReferencedKey we should
 	// never add a key that is already in mKeyMap
 	assert(inserted);