Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(12)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: nss/mozilla/security/nss/lib/pk11wrap/pk11merge.c

Issue 10540165: Update NSS to NSS 3.13.5 (from NSS 3.13.3). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/
Patch Set: Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« nss/mozilla/security/nss/lib/certhigh/certvfy.c ('K') | « nss/mozilla/security/nss/lib/pk11wrap/pk11auth.c ('k') | nss/mozilla/security/nss/lib/pk11wrap/pk11sdr.c » ('j') | nss/mozilla/security/nss/lib/util/SECerrs.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: nss/mozilla/security/nss/lib/pk11wrap/pk11merge.c
===================================================================
--- nss/mozilla/security/nss/lib/pk11wrap/pk11merge.c (revision 142244)
+++ nss/mozilla/security/nss/lib/pk11wrap/pk11merge.c (working copy)
@@ -1109,7 +1109,7 @@
CK_ULONG trustAttrsCount =
sizeof(trustAttrs)/sizeof(trustAttrs[0]);
- int i;
+ CK_ULONG i;
CK_ATTRIBUTE targetTemplate, sourceTemplate;
/* existing trust record, merge the two together */
« nss/mozilla/security/nss/lib/certhigh/certvfy.c ('K') | « nss/mozilla/security/nss/lib/pk11wrap/pk11auth.c ('k') | nss/mozilla/security/nss/lib/pk11wrap/pk11sdr.c » ('j') | nss/mozilla/security/nss/lib/util/SECerrs.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698