Update to NSS 3.16.2 Beta 3.

nss/lib/freebl/ctr.c

 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
 #endif
 #include "prtypes.h"
 #include "blapit.h"
 #include "blapii.h"
@@ skipping 64 matching lines @@
 /*
  * Used by counter mode. Increment the counter block. Not all bits in the
  * counter block are part of the counter, counterBits tells how many bits
  * are part of the counter. The counter block is blocksize long. It's a
  * big endian value.
  *
  * XXX Does not handle counter rollover.
  */
 static void
 ctr_GetNextCtr(unsigned char *counter, unsigned int counterBits,
-                unsigned int blocksize)
+               unsigned int blocksize)
 {
     unsigned char *counterPtr = counter + blocksize - 1;
     unsigned char mask, count;
 
     PORT_Assert(counterBits <= blocksize*PR_BITS_PER_BYTE);
     while (counterBits >= PR_BITS_PER_BYTE) {
         if (++(*(counterPtr--))) {
             return;
         }
         counterBits -= PR_BITS_PER_BYTE;
     }
     if (counterBits == 0) {
         return;
     }
     /* increment the final partial byte */
     mask = (1 << counterBits)-1;
     count = ++(*counterPtr) & mask;
     *counterPtr = ((*counterPtr) & ~mask) | count;
     return;
 }
 
 static void
 ctr_xor(unsigned char *target, const unsigned char *x,
-         const unsigned char *y, unsigned int count)
+        const unsigned char *y, unsigned int count)
 {
     unsigned int i;
     for (i=0; i < count; i++) {
         *target++ = *x++ ^ *y++;
     }
 }
 
 SECStatus
 CTR_Update(CTRContext *ctr, unsigned char *outbuf,
-                unsigned int *outlen, unsigned int maxout,
-                const unsigned char *inbuf, unsigned int inlen,
-                unsigned int blocksize)
+           unsigned int *outlen, unsigned int maxout,
+           const unsigned char *inbuf, unsigned int inlen,
+           unsigned int blocksize)
 {
     unsigned int tmp;
     SECStatus rv;
 
     if (maxout < inlen) {
         *outlen = inlen;
         PORT_SetError(SEC_ERROR_OUTPUT_LEN);
         return SECFailure;
     }
     *outlen = 0;
     if (ctr->bufPtr != blocksize) {
         unsigned int needed = PR_MIN(blocksize-ctr->bufPtr, inlen);
-        ctr_xor(outbuf, inbuf, ctr->buffer+ctr->bufPtr, needed);
+        ctr_xor(outbuf, inbuf, ctr->buffer + ctr->bufPtr, needed);
         ctr->bufPtr += needed;
         outbuf += needed;
         inbuf += needed;
         *outlen += needed;
         inlen -= needed;
         if (inlen == 0) {
             return SECSuccess;
         }
         PORT_Assert(ctr->bufPtr == blocksize);
     }
-        
+
     while (inlen >= blocksize) {
         rv = (*ctr->cipher)(ctr->context, ctr->buffer, &tmp, blocksize,
                         ctr->counter, blocksize, blocksize);
         ctr_GetNextCtr(ctr->counter, ctr->counterBits, blocksize);
         if (rv != SECSuccess) {
             return SECFailure;
         }
         ctr_xor(outbuf, inbuf, ctr->buffer, blocksize);
         outbuf += blocksize;
         inbuf += blocksize;
@@ skipping 27 matching lines @@
     SECStatus rv;
 
     if (maxout < inlen) {
         *outlen = inlen;
         PORT_SetError(SEC_ERROR_OUTPUT_LEN);
         return SECFailure;
     }
     *outlen = 0;
     if (ctr->bufPtr != blocksize) {
         unsigned int needed = PR_MIN(blocksize-ctr->bufPtr, inlen);
-        ctr_xor(outbuf, inbuf, ctr->buffer+ctr->bufPtr, needed);
+        ctr_xor(outbuf, inbuf, ctr->buffer + ctr->bufPtr, needed);
         ctr->bufPtr += needed;
         outbuf += needed;
         inbuf += needed;
         *outlen += needed;
         inlen -= needed;
         if (inlen == 0) {
             return SECSuccess;
         }
         PORT_Assert(ctr->bufPtr == blocksize);
     }
@@ skipping 16 matching lines @@
     ctr_GetNextCtr(ctr->counter, ctr->counterBits, blocksize);
     if (rv != SECSuccess) {
         return SECFailure;
     }
     ctr_xor(outbuf, inbuf, ctr->buffer, inlen);
     ctr->bufPtr = inlen;
     *outlen += inlen;
     return SECSuccess;
 }
 #endif