Security-55471.14.8.tar.gz

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

diff --git a/libsecurity_apple_csp/lib/aescsp.cpp b/libsecurity_apple_csp/lib/aescsp.cpp
index 9f068b3a40eaf90075802dd86598805a61469134..65d769dfbeaae3bf1ee9a2a871f0e09ae955a091 100644 (file)
--- a/libsecurity_apple_csp/lib/aescsp.cpp
+++ b/libsecurity_apple_csp/lib/aescsp.cpp
@@ -162,8 +162,8 @@ void AESContext::init(
        /* init key only if key size, block size, or key bits have changed */
        if(!sameKeyAndBlockSizes || memcmp(mRawKey, keyData, mRawKeySize)) {
                int artn = makeKey((keyInstance *)mAesKey, 
        /* init key only if key size, block size, or key bits have changed */
        if(!sameKeyAndBlockSizes || memcmp(mRawKey, keyData, mRawKeySize)) {
                int artn = makeKey((keyInstance *)mAesKey, 

-                       keyLen * 8, 
-                       mBlockSize * 8, 
+                       (int)keyLen * 8,
+                        mBlockSize * 8,

                        (word8 *)keyData,
                        opt128);
                if(artn < 0) {
                        (word8 *)keyData,
                        opt128);
                if(artn < 0) {


@@ -172,7 +172,7 @@ void AESContext::init(
                
                /* save this raw key data */
                memmove(mRawKey, keyData, mRawKeySize); 
                
                /* save this raw key data */
                memmove(mRawKey, keyData, mRawKeySize); 

-               mRawKeySize = keyLen;
+               mRawKeySize = (uint32)keyLen;

        }
 
 #if            !GLADMAN_AES_128_ENABLE
        }
 
 #if            !GLADMAN_AES_128_ENABLE