Update NSS to NSS 3.13.5 (from NSS 3.13.3).

nss/mozilla/security/nss/lib/util/secitem.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 19 matching lines @@
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
 
 /*
  * Support routines for SECItem data structure.
  *
- * $Id: secitem.c,v 1.16 2011/07/22 21:22:40 wtc%google.com Exp $
+ * $Id: secitem.c,v 1.17 2012/03/23 03:12:16 wtc%google.com Exp $
  */
 
 #include "seccomon.h"
 #include "secitem.h"
 #include "base64.h"
 #include "secerr.h"
 
 SECItem *
 SECITEM_AllocItem(PRArenaPool *arena, SECItem *item, unsigned int len)
 {
@@ skipping 95 matching lines @@
         return SECFailure;
     }
 
     return SECSuccess;
 }
 
 SECComparison
 SECITEM_CompareItem(const SECItem *a, const SECItem *b)
 {
     unsigned m;
-    SECComparison rv;
+    int rv;
 
     if (a == b)
         return SECEqual;
     if (!a || !a->len || !a->data) 
         return (!b || !b->len || !b->data) ? SECEqual : SECLessThan;
     if (!b || !b->len || !b->data) 
         return SECGreaterThan;
 
     m = ( ( a->len < b->len ) ? a->len : b->len );
     
-    rv = (SECComparison) PORT_Memcmp(a->data, b->data, m);
+    rv = PORT_Memcmp(a->data, b->data, m);
     if (rv) {
-        return rv;
+        return rv < 0 ? SECLessThan : SECGreaterThan;
     }
     if (a->len < b->len) {
         return SECLessThan;
     }
     if (a->len == b->len) {
         return SECEqual;
     }
     return SECGreaterThan;
 }
 
@@ skipping 139 matching lines @@
  * but heck it's only used internally by the hash table anyway.
  */
 PRIntn PR_CALLBACK
 SECITEM_HashCompare ( const void *k1, const void *k2)
 {
     const SECItem *i1 = (const SECItem *)k1;
     const SECItem *i2 = (const SECItem *)k2;
 
     return SECITEM_ItemsAreEqual(i1,i2);
 }