Security-55471.14.8.tar.gz

[apple/security.git] / libsecurity_apple_csp / lib / wrapKeyCms.cpp

diff --git a/libsecurity_apple_csp/lib/wrapKeyCms.cpp b/libsecurity_apple_csp/lib/wrapKeyCms.cpp
index b35ac45e465506626509bf95db1ed08551b44aa0..75d64867e06cb130188aa033e6b4c866c91182af 100644 (file)
--- a/libsecurity_apple_csp/lib/wrapKeyCms.cpp
+++ b/libsecurity_apple_csp/lib/wrapKeyCms.cpp
@@ -151,9 +151,9 @@ void AppleCSPSession::WrapKeyCms(
                ddLen = 0;
        }
        else {
                ddLen = 0;
        }
        else {

-               ddLen = DescriptiveData->Length;
+               ddLen = (uint32) DescriptiveData->Length;

        }
        }

-       uint32 pkbLen = 4 +  ddLen + rawBlob.Length;
+       size_t pkbLen = 4 +  ddLen + rawBlob.Length;

        setUpCssmData(PRIVATE_KEY_BYTES, pkbLen, privAllocator);
        uint8 *cp = PRIVATE_KEY_BYTES.Data;
        serializeUint32(ddLen, cp);
        setUpCssmData(PRIVATE_KEY_BYTES, pkbLen, privAllocator);
        uint8 *cp = PRIVATE_KEY_BYTES.Data;
        serializeUint32(ddLen, cp);


@@ -234,7 +234,7 @@ void AppleCSPSession::WrapKeyCms(
        #endif  /* REUSE_CONTEXT */
        
        uint8 *savedIV = IV2.Data;
        #endif  /* REUSE_CONTEXT */
        
        uint8 *savedIV = IV2.Data;

-       uint32 savedIVLen = IV2.Length;
+       CSSM_SIZE savedIVLen = IV2.Length;

        IV2.Data = (uint8 *)magicCmsIv;
        IV2.Length = 8;
        CssmData &outBlob = CssmData::overlay(WrappedKey.KeyData);
        IV2.Data = (uint8 *)magicCmsIv;
        IV2.Length = 8;
        CssmData &outBlob = CssmData::overlay(WrappedKey.KeyData);


@@ -317,7 +317,7 @@ void AppleCSPSession::UnwrapKeyCms(
        CssmData &IV1 = Context.get<CssmData>(CSSM_ATTRIBUTE_INIT_VECTOR, 
                                CSSMERR_CSP_MISSING_ATTR_INIT_VECTOR);
        uint8 *savedIV = IV1.Data;
        CssmData &IV1 = Context.get<CssmData>(CSSM_ATTRIBUTE_INIT_VECTOR, 
                                CSSMERR_CSP_MISSING_ATTR_INIT_VECTOR);
        uint8 *savedIV = IV1.Data;

-       uint32 savedIvLen = IV1.Length;
+       CSSM_SIZE savedIvLen = IV1.Length;

        IV1.Data = (uint8 *)magicCmsIv;
        IV1.Length = 8;
        CssmData TEMP3;
        IV1.Data = (uint8 *)magicCmsIv;
        IV1.Length = 8;
        CssmData TEMP3;


@@ -432,7 +432,7 @@ void AppleCSPSession::UnwrapKeyCms(
        setUpCssmData(DescriptiveData, ddLen, normAllocator);
        memcpy(DescriptiveData.Data, cp1, ddLen);
        cp1 += ddLen;
        setUpCssmData(DescriptiveData, ddLen, normAllocator);
        memcpy(DescriptiveData.Data, cp1, ddLen);
        cp1 += ddLen;

-       uint32 outBlobLen = PRIVATE_KEY_BYTES.Length - ddLen - 4;
+       size_t outBlobLen = PRIVATE_KEY_BYTES.Length - ddLen - 4;

        if(ddLen > MAX_MALLOC_SIZE) {
                dprintf0("UnwrapKeyCms: preposterous outBlobLen in PRIVATE_KEY_BYTES\n");
                CssmError::throwMe(CSSMERR_CSP_INVALID_KEY);
        if(ddLen > MAX_MALLOC_SIZE) {
                dprintf0("UnwrapKeyCms: preposterous outBlobLen in PRIVATE_KEY_BYTES\n");
                CssmError::throwMe(CSSMERR_CSP_INVALID_KEY);