Security-164.1.tar.gz

[apple/security.git] / cdsa / cdsa_pluginlib / CSPsession.cpp

diff --git a/cdsa/cdsa_pluginlib/CSPsession.cpp b/cdsa/cdsa_pluginlib/CSPsession.cpp
index f972732d7c71a2427e65535091950459a236e646..ffa64479b2d83759a1ea1a7834a85733b6bcc71f 100644 (file)
--- a/cdsa/cdsa_pluginlib/CSPsession.cpp
+++ b/cdsa/cdsa_pluginlib/CSPsession.cpp
@@ -714,7 +714,7 @@ void CSPFullPluginSession::QueryKeySizeInBits(CSSM_CC_HANDLE ccHandle,
                                                CSSM_KEY_SIZE &keySize)
 {
        if (context) {
                                                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);
                        keySize);
        } else {
                getKeySize(CssmKey::required(key), keySize);


@@ -913,7 +913,8 @@ void
 KeyPool::add(ReferencedKey &referencedKey)
 {
        StLock<Mutex> _(mKeyMapLock);
 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);
        // Since add is only called from the constructor of ReferencedKey we should
        // never add a key that is already in mKeyMap
        assert(inserted);