Merge NSS_3_14_2_RTM.

mozilla/security/nss/lib/freebl/arcfour.c

 /* arcfour.c - the arc four algorithm.
  *
  * 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/. */
 
 /* See NOTES ON UMRs, Unititialized Memory Reads, below. */
 
 #ifdef FREEBL_NO_DEPEND
 #include "stubs.h"
@@ skipping 108 matching lines @@
                 const unsigned char * unused1, int unused2, 
                 unsigned int unused3, unsigned int unused4)
 {
         int i;
         PRUint8 j, tmp;
         PRUint8 K[256];
         PRUint8 *L;
 
         /* verify the key length. */
         PORT_Assert(len > 0 && len < ARCFOUR_STATE_SIZE);
-        if (len < 0 || len >= ARCFOUR_STATE_SIZE) {
+        if (len == 0 || len >= ARCFOUR_STATE_SIZE) {
                 PORT_SetError(SEC_ERROR_INVALID_ARGS);
                 return SECFailure;
         }
         if (cx == NULL) {
             PORT_SetError(SEC_ERROR_INVALID_ARGS);
             return SECFailure;
         }
         /* Initialize the state using array indices. */
         memcpy(cx->S, Kinit, sizeof cx->S);
         /* Fill in K repeatedly with values from key. */
@@ skipping 460 matching lines @@
         /* Convert the byte-stream to a word-stream */
         return rc4_wordconv(cx, output, outputLen, maxOutputLen, input, inputLen);
 #else
         /* Operate on bytes, but unroll the main loop */
         return rc4_unrolled(cx, output, outputLen, maxOutputLen, input, inputLen);
 #endif
 }
 
 #undef CONVERT_TO_WORDS
 #undef USE_WORD