Avoids MSVC warnings about possible value truncation.

patches/nss-chacha20-poly1305.patch

 diff -r c3565a90b8c4 lib/freebl/blapi.h
 --- a/lib/freebl/blapi.h        Fri Jan 03 20:59:10 2014 +0100
 +++ b/lib/freebl/blapi.h        Tue Jan 07 12:11:36 2014 -0800
 @@ -986,6 +986,38 @@
                  unsigned int *outputLen, unsigned int maxOutputLen,
                  const unsigned char *input, unsigned int inputLen);
  
 +/******************************************/
 +/*
 +** ChaCha20+Poly1305 AEAD
@@ skipping 125 matching lines @@
 +    input[8] = U8TO32_LITTLE(key + 16);
 +    input[9] = U8TO32_LITTLE(key + 20);
 +    input[10] = U8TO32_LITTLE(key + 24);
 +    input[11] = U8TO32_LITTLE(key + 28);
 +
 +    input[0] = U8TO32_LITTLE(sigma + 0);
 +    input[1] = U8TO32_LITTLE(sigma + 4);
 +    input[2] = U8TO32_LITTLE(sigma + 8);
 +    input[3] = U8TO32_LITTLE(sigma + 12);
 +
-+    input[12] = counter;
++    input[12] = (PRUint32)counter;
 +    input[13] = counter >> 32;

[agl, 2014/08/28 20:51:30]

ditto.

 +    input[14] = U8TO32_LITTLE(nonce + 0);
 +    input[15] = U8TO32_LITTLE(nonce + 4);
 +
 +    while (inLen >= 64) {
 +       ChaChaCore(block, input, 20);
 +       for (i = 0; i < 64; i++) {
 +           out[i] = in[i] ^ block[i];
 +       }
 +
 +       input[12]++;
@@ skipping 1389 matching lines @@
 +       state->h1 = (state->h1 & nb) | (g1 & b);
 +       state->h2 = (state->h2 & nb) | (g2 & b);
 +       state->h3 = (state->h3 & nb) | (g3 & b);
 +       state->h4 = (state->h4 & nb) | (g4 & b);
 +
 +       f0 = ((state->h0      ) | (state->h1 << 26)) + (uint64_t)U8TO32_LE(&state->key[0]);
 +       f1 = ((state->h1 >>  6) | (state->h2 << 20)) + (uint64_t)U8TO32_LE(&state->key[4]);
 +       f2 = ((state->h2 >> 12) | (state->h3 << 14)) + (uint64_t)U8TO32_LE(&state->key[8]);
 +       f3 = ((state->h3 >> 18) | (state->h4 <<  8)) + (uint64_t)U8TO32_LE(&state->key[12]);
 +
-+       U32TO8_LE(&mac[ 0], f0); f1 += (f0 >> 32);
-+       U32TO8_LE(&mac[ 4], f1); f2 += (f1 >> 32);
-+       U32TO8_LE(&mac[ 8], f2); f3 += (f2 >> 32);
-+       U32TO8_LE(&mac[12], f3);
++       U32TO8_LE(&mac[ 0], (uint32_t)f0); f1 += (f0 >> 32);
++       U32TO8_LE(&mac[ 4], (uint32_t)f1); f2 += (f1 >> 32);
++       U32TO8_LE(&mac[ 8], (uint32_t)f2); f3 += (f2 >> 32);
++       U32TO8_LE(&mac[12], (uint32_t)f3);
 +}
 diff -r c3565a90b8c4 lib/freebl/poly1305/poly1305.h
 --- /dev/null   Thu Jan 01 00:00:00 1970 +0000
 +++ b/lib/freebl/poly1305/poly1305.h    Tue Jan 07 12:11:36 2014 -0800
 @@ -0,0 +1,31 @@
 +/*
 + * poly1305.h - header file for Poly1305 implementation.
 + *
 + * 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
@@ skipping 288 matching lines @@
 +    CK_BYTE_PTR  pIv;  /* This is the nonce. */
 +    CK_ULONG     ulIvLen;
 +    CK_BYTE_PTR  pAAD;
 +    CK_ULONG     ulAADLen;
 +    CK_ULONG     ulTagLen;
 +} CK_NSS_AEAD_PARAMS;
 +
  /*
   * NSS-defined return values
   *