Security-59754.41.1.tar.gz

[apple/security.git] / OSX / libsecurity_apple_csp / lib / BlockCryptor.cpp

diff --git a/OSX/libsecurity_apple_csp/lib/BlockCryptor.cpp b/OSX/libsecurity_apple_csp/lib/BlockCryptor.cpp
index d694ee91f79e050279249e09589e29045bb04933..feed16618f34bff8293bc58772f4a6b0eae14294 100644 (file)
--- a/OSX/libsecurity_apple_csp/lib/BlockCryptor.cpp
+++ b/OSX/libsecurity_apple_csp/lib/BlockCryptor.cpp
@@ -30,9 +30,9 @@
 #include <security_utilities/debugging.h>
 #include <security_cdsa_utilities/cssmdata.h>
 
 #include <security_utilities/debugging.h>
 #include <security_cdsa_utilities/cssmdata.h>
 

-#define BlockCryptDebug(args...)       secdebug("blockCrypt", ## args)
-#define bprintf(args...)                       secdebug("blockCryptBuf", ## args)
-#define ioprintf(args...)                      secdebug("blockCryptIo", ## args)
+#define BlockCryptDebug(args...)       secinfo("blockCrypt", ## args)
+#define bprintf(args...)                       secinfo("blockCryptBuf", ## args)
+#define ioprintf(args...)                      secinfo("blockCryptIo", ## args)

 
 BlockCryptor::~BlockCryptor()
 {
 
 BlockCryptor::~BlockCryptor()
 {


@@ -317,7 +317,7 @@ void BlockCryptor::update(
        /* 
         * en/decrypt even blocks in (remaining) inp.  
         */
        /* 
         * en/decrypt even blocks in (remaining) inp.  
         */

-       size_t leftOver = uInSize % mInBlockSize;
+    size_t leftOver = (mInBlockSize > 0) ? uInSize % mInBlockSize : 0;

        if((leftOver == 0) && needLeftOver) {
                /* 
                 * Even blocks coming in, but we really need to leave some data
        if((leftOver == 0) && needLeftOver) {
                /* 
                 * Even blocks coming in, but we really need to leave some data


@@ -327,7 +327,7 @@ void BlockCryptor::update(
                leftOver = mInBlockSize; 
        }
        toMove = uInSize - leftOver;
                leftOver = mInBlockSize; 
        }
        toMove = uInSize - leftOver;

-       size_t blocks = toMove / mInBlockSize;
+    size_t blocks = (mInBlockSize > 0) ? toMove / mInBlockSize : 0;

        if(mMultiBlockCapable && !doCbc && (blocks != 0)) {
                /* 
                 * Optimization for algorithms that are multi-block capable and that
        if(mMultiBlockCapable && !doCbc && (blocks != 0)) {
                /* 
                 * Optimization for algorithms that are multi-block capable and that