Security-55471.14.4.tar.gz

[apple/security.git] / libsecurity_cdsa_plugin / lib / CSPsession.cpp

diff --git a/libsecurity_cdsa_plugin/lib/CSPsession.cpp b/libsecurity_cdsa_plugin/lib/CSPsession.cpp
index 862df1675a1c940dda45ce436fe8f0e156512c8d..d3eb96087e8319889148c8a342c316976cc31433 100644 (file)
--- a/libsecurity_cdsa_plugin/lib/CSPsession.cpp
+++ b/libsecurity_cdsa_plugin/lib/CSPsession.cpp
@@ -432,7 +432,7 @@ void CSPFullPluginSession::QuerySize(CSSM_CC_HANDLE ccHandle,
        for (uint32 n = 0; n < querySizeCount; n++) {
                // the outputSize() call might throw CSSMERR_CSP_QUERY_SIZE_UNKNOWN
                dataBlock[n].SizeOutputBlock =
        for (uint32 n = 0; n < querySizeCount; n++) {
                // the outputSize() call might throw CSSMERR_CSP_QUERY_SIZE_UNKNOWN
                dataBlock[n].SizeOutputBlock =

-                       ctx->outputSize(n == querySizeCount-1, dataBlock[n].inputSize());
+                       (uint32)ctx->outputSize(n == querySizeCount-1, dataBlock[n].inputSize());

        }
        //@@@ if we forced a context creation, should we discard it now?
 }
        }
        //@@@ if we forced a context creation, should we discard it now?
 }


@@ -1039,8 +1039,8 @@ void
 KeyPool::add(ReferencedKey &referencedKey)
 {
        StLock<Mutex> _(mKeyMapLock);
 KeyPool::add(ReferencedKey &referencedKey)
 {
        StLock<Mutex> _(mKeyMapLock);

-       IFDEBUG(bool inserted =)
-               mKeyMap.insert(KeyMap::value_type(referencedKey.keyReference(), &referencedKey)).second;
+       bool inserted;
+    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);