Merge NSS 3.2.1 changes.

git-svn-id: svn://10.0.0.236/trunk@255439 18797224-902f-48f8-a5cc-f745e15eee43
2008-12-10 22:48:03 +00:00
parent e2571a855c
commit 2e67c809eb
1 changed files with 3 additions and 2 deletions
--- a/mozilla/security/nss/lib/softoken/secmodt.h
+++ b/mozilla/security/nss/lib/softoken/secmodt.h
@@ -97,8 +97,9 @@ struct PK11RSAGenParamsStr {
 };

 typedef enum {
-	PK11CertListUnique = 0,
-	PK11CertListUser = 1
+     PK11CertListUnique = 0,
+     PK11CertListUser = 1,
+     PK11CertListRootUnique = 2
 } PK11CertListType;

 /*