summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkaie%kuix.de <devnull@localhost>2010-11-12 20:48:25 +0000
committerkaie%kuix.de <devnull@localhost>2010-11-12 20:48:25 +0000
commit97cf0be6a00d4d2c0f84d3992e9f065f59689d1e (patch)
tree687eee0092b4b801d92443643c842d534e469e6f
parent1f98e27237587dfc849d0a525bacca6a33ed7d3e (diff)
downloadnss-hg-97cf0be6a00d4d2c0f84d3992e9f065f59689d1e.tar.gz
Bug 585518, AddTrust Qualified CA Root serial wrong in certdata.txt trust entry
r=nelson, sr=rrelyea
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.c6
-rw-r--r--security/nss/lib/ckfw/builtins/certdata.txt2
2 files changed, 4 insertions, 4 deletions
diff --git a/security/nss/lib/ckfw/builtins/certdata.c b/security/nss/lib/ckfw/builtins/certdata.c
index c8f311f5d..8a5ce16a5 100644
--- a/security/nss/lib/ckfw/builtins/certdata.c
+++ b/security/nss/lib/ckfw/builtins/certdata.c
@@ -998,7 +998,7 @@ static const NSSItem nss_builtins_items_0 [] = {
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
{ (void *)"CVS ID", (PRUint32)7 },
{ (void *)"NSS", (PRUint32)4 },
- { (void *)"@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$ $Revision$ $Date$", (PRUint32)160 }
+ { (void *)"@(#) $RCSfile$ $Revision$ $Date$""; @(#) $RCSfile$ $Revision$ $Date$", (PRUint32)164 }
};
#endif /* DEBUG */
static const NSSItem nss_builtins_items_1 [] = {
@@ -5102,8 +5102,8 @@ static const NSSItem nss_builtins_items_72 [] = {
"\144\144\124\162\165\163\164\040\121\165\141\154\151\146\151\145"
"\144\040\103\101\040\122\157\157\164"
, (PRUint32)105 },
- { (void *)"\001"
-, (PRUint32)1 },
+ { (void *)"\002\001\001"
+, (PRUint32)3 },
{ (void *)"\060\202\004\036\060\202\003\006\240\003\002\001\002\002\001\001"
"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\060"
"\147\061\013\060\011\006\003\125\004\006\023\002\123\105\061\024"
diff --git a/security/nss/lib/ckfw/builtins/certdata.txt b/security/nss/lib/ckfw/builtins/certdata.txt
index 1859d03dd..162d31af6 100644
--- a/security/nss/lib/ckfw/builtins/certdata.txt
+++ b/security/nss/lib/ckfw/builtins/certdata.txt
@@ -4551,7 +4551,7 @@ CKA_ISSUER MULTILINE_OCTAL
\144\040\103\101\040\122\157\157\164
END
CKA_SERIAL_NUMBER MULTILINE_OCTAL
-\001
+\002\001\001
END
CKA_VALUE MULTILINE_OCTAL
\060\202\004\036\060\202\003\006\240\003\002\001\002\002\001\001