Compare commits
23 Commits
Author | SHA1 | Date |
---|---|---|
Elio Maldonado | 57f4023415 | |
Elio Maldonado | 971f5d4461 | |
Elio Maldonado | c42fe44c92 | |
Elio Maldonado | 995450d20c | |
Elio Maldonado | 421ec14b0e | |
Elio Maldonado | 6b64656264 | |
Elio Maldonado | 98fb48c2e2 | |
Elio Maldonado | ab32397d8a | |
Elio Maldonado | 6e0c2648d1 | |
Elio Maldonado Batiz | f73805aa41 | |
Elio Maldonado Batiz | 63ecab2e03 | |
Elio Maldonado | 8f2b69b56c | |
Elio Maldonado | 2c824c977a | |
Elio Maldonado | 7ad46188df | |
Elio Maldonado | c62958b47b | |
Elio Maldonado | da88e559d7 | |
Kai Engert | 4b3a050e09 | |
Elio Maldonado | 8b5f3e43f0 | |
Dennis Gilmore | 9beb3fd357 | |
Elio Maldonado | 8ff9d8e959 | |
Elio Maldonado | 11feb7633c | |
Elio Maldonado | da8533319e | |
Elio Maldonado | 0cac4288f2 |
|
@ -1,8 +1,8 @@
|
||||||
nss-3.13.3-stripped.tar.bz2
|
|
||||||
nss-pem-20101125.tar.bz2
|
|
||||||
blank-cert8.db
|
blank-cert8.db
|
||||||
blank-key3.db
|
blank-key3.db
|
||||||
blank-secmod.db
|
blank-secmod.db
|
||||||
blank-cert9.db
|
blank-cert9.db
|
||||||
blank-key4.db
|
blank-key4.db
|
||||||
PayPalEE.cert
|
PayPalEE.cert
|
||||||
|
/nss-3.13.4-stripped.tar.bz2
|
||||||
|
/nss-pem-20120402.tar.bz2
|
||||||
|
|
|
@ -1,107 +0,0 @@
|
||||||
From 5c61cdba435096ee6e65cee4dc9a473430643c07 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Elio Maldonado <emaldona@redhat.com>
|
|
||||||
Date: Tue, 12 Apr 2011 09:31:48 -0700
|
|
||||||
Subject: [PATCH] Bug 695011 PEM logging
|
|
||||||
|
|
||||||
Use NSPR logging facilities for PEM logging to fix a segmenation violation
|
|
||||||
caused when user cannot for write a log file created by root
|
|
||||||
---
|
|
||||||
mozilla/security/nss/lib/ckfw/pem/ckpem.h | 7 ++++-
|
|
||||||
mozilla/security/nss/lib/ckfw/pem/util.c | 30 ++++++++++++++++------------
|
|
||||||
2 files changed, 22 insertions(+), 15 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/mozilla/security/nss/lib/ckfw/pem/ckpem.h b/mozilla/security/nss/lib/ckfw/pem/ckpem.h
|
|
||||||
index 839d40b..720525e 100644
|
|
||||||
--- a/mozilla/security/nss/lib/ckfw/pem/ckpem.h
|
|
||||||
+++ b/mozilla/security/nss/lib/ckfw/pem/ckpem.h
|
|
||||||
@@ -1,3 +1,6 @@
|
|
||||||
+#ifndef CKPEM_H
|
|
||||||
+#define CKPEM_H
|
|
||||||
+
|
|
||||||
#include "nssckmdt.h"
|
|
||||||
#include "nssckfw.h"
|
|
||||||
#include "ckfwtm.h"
|
|
||||||
@@ -254,8 +257,8 @@ unsigned int pem_PrivateModulusLen(pemLOWKEYPrivateKey *privk);
|
|
||||||
/* ptoken.c */
|
|
||||||
NSSCKMDToken * pem_NewToken(NSSCKFWInstance *fwInstance, CK_RV *pError);
|
|
||||||
|
|
||||||
+/* util.c */
|
|
||||||
void open_log();
|
|
||||||
-void close_log();
|
|
||||||
void plog(const char *fmt, ...);
|
|
||||||
|
|
||||||
-#define PEM_H 1
|
|
||||||
+#endif /* CKPEM_H */
|
|
||||||
diff --git a/mozilla/security/nss/lib/ckfw/pem/util.c b/mozilla/security/nss/lib/ckfw/pem/util.c
|
|
||||||
index 853f418..fafb924 100644
|
|
||||||
--- a/mozilla/security/nss/lib/ckfw/pem/util.c
|
|
||||||
+++ b/mozilla/security/nss/lib/ckfw/pem/util.c
|
|
||||||
@@ -41,6 +41,7 @@
|
|
||||||
#include "prtime.h"
|
|
||||||
#include "prlong.h"
|
|
||||||
#include "prerror.h"
|
|
||||||
+#include "prlog.h"
|
|
||||||
#include "prprf.h"
|
|
||||||
#include "plgetopt.h"
|
|
||||||
#include "prenv.h"
|
|
||||||
@@ -51,6 +52,9 @@
|
|
||||||
#include "cryptohi.h"
|
|
||||||
#include "secpkcs7.h"
|
|
||||||
#include "secerr.h"
|
|
||||||
+
|
|
||||||
+#include "ckpem.h"
|
|
||||||
+
|
|
||||||
#include <stdarg.h>
|
|
||||||
|
|
||||||
#define CHUNK_SIZE 512
|
|
||||||
@@ -267,34 +271,34 @@ ReadDERFromFile(SECItem *** derlist, char *filename, PRBool ascii,
|
|
||||||
return -1;
|
|
||||||
}
|
|
||||||
|
|
||||||
-FILE *plogfile;
|
|
||||||
+#ifdef DEBUG
|
|
||||||
+#define LOGGING_BUFFER_SIZE 400
|
|
||||||
+#define PEM_DEFAULT_LOG_FILE "/tmp/pkcs11.log"
|
|
||||||
+static const char *pemLogModuleName = "PEM";
|
|
||||||
+static PRLogModuleInfo* pemLogModule;
|
|
||||||
+#endif
|
|
||||||
|
|
||||||
void open_log()
|
|
||||||
{
|
|
||||||
#ifdef DEBUG
|
|
||||||
- plogfile = fopen("/tmp/pkcs11.log", "a");
|
|
||||||
-#endif
|
|
||||||
+ const char *nsprLogFile = PR_GetEnv("NSPR_LOG_FILE");
|
|
||||||
|
|
||||||
- return;
|
|
||||||
-}
|
|
||||||
+ pemLogModule = PR_NewLogModule(pemLogModuleName);
|
|
||||||
|
|
||||||
-void close_log()
|
|
||||||
-{
|
|
||||||
-#ifdef DEBUG
|
|
||||||
- fclose(plogfile);
|
|
||||||
+ (void) PR_SetLogFile(nsprLogFile ? nsprLogFile : PEM_DEFAULT_LOG_FILE);
|
|
||||||
+ /* If false, the log file will remain what it was before */
|
|
||||||
#endif
|
|
||||||
- return;
|
|
||||||
}
|
|
||||||
|
|
||||||
void plog(const char *fmt, ...)
|
|
||||||
{
|
|
||||||
#ifdef DEBUG
|
|
||||||
+ char buf[LOGGING_BUFFER_SIZE];
|
|
||||||
va_list ap;
|
|
||||||
|
|
||||||
va_start(ap, fmt);
|
|
||||||
- vfprintf(plogfile, fmt, ap);
|
|
||||||
+ PR_vsnprintf(buf, sizeof(buf), fmt, ap);
|
|
||||||
va_end(ap);
|
|
||||||
-
|
|
||||||
- fflush(plogfile);
|
|
||||||
+ PR_LOG(pemLogModule, PR_LOG_DEBUG, ("%s", buf));
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
--
|
|
||||||
1.7.4.2
|
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
diff -up ./mozilla/security/nss/lib/ckfw/pem/pobject.c.734760 ./mozilla/security/nss/lib/ckfw/pem/pobject.c
|
|
||||||
--- ./mozilla/security/nss/lib/ckfw/pem/pobject.c.734760 2011-09-10 10:21:38.819248564 -0700
|
|
||||||
+++ ./mozilla/security/nss/lib/ckfw/pem/pobject.c 2011-09-10 10:28:47.970083785 -0700
|
|
||||||
@@ -1117,7 +1117,7 @@ pem_CreateObject
|
|
||||||
|
|
||||||
nobjs = ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */);
|
|
||||||
if (nobjs < 1)
|
|
||||||
- return (NSSCKMDObject *) NULL;
|
|
||||||
+ goto loser;
|
|
||||||
|
|
||||||
objid = -1;
|
|
||||||
/* Brute force: find the id of the key, if any, in this slot */
|
|
||||||
@@ -1176,7 +1176,7 @@ pem_CreateObject
|
|
||||||
|
|
||||||
nobjs = ReadDERFromFile(&derlist, filename, PR_TRUE, &cipher, &ivstring, PR_FALSE /* keys only */);
|
|
||||||
if (nobjs < 1)
|
|
||||||
- return (NSSCKMDObject *) NULL;
|
|
||||||
+ goto loser;
|
|
||||||
|
|
||||||
certDER.len = 0; /* in case there is no equivalent cert */
|
|
||||||
certDER.data = NULL;
|
|
|
@ -1,15 +0,0 @@
|
||||||
diff -up ./mozilla/security/nss/lib/pk11wrap/pk11skey.c.800676 ./mozilla/security/nss/lib/pk11wrap/pk11skey.c
|
|
||||||
--- ./mozilla/security/nss/lib/pk11wrap/pk11skey.c.800676 2012-03-07 18:29:16.679551532 -0800
|
|
||||||
+++ ./mozilla/security/nss/lib/pk11wrap/pk11skey.c 2012-03-07 18:29:42.338733488 -0800
|
|
||||||
@@ -1664,7 +1664,10 @@ PK11_PubDerive(SECKEYPrivateKey *privKey
|
|
||||||
|
|
||||||
keyType = PK11_GetKeyType(target,keySize);
|
|
||||||
key_size = keySize;
|
|
||||||
- symKey->size = keySize;
|
|
||||||
+ /* There's a bug in FreeBL where this size is treated as a max.
|
|
||||||
+ * if we are using softoken, Don't set that size value here, but
|
|
||||||
+ * set it to zero we we will query softoken for the size */
|
|
||||||
+ symKey->size = slot->isInternal ? 0 : keySize;
|
|
||||||
if (key_size == 0) templateCount--;
|
|
||||||
|
|
||||||
mechanism.mechanism = derive;
|
|
|
@ -0,0 +1,16 @@
|
||||||
|
diff -up mozilla/security/coreconf/Linux.mk.relro mozilla/security/coreconf/Linux.mk
|
||||||
|
--- mozilla/security/coreconf/Linux.mk.relro 2010-08-12 18:32:29.000000000 -0700
|
||||||
|
+++ mozilla/security/coreconf/Linux.mk 2011-09-27 16:12:22.234743170 -0700
|
||||||
|
@@ -179,6 +179,12 @@ FREEBL_NO_DEPEND = 1
|
||||||
|
endif
|
||||||
|
endif
|
||||||
|
|
||||||
|
+# harden DSOs/executables a bit against exploits
|
||||||
|
+ifeq (2.6,$(firstword $(sort 2.6 $(OS_RELEASE))))
|
||||||
|
+DSO_LDOPTS+=-Wl,-z,relro
|
||||||
|
+LDFLAGS += -Wl,-z,relro
|
||||||
|
+endif
|
||||||
|
+
|
||||||
|
USE_SYSTEM_ZLIB = 1
|
||||||
|
ZLIB_LIBS = -lz
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,637 @@
|
||||||
|
diff -up ./mozilla/security/nss/lib/ckfw/builtins/certdata.c.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/certdata.c
|
||||||
|
--- ./mozilla/security/nss/lib/ckfw/builtins/certdata.c.ckbi188 2011-11-03 13:52:25.634021626 -0700
|
||||||
|
+++ ./mozilla/security/nss/lib/ckfw/builtins/certdata.c 2011-11-03 13:54:04.872021278 -0700
|
||||||
|
@@ -35,7 +35,7 @@
|
||||||
|
*
|
||||||
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
#ifdef DEBUG
|
||||||
|
-static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $";
|
||||||
|
+static const char CVS_ID[] = "@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $";
|
||||||
|
#endif /* DEBUG */
|
||||||
|
|
||||||
|
#ifndef BUILTINS_H
|
||||||
|
@@ -1075,6 +1075,18 @@ static const CK_ATTRIBUTE_TYPE nss_built
|
||||||
|
static const CK_ATTRIBUTE_TYPE nss_builtins_types_339 [] = {
|
||||||
|
CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
|
||||||
|
};
|
||||||
|
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_340 [] = {
|
||||||
|
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
|
||||||
|
+};
|
||||||
|
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_341 [] = {
|
||||||
|
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
|
||||||
|
+};
|
||||||
|
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_342 [] = {
|
||||||
|
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERTIFICATE_TYPE, CKA_SUBJECT, CKA_ID, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_VALUE
|
||||||
|
+};
|
||||||
|
+static const CK_ATTRIBUTE_TYPE nss_builtins_types_343 [] = {
|
||||||
|
+ CKA_CLASS, CKA_TOKEN, CKA_PRIVATE, CKA_MODIFIABLE, CKA_LABEL, CKA_CERT_SHA1_HASH, CKA_CERT_MD5_HASH, CKA_ISSUER, CKA_SERIAL_NUMBER, CKA_TRUST_SERVER_AUTH, CKA_TRUST_EMAIL_PROTECTION, CKA_TRUST_CODE_SIGNING, CKA_TRUST_STEP_UP_APPROVED
|
||||||
|
+};
|
||||||
|
#ifdef DEBUG
|
||||||
|
static const NSSItem nss_builtins_items_0 [] = {
|
||||||
|
{ (void *)&cko_data, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||||
|
@@ -1083,7 +1095,7 @@ static const NSSItem nss_builtins_items_
|
||||||
|
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
{ (void *)"CVS ID", (PRUint32)7 },
|
||||||
|
{ (void *)"NSS", (PRUint32)4 },
|
||||||
|
- { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.13 $ $Date: 2011/09/02 19:39:06 $", (PRUint32)165 }
|
||||||
|
+ { (void *)"@(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $""; @(#) $RCSfile: certdata.c,v $ $Revision: 1.67.2.14 $ $Date: 2011/11/03 15:12:14 $", (PRUint32)165 }
|
||||||
|
};
|
||||||
|
#endif /* DEBUG */
|
||||||
|
static const NSSItem nss_builtins_items_1 [] = {
|
||||||
|
@@ -22600,6 +22612,266 @@ static const NSSItem nss_builtins_items_
|
||||||
|
{ (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
{ (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
|
||||||
|
};
|
||||||
|
+static const NSSItem nss_builtins_items_340 [] = {
|
||||||
|
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||||
|
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
|
||||||
|
+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
|
||||||
|
+ { (void *)"\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
|
||||||
|
+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
|
||||||
|
+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
|
||||||
|
+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
|
||||||
|
+"\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151"
|
||||||
|
+"\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156"
|
||||||
|
+"\162\151\143\150\051"
|
||||||
|
+, (PRUint32)101 },
|
||||||
|
+ { (void *)"0", (PRUint32)2 },
|
||||||
|
+ { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
|
||||||
|
+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
|
||||||
|
+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
|
||||||
|
+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
|
||||||
|
+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
|
||||||
|
+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105"
|
||||||
|
+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
|
||||||
|
+"\141\154\040\122\157\157\164"
|
||||||
|
+, (PRUint32)119 },
|
||||||
|
+ { (void *)"\002\006\007\377\377\377\377\377"
|
||||||
|
+, (PRUint32)8 },
|
||||||
|
+ { (void *)"\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007"
|
||||||
|
+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
|
||||||
|
+"\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023"
|
||||||
|
+"\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124"
|
||||||
|
+"\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060"
|
||||||
|
+"\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145"
|
||||||
|
+"\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163"
|
||||||
|
+"\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023"
|
||||||
|
+"\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040"
|
||||||
|
+"\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060"
|
||||||
|
+"\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062"
|
||||||
|
+"\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060"
|
||||||
|
+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
|
||||||
|
+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
|
||||||
|
+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
|
||||||
|
+"\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003"
|
||||||
|
+"\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145"
|
||||||
|
+"\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051"
|
||||||
|
+"\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001"
|
||||||
|
+"\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144"
|
||||||
|
+"\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376"
|
||||||
|
+"\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312"
|
||||||
|
+"\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225"
|
||||||
|
+"\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152"
|
||||||
|
+"\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173"
|
||||||
|
+"\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335"
|
||||||
|
+"\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177"
|
||||||
|
+"\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001"
|
||||||
|
+"\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035"
|
||||||
|
+"\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134"
|
||||||
|
+"\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001"
|
||||||
|
+"\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005"
|
||||||
|
+"\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142"
|
||||||
|
+"\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164"
|
||||||
|
+"\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056"
|
||||||
|
+"\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003"
|
||||||
|
+"\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006"
|
||||||
|
+"\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061"
|
||||||
|
+"\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026"
|
||||||
|
+"\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157"
|
||||||
|
+"\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023"
|
||||||
|
+"\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040"
|
||||||
|
+"\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061"
|
||||||
|
+"\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171"
|
||||||
|
+"\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040"
|
||||||
|
+"\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004"
|
||||||
|
+"\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072"
|
||||||
|
+"\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165"
|
||||||
|
+"\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103"
|
||||||
|
+"\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060"
|
||||||
|
+"\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027"
|
||||||
|
+"\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015"
|
||||||
|
+"\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201"
|
||||||
|
+"\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005"
|
||||||
|
+"\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325"
|
||||||
|
+"\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377"
|
||||||
|
+"\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222"
|
||||||
|
+"\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113"
|
||||||
|
+"\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362"
|
||||||
|
+"\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305"
|
||||||
|
+"\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143"
|
||||||
|
+"\131"
|
||||||
|
+, (PRUint32)977 }
|
||||||
|
+};
|
||||||
|
+static const NSSItem nss_builtins_items_341 [] = {
|
||||||
|
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||||
|
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)", (PRUint32)57 },
|
||||||
|
+ { (void *)"\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025"
|
||||||
|
+"\214\071\131\117"
|
||||||
|
+, (PRUint32)20 },
|
||||||
|
+ { (void *)"\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152"
|
||||||
|
+, (PRUint32)16 },
|
||||||
|
+ { (void *)"\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061"
|
||||||
|
+"\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157"
|
||||||
|
+"\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125"
|
||||||
|
+"\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165"
|
||||||
|
+"\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156"
|
||||||
|
+"\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105"
|
||||||
|
+"\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142"
|
||||||
|
+"\141\154\040\122\157\157\164"
|
||||||
|
+, (PRUint32)119 },
|
||||||
|
+ { (void *)"\002\006\007\377\377\377\377\377"
|
||||||
|
+, (PRUint32)8 },
|
||||||
|
+ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
+ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
+ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
|
||||||
|
+};
|
||||||
|
+static const NSSItem nss_builtins_items_342 [] = {
|
||||||
|
+ { (void *)&cko_certificate, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||||
|
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
|
||||||
|
+ { (void *)&ckc_x_509, (PRUint32)sizeof(CK_CERTIFICATE_TYPE) },
|
||||||
|
+ { (void *)"\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061"
|
||||||
|
+"\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145"
|
||||||
|
+"\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017"
|
||||||
|
+"\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061"
|
||||||
|
+"\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151"
|
||||||
|
+"\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050"
|
||||||
|
+"\105\156\162\151\143\150\051"
|
||||||
|
+, (PRUint32)103 },
|
||||||
|
+ { (void *)"0", (PRUint32)2 },
|
||||||
|
+ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
|
||||||
|
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
|
||||||
|
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
|
||||||
|
+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
|
||||||
|
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
|
||||||
|
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
|
||||||
|
+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
|
||||||
|
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
|
||||||
|
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
|
||||||
|
+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
|
||||||
|
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
|
||||||
|
+"\040\050\062\060\064\070\051"
|
||||||
|
+, (PRUint32)183 },
|
||||||
|
+ { (void *)"\002\006\007\377\377\377\377\377"
|
||||||
|
+, (PRUint32)8 },
|
||||||
|
+ { (void *)"\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007"
|
||||||
|
+"\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001"
|
||||||
|
+"\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012"
|
||||||
|
+"\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060"
|
||||||
|
+"\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162"
|
||||||
|
+"\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070"
|
||||||
|
+"\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056"
|
||||||
|
+"\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061"
|
||||||
|
+"\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071"
|
||||||
|
+"\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114"
|
||||||
|
+"\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023"
|
||||||
|
+"\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162"
|
||||||
|
+"\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157"
|
||||||
|
+"\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061"
|
||||||
|
+"\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065"
|
||||||
|
+"\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060"
|
||||||
|
+"\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003"
|
||||||
|
+"\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144"
|
||||||
|
+"\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013"
|
||||||
|
+"\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003"
|
||||||
|
+"\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145"
|
||||||
|
+"\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143"
|
||||||
|
+"\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015"
|
||||||
|
+"\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202"
|
||||||
|
+"\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065"
|
||||||
|
+"\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140"
|
||||||
|
+"\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026"
|
||||||
|
+"\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313"
|
||||||
|
+"\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336"
|
||||||
|
+"\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245"
|
||||||
|
+"\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044"
|
||||||
|
+"\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167"
|
||||||
|
+"\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026"
|
||||||
|
+"\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166"
|
||||||
|
+"\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063"
|
||||||
|
+"\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312"
|
||||||
|
+"\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364"
|
||||||
|
+"\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046"
|
||||||
|
+"\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150"
|
||||||
|
+"\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205"
|
||||||
|
+"\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060"
|
||||||
|
+"\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006"
|
||||||
|
+"\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001"
|
||||||
|
+"\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006"
|
||||||
|
+"\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005"
|
||||||
|
+"\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006"
|
||||||
|
+"\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006"
|
||||||
|
+"\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072"
|
||||||
|
+"\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156"
|
||||||
|
+"\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006"
|
||||||
|
+"\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005"
|
||||||
|
+"\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167"
|
||||||
|
+"\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171"
|
||||||
|
+"\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004"
|
||||||
|
+"\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072"
|
||||||
|
+"\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145"
|
||||||
|
+"\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003"
|
||||||
|
+"\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060"
|
||||||
|
+"\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321"
|
||||||
|
+"\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160"
|
||||||
|
+"\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003"
|
||||||
|
+"\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153"
|
||||||
|
+"\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003"
|
||||||
|
+"\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001"
|
||||||
|
+"\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014"
|
||||||
|
+"\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063"
|
||||||
|
+"\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142"
|
||||||
|
+"\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264"
|
||||||
|
+"\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251"
|
||||||
|
+"\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330"
|
||||||
|
+"\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327"
|
||||||
|
+"\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013"
|
||||||
|
+"\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113"
|
||||||
|
+"\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227"
|
||||||
|
+"\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100"
|
||||||
|
+"\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247"
|
||||||
|
+"\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011"
|
||||||
|
+"\355\020\342\305"
|
||||||
|
+, (PRUint32)1236 }
|
||||||
|
+};
|
||||||
|
+static const NSSItem nss_builtins_items_343 [] = {
|
||||||
|
+ { (void *)&cko_netscape_trust, (PRUint32)sizeof(CK_OBJECT_CLASS) },
|
||||||
|
+ { (void *)&ck_true, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) },
|
||||||
|
+ { (void *)"Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)", (PRUint32)56 },
|
||||||
|
+ { (void *)"\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151"
|
||||||
|
+"\005\155\061\046"
|
||||||
|
+, (PRUint32)20 },
|
||||||
|
+ { (void *)"\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362"
|
||||||
|
+, (PRUint32)16 },
|
||||||
|
+ { (void *)"\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156"
|
||||||
|
+"\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125"
|
||||||
|
+"\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056"
|
||||||
|
+"\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143"
|
||||||
|
+"\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151"
|
||||||
|
+"\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006"
|
||||||
|
+"\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105"
|
||||||
|
+"\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164"
|
||||||
|
+"\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164"
|
||||||
|
+"\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151"
|
||||||
|
+"\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171"
|
||||||
|
+"\040\050\062\060\064\070\051"
|
||||||
|
+, (PRUint32)183 },
|
||||||
|
+ { (void *)"\002\006\007\377\377\377\377\377"
|
||||||
|
+, (PRUint32)8 },
|
||||||
|
+ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
+ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
+ { (void *)&ckt_netscape_untrusted, (PRUint32)sizeof(CK_TRUST) },
|
||||||
|
+ { (void *)&ck_false, (PRUint32)sizeof(CK_BBOOL) }
|
||||||
|
+};
|
||||||
|
|
||||||
|
builtinsInternalObject
|
||||||
|
nss_builtins_data[] = {
|
||||||
|
@@ -22944,11 +23216,15 @@ nss_builtins_data[] = {
|
||||||
|
{ 11, nss_builtins_types_336, nss_builtins_items_336, {NULL} },
|
||||||
|
{ 13, nss_builtins_types_337, nss_builtins_items_337, {NULL} },
|
||||||
|
{ 11, nss_builtins_types_338, nss_builtins_items_338, {NULL} },
|
||||||
|
- { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} }
|
||||||
|
+ { 13, nss_builtins_types_339, nss_builtins_items_339, {NULL} },
|
||||||
|
+ { 11, nss_builtins_types_340, nss_builtins_items_340, {NULL} },
|
||||||
|
+ { 13, nss_builtins_types_341, nss_builtins_items_341, {NULL} },
|
||||||
|
+ { 11, nss_builtins_types_342, nss_builtins_items_342, {NULL} },
|
||||||
|
+ { 13, nss_builtins_types_343, nss_builtins_items_343, {NULL} }
|
||||||
|
};
|
||||||
|
const PRUint32
|
||||||
|
#ifdef DEBUG
|
||||||
|
- nss_builtins_nObjects = 339+1;
|
||||||
|
+ nss_builtins_nObjects = 343+1;
|
||||||
|
#else
|
||||||
|
- nss_builtins_nObjects = 339;
|
||||||
|
+ nss_builtins_nObjects = 343;
|
||||||
|
#endif /* DEBUG */
|
||||||
|
diff -up ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt
|
||||||
|
--- ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt.ckbi188 2011-11-03 13:52:50.979012198 -0700
|
||||||
|
+++ ./mozilla/security/nss/lib/ckfw/builtins/certdata.txt 2011-11-03 13:54:37.485020788 -0700
|
||||||
|
@@ -34,7 +34,7 @@
|
||||||
|
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||||
|
#
|
||||||
|
# ***** END LICENSE BLOCK *****
|
||||||
|
-CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.13 $ $Date: 2011/09/02 19:39:06 $"
|
||||||
|
+CVS_ID "@(#) $RCSfile: certdata.txt,v $ $Revision: 1.64.2.14 $ $Date: 2011/11/03 15:12:15 $"
|
||||||
|
|
||||||
|
#
|
||||||
|
# certdata.txt
|
||||||
|
@@ -23299,3 +23299,284 @@ CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSC
|
||||||
|
CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
|
||||||
|
+
|
||||||
|
+#
|
||||||
|
+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
|
||||||
|
+#
|
||||||
|
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
|
||||||
|
+CKA_TOKEN CK_BBOOL CK_TRUE
|
||||||
|
+CKA_PRIVATE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
|
||||||
|
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
|
||||||
|
+CKA_SUBJECT MULTILINE_OCTAL
|
||||||
|
+\060\143\061\013\060\011\006\003\125\004\006\023\002\115\131\061
|
||||||
|
+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
|
||||||
|
+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
|
||||||
|
+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
|
||||||
|
+\044\060\042\006\003\125\004\003\023\033\104\151\147\151\163\151
|
||||||
|
+\147\156\040\123\145\162\166\145\162\040\111\104\040\050\105\156
|
||||||
|
+\162\151\143\150\051
|
||||||
|
+END
|
||||||
|
+CKA_ID UTF8 "0"
|
||||||
|
+CKA_ISSUER MULTILINE_OCTAL
|
||||||
|
+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
|
||||||
|
+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
|
||||||
|
+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
|
||||||
|
+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
|
||||||
|
+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
|
||||||
|
+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
|
||||||
|
+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
|
||||||
|
+\141\154\040\122\157\157\164
|
||||||
|
+END
|
||||||
|
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
|
||||||
|
+\002\006\007\377\377\377\377\377
|
||||||
|
+END
|
||||||
|
+CKA_VALUE MULTILINE_OCTAL
|
||||||
|
+\060\202\003\315\060\202\003\066\240\003\002\001\002\002\006\007
|
||||||
|
+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
|
||||||
|
+\001\005\005\000\060\165\061\013\060\011\006\003\125\004\006\023
|
||||||
|
+\002\125\123\061\030\060\026\006\003\125\004\012\023\017\107\124
|
||||||
|
+\105\040\103\157\162\160\157\162\141\164\151\157\156\061\047\060
|
||||||
|
+\045\006\003\125\004\013\023\036\107\124\105\040\103\171\142\145
|
||||||
|
+\162\124\162\165\163\164\040\123\157\154\165\164\151\157\156\163
|
||||||
|
+\054\040\111\156\143\056\061\043\060\041\006\003\125\004\003\023
|
||||||
|
+\032\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040
|
||||||
|
+\107\154\157\142\141\154\040\122\157\157\164\060\036\027\015\060
|
||||||
|
+\067\060\067\061\067\061\065\061\067\064\071\132\027\015\061\062
|
||||||
|
+\060\067\061\067\061\065\061\066\065\065\132\060\143\061\013\060
|
||||||
|
+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
|
||||||
|
+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
|
||||||
|
+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
|
||||||
|
+\023\010\064\065\067\066\060\070\055\113\061\044\060\042\006\003
|
||||||
|
+\125\004\003\023\033\104\151\147\151\163\151\147\156\040\123\145
|
||||||
|
+\162\166\145\162\040\111\104\040\050\105\156\162\151\143\150\051
|
||||||
|
+\060\201\237\060\015\006\011\052\206\110\206\367\015\001\001\001
|
||||||
|
+\005\000\003\201\215\000\060\201\211\002\201\201\000\255\250\144
|
||||||
|
+\113\115\207\307\204\131\271\373\220\106\240\246\211\300\361\376
|
||||||
|
+\325\332\124\202\067\015\231\053\105\046\012\350\126\260\177\312
|
||||||
|
+\250\364\216\107\204\001\202\051\343\263\152\265\221\363\373\225
|
||||||
|
+\205\274\162\250\144\350\012\100\234\305\364\161\256\173\173\152
|
||||||
|
+\007\352\220\024\117\215\211\257\224\253\262\006\324\002\152\173
|
||||||
|
+\230\037\131\271\072\315\124\372\040\337\262\052\012\351\270\335
|
||||||
|
+\151\220\300\051\323\116\320\227\355\146\314\305\031\111\006\177
|
||||||
|
+\372\136\054\174\173\205\033\062\102\337\173\225\045\002\003\001
|
||||||
|
+\000\001\243\202\001\170\060\202\001\164\060\022\006\003\125\035
|
||||||
|
+\023\001\001\377\004\010\060\006\001\001\377\002\001\000\060\134
|
||||||
|
+\006\003\125\035\040\004\125\060\123\060\110\006\011\053\006\001
|
||||||
|
+\004\001\261\076\001\000\060\073\060\071\006\010\053\006\001\005
|
||||||
|
+\005\007\002\001\026\055\150\164\164\160\072\057\057\143\171\142
|
||||||
|
+\145\162\164\162\165\163\164\056\157\155\156\151\162\157\157\164
|
||||||
|
+\056\143\157\155\057\162\145\160\157\163\151\164\157\162\171\056
|
||||||
|
+\143\146\155\060\007\006\005\140\203\112\001\001\060\016\006\003
|
||||||
|
+\125\035\017\001\001\377\004\004\003\002\001\346\060\201\211\006
|
||||||
|
+\003\125\035\043\004\201\201\060\177\241\171\244\167\060\165\061
|
||||||
|
+\013\060\011\006\003\125\004\006\023\002\125\123\061\030\060\026
|
||||||
|
+\006\003\125\004\012\023\017\107\124\105\040\103\157\162\160\157
|
||||||
|
+\162\141\164\151\157\156\061\047\060\045\006\003\125\004\013\023
|
||||||
|
+\036\107\124\105\040\103\171\142\145\162\124\162\165\163\164\040
|
||||||
|
+\123\157\154\165\164\151\157\156\163\054\040\111\156\143\056\061
|
||||||
|
+\043\060\041\006\003\125\004\003\023\032\107\124\105\040\103\171
|
||||||
|
+\142\145\162\124\162\165\163\164\040\107\154\157\142\141\154\040
|
||||||
|
+\122\157\157\164\202\002\001\245\060\105\006\003\125\035\037\004
|
||||||
|
+\076\060\074\060\072\240\070\240\066\206\064\150\164\164\160\072
|
||||||
|
+\057\057\167\167\167\056\160\165\142\154\151\143\055\164\162\165
|
||||||
|
+\163\164\056\143\157\155\057\143\147\151\055\142\151\156\057\103
|
||||||
|
+\122\114\057\062\060\061\070\057\143\144\160\056\143\162\154\060
|
||||||
|
+\035\006\003\125\035\016\004\026\004\024\306\026\223\116\026\027
|
||||||
|
+\354\026\256\214\224\166\363\206\155\305\164\156\204\167\060\015
|
||||||
|
+\006\011\052\206\110\206\367\015\001\001\005\005\000\003\201\201
|
||||||
|
+\000\166\000\173\246\170\053\146\035\216\136\066\306\244\216\005
|
||||||
|
+\362\043\222\174\223\147\323\364\300\012\175\213\055\331\352\325
|
||||||
|
+\157\032\363\341\112\051\132\042\204\115\120\057\113\014\362\377
|
||||||
|
+\205\302\173\125\324\104\202\276\155\254\147\216\274\264\037\222
|
||||||
|
+\234\121\200\032\024\366\156\253\141\210\013\255\034\177\367\113
|
||||||
|
+\120\121\326\145\033\246\107\161\025\136\260\161\363\065\024\362
|
||||||
|
+\067\275\143\310\325\360\223\132\064\137\330\075\350\135\367\305
|
||||||
|
+\036\300\345\317\037\206\044\251\074\007\146\315\301\322\066\143
|
||||||
|
+\131
|
||||||
|
+END
|
||||||
|
+
|
||||||
|
+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
|
||||||
|
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
|
||||||
|
+CKA_TOKEN CK_BBOOL CK_TRUE
|
||||||
|
+CKA_PRIVATE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (cyb)"
|
||||||
|
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
|
||||||
|
+\125\120\257\354\277\350\303\255\304\013\343\255\014\247\344\025
|
||||||
|
+\214\071\131\117
|
||||||
|
+END
|
||||||
|
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
|
||||||
|
+\322\336\256\120\244\230\055\157\067\267\206\122\310\055\113\152
|
||||||
|
+END
|
||||||
|
+CKA_ISSUER MULTILINE_OCTAL
|
||||||
|
+\060\165\061\013\060\011\006\003\125\004\006\023\002\125\123\061
|
||||||
|
+\030\060\026\006\003\125\004\012\023\017\107\124\105\040\103\157
|
||||||
|
+\162\160\157\162\141\164\151\157\156\061\047\060\045\006\003\125
|
||||||
|
+\004\013\023\036\107\124\105\040\103\171\142\145\162\124\162\165
|
||||||
|
+\163\164\040\123\157\154\165\164\151\157\156\163\054\040\111\156
|
||||||
|
+\143\056\061\043\060\041\006\003\125\004\003\023\032\107\124\105
|
||||||
|
+\040\103\171\142\145\162\124\162\165\163\164\040\107\154\157\142
|
||||||
|
+\141\154\040\122\157\157\164
|
||||||
|
+END
|
||||||
|
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
|
||||||
|
+\002\006\007\377\377\377\377\377
|
||||||
|
+END
|
||||||
|
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
|
||||||
|
+
|
||||||
|
+#
|
||||||
|
+# Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
|
||||||
|
+#
|
||||||
|
+CKA_CLASS CK_OBJECT_CLASS CKO_CERTIFICATE
|
||||||
|
+CKA_TOKEN CK_BBOOL CK_TRUE
|
||||||
|
+CKA_PRIVATE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
|
||||||
|
+CKA_CERTIFICATE_TYPE CK_CERTIFICATE_TYPE CKC_X_509
|
||||||
|
+CKA_SUBJECT MULTILINE_OCTAL
|
||||||
|
+\060\145\061\013\060\011\006\003\125\004\006\023\002\115\131\061
|
||||||
|
+\033\060\031\006\003\125\004\012\023\022\104\151\147\151\143\145
|
||||||
|
+\162\164\040\123\144\156\056\040\102\150\144\056\061\021\060\017
|
||||||
|
+\006\003\125\004\013\023\010\064\065\067\066\060\070\055\113\061
|
||||||
|
+\046\060\044\006\003\125\004\003\023\035\104\151\147\151\163\151
|
||||||
|
+\147\156\040\123\145\162\166\145\162\040\111\104\040\055\040\050
|
||||||
|
+\105\156\162\151\143\150\051
|
||||||
|
+END
|
||||||
|
+CKA_ID UTF8 "0"
|
||||||
|
+CKA_ISSUER MULTILINE_OCTAL
|
||||||
|
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
|
||||||
|
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
|
||||||
|
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
|
||||||
|
+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
|
||||||
|
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
|
||||||
|
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
|
||||||
|
+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
|
||||||
|
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
|
||||||
|
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
|
||||||
|
+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
|
||||||
|
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
|
||||||
|
+\040\050\062\060\064\070\051
|
||||||
|
+END
|
||||||
|
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
|
||||||
|
+\002\006\007\377\377\377\377\377
|
||||||
|
+END
|
||||||
|
+CKA_VALUE MULTILINE_OCTAL
|
||||||
|
+\060\202\004\320\060\202\003\270\240\003\002\001\002\002\006\007
|
||||||
|
+\377\377\377\377\377\060\015\006\011\052\206\110\206\367\015\001
|
||||||
|
+\001\005\005\000\060\201\264\061\024\060\022\006\003\125\004\012
|
||||||
|
+\023\013\105\156\164\162\165\163\164\056\156\145\164\061\100\060
|
||||||
|
+\076\006\003\125\004\013\024\067\167\167\167\056\145\156\164\162
|
||||||
|
+\165\163\164\056\156\145\164\057\103\120\123\137\062\060\064\070
|
||||||
|
+\040\151\156\143\157\162\160\056\040\142\171\040\162\145\146\056
|
||||||
|
+\040\050\154\151\155\151\164\163\040\154\151\141\142\056\051\061
|
||||||
|
+\045\060\043\006\003\125\004\013\023\034\050\143\051\040\061\071
|
||||||
|
+\071\071\040\105\156\164\162\165\163\164\056\156\145\164\040\114
|
||||||
|
+\151\155\151\164\145\144\061\063\060\061\006\003\125\004\003\023
|
||||||
|
+\052\105\156\164\162\165\163\164\056\156\145\164\040\103\145\162
|
||||||
|
+\164\151\146\151\143\141\164\151\157\156\040\101\165\164\150\157
|
||||||
|
+\162\151\164\171\040\050\062\060\064\070\051\060\036\027\015\061
|
||||||
|
+\060\060\067\061\066\061\067\062\063\063\070\132\027\015\061\065
|
||||||
|
+\060\067\061\066\061\067\065\063\063\070\132\060\145\061\013\060
|
||||||
|
+\011\006\003\125\004\006\023\002\115\131\061\033\060\031\006\003
|
||||||
|
+\125\004\012\023\022\104\151\147\151\143\145\162\164\040\123\144
|
||||||
|
+\156\056\040\102\150\144\056\061\021\060\017\006\003\125\004\013
|
||||||
|
+\023\010\064\065\067\066\060\070\055\113\061\046\060\044\006\003
|
||||||
|
+\125\004\003\023\035\104\151\147\151\163\151\147\156\040\123\145
|
||||||
|
+\162\166\145\162\040\111\104\040\055\040\050\105\156\162\151\143
|
||||||
|
+\150\051\060\202\001\042\060\015\006\011\052\206\110\206\367\015
|
||||||
|
+\001\001\001\005\000\003\202\001\017\000\060\202\001\012\002\202
|
||||||
|
+\001\001\000\305\211\344\364\015\006\100\222\131\307\032\263\065
|
||||||
|
+\321\016\114\052\063\371\370\257\312\236\177\356\271\247\155\140
|
||||||
|
+\364\124\350\157\325\233\363\033\143\061\004\150\162\321\064\026
|
||||||
|
+\214\264\027\054\227\336\163\305\330\220\025\240\032\053\365\313
|
||||||
|
+\263\110\206\104\360\035\210\114\316\101\102\032\357\365\014\336
|
||||||
|
+\376\100\332\071\040\367\006\125\072\152\235\106\301\322\157\245
|
||||||
|
+\262\310\127\076\051\243\234\340\351\205\167\146\350\230\247\044
|
||||||
|
+\176\276\300\131\040\345\104\157\266\127\330\276\316\302\145\167
|
||||||
|
+\130\306\141\101\321\164\004\310\177\111\102\305\162\251\162\026
|
||||||
|
+\356\214\335\022\135\264\112\324\321\257\120\267\330\252\165\166
|
||||||
|
+\150\255\076\135\252\060\155\141\250\253\020\133\076\023\277\063
|
||||||
|
+\340\257\104\235\070\042\133\357\114\057\246\161\046\025\046\312
|
||||||
|
+\050\214\331\372\216\216\251\242\024\065\342\233\044\210\264\364
|
||||||
|
+\177\205\235\203\117\007\241\266\024\220\066\304\064\034\215\046
|
||||||
|
+\141\155\023\157\170\276\350\217\047\307\113\204\226\243\206\150
|
||||||
|
+\014\043\276\013\354\214\224\000\251\004\212\023\220\367\337\205
|
||||||
|
+\154\014\261\002\003\001\000\001\243\202\001\064\060\202\001\060
|
||||||
|
+\060\016\006\003\125\035\017\001\001\377\004\004\003\002\001\006
|
||||||
|
+\060\022\006\003\125\035\023\001\001\377\004\010\060\006\001\001
|
||||||
|
+\377\002\001\000\060\047\006\003\125\035\045\004\040\060\036\006
|
||||||
|
+\010\053\006\001\005\005\007\003\001\006\010\053\006\001\005\005
|
||||||
|
+\007\003\002\006\010\053\006\001\005\005\007\003\004\060\063\006
|
||||||
|
+\010\053\006\001\005\005\007\001\001\004\047\060\045\060\043\006
|
||||||
|
+\010\053\006\001\005\005\007\060\001\206\027\150\164\164\160\072
|
||||||
|
+\057\057\157\143\163\160\056\145\156\164\162\165\163\164\056\156
|
||||||
|
+\145\164\060\104\006\003\125\035\040\004\075\060\073\060\071\006
|
||||||
|
+\005\140\203\112\001\001\060\060\060\056\006\010\053\006\001\005
|
||||||
|
+\005\007\002\001\026\042\150\164\164\160\072\057\057\167\167\167
|
||||||
|
+\056\144\151\147\151\143\145\162\164\056\143\157\155\056\155\171
|
||||||
|
+\057\143\160\163\056\150\164\155\060\062\006\003\125\035\037\004
|
||||||
|
+\053\060\051\060\047\240\045\240\043\206\041\150\164\164\160\072
|
||||||
|
+\057\057\143\162\154\056\145\156\164\162\165\163\164\056\156\145
|
||||||
|
+\164\057\062\060\064\070\143\141\056\143\162\154\060\021\006\003
|
||||||
|
+\125\035\016\004\012\004\010\114\116\314\045\050\003\051\201\060
|
||||||
|
+\037\006\003\125\035\043\004\030\060\026\200\024\125\344\201\321
|
||||||
|
+\021\200\276\330\211\271\010\243\061\371\241\044\011\026\271\160
|
||||||
|
+\060\015\006\011\052\206\110\206\367\015\001\001\005\005\000\003
|
||||||
|
+\202\001\001\000\227\114\357\112\072\111\254\162\374\060\040\153
|
||||||
|
+\264\051\133\247\305\225\004\220\371\062\325\302\205\152\336\003
|
||||||
|
+\241\067\371\211\000\260\132\254\125\176\333\103\065\377\311\001
|
||||||
|
+\370\121\276\314\046\312\310\152\244\304\124\076\046\036\347\014
|
||||||
|
+\243\315\227\147\224\335\246\102\353\134\315\217\071\171\153\063
|
||||||
|
+\171\041\006\171\372\202\104\025\231\314\301\267\071\323\106\142
|
||||||
|
+\174\262\160\353\157\316\040\252\076\031\267\351\164\202\234\264
|
||||||
|
+\245\113\115\141\000\067\344\207\322\362\024\072\144\174\270\251
|
||||||
|
+\173\141\340\223\042\347\325\237\076\107\346\066\166\240\123\330
|
||||||
|
+\000\003\072\017\265\063\376\226\312\323\322\202\072\056\335\327
|
||||||
|
+\110\341\344\247\151\314\034\351\231\112\347\312\160\105\327\013
|
||||||
|
+\007\016\232\165\033\320\057\222\157\366\244\007\303\275\034\113
|
||||||
|
+\246\204\266\175\250\232\251\322\247\051\361\013\127\151\036\227
|
||||||
|
+\127\046\354\053\103\254\324\105\203\005\000\351\343\360\106\100
|
||||||
|
+\007\372\352\261\121\163\223\034\245\335\123\021\067\310\052\247
|
||||||
|
+\025\047\035\264\252\314\177\252\061\060\374\270\105\237\110\011
|
||||||
|
+\355\020\342\305
|
||||||
|
+END
|
||||||
|
+
|
||||||
|
+# Trust for Certificate "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
|
||||||
|
+CKA_CLASS CK_OBJECT_CLASS CKO_NETSCAPE_TRUST
|
||||||
|
+CKA_TOKEN CK_BBOOL CK_TRUE
|
||||||
|
+CKA_PRIVATE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_MODIFIABLE CK_BBOOL CK_FALSE
|
||||||
|
+CKA_LABEL UTF8 "Explicitly Distrusted Malaysian Digicert Sdn. Bhd. (en)"
|
||||||
|
+CKA_CERT_SHA1_HASH MULTILINE_OCTAL
|
||||||
|
+\153\074\073\200\255\312\246\272\212\237\124\246\172\355\022\151
|
||||||
|
+\005\155\061\046
|
||||||
|
+END
|
||||||
|
+CKA_CERT_MD5_HASH MULTILINE_OCTAL
|
||||||
|
+\327\151\141\177\065\017\234\106\243\252\353\370\125\374\204\362
|
||||||
|
+END
|
||||||
|
+CKA_ISSUER MULTILINE_OCTAL
|
||||||
|
+\060\201\264\061\024\060\022\006\003\125\004\012\023\013\105\156
|
||||||
|
+\164\162\165\163\164\056\156\145\164\061\100\060\076\006\003\125
|
||||||
|
+\004\013\024\067\167\167\167\056\145\156\164\162\165\163\164\056
|
||||||
|
+\156\145\164\057\103\120\123\137\062\060\064\070\040\151\156\143
|
||||||
|
+\157\162\160\056\040\142\171\040\162\145\146\056\040\050\154\151
|
||||||
|
+\155\151\164\163\040\154\151\141\142\056\051\061\045\060\043\006
|
||||||
|
+\003\125\004\013\023\034\050\143\051\040\061\071\071\071\040\105
|
||||||
|
+\156\164\162\165\163\164\056\156\145\164\040\114\151\155\151\164
|
||||||
|
+\145\144\061\063\060\061\006\003\125\004\003\023\052\105\156\164
|
||||||
|
+\162\165\163\164\056\156\145\164\040\103\145\162\164\151\146\151
|
||||||
|
+\143\141\164\151\157\156\040\101\165\164\150\157\162\151\164\171
|
||||||
|
+\040\050\062\060\064\070\051
|
||||||
|
+END
|
||||||
|
+CKA_SERIAL_NUMBER MULTILINE_OCTAL
|
||||||
|
+\002\006\007\377\377\377\377\377
|
||||||
|
+END
|
||||||
|
+CKA_TRUST_SERVER_AUTH CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
+CKA_TRUST_EMAIL_PROTECTION CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
+CKA_TRUST_CODE_SIGNING CK_TRUST CKT_NETSCAPE_UNTRUSTED
|
||||||
|
+CKA_TRUST_STEP_UP_APPROVED CK_BBOOL CK_FALSE
|
||||||
|
+
|
||||||
|
diff -up ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h.ckbi188 ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h
|
||||||
|
--- ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h.ckbi188 2011-11-03 13:53:16.192262303 -0700
|
||||||
|
+++ ./mozilla/security/nss/lib/ckfw/builtins/nssckbi.h 2011-11-03 13:54:48.182013245 -0700
|
||||||
|
@@ -77,8 +77,8 @@
|
||||||
|
* of the comment in the CK_VERSION type definition.
|
||||||
|
*/
|
||||||
|
#define NSS_BUILTINS_LIBRARY_VERSION_MAJOR 1
|
||||||
|
-#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 87
|
||||||
|
-#define NSS_BUILTINS_LIBRARY_VERSION "1.87"
|
||||||
|
+#define NSS_BUILTINS_LIBRARY_VERSION_MINOR 88
|
||||||
|
+#define NSS_BUILTINS_LIBRARY_VERSION "1.88"
|
||||||
|
|
||||||
|
/* These version numbers detail the semantic changes to the ckfw engine. */
|
||||||
|
#define NSS_BUILTINS_HARDWARE_VERSION_MAJOR 1
|
|
@ -1,12 +0,0 @@
|
||||||
diff -up ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47 ./mozilla/security/nss/lib/softoken/secmodt.h
|
|
||||||
--- ./mozilla/security/nss/lib/softoken/secmodt.h.gcc47 2012-02-29 16:27:58.474061098 -0800
|
|
||||||
+++ ./mozilla/security/nss/lib/softoken/secmodt.h 2012-02-29 16:30:55.604349312 -0800
|
|
||||||
@@ -342,7 +342,7 @@ typedef PRUint32 PK11AttrFlags;
|
|
||||||
#define SECMOD_SLOT_FLAGS "slotFlags=[RSA,DSA,DH,RC2,RC4,DES,RANDOM,SHA1,MD5,MD2,SSL,TLS,AES,Camellia,SEED,SHA256,SHA512]"
|
|
||||||
|
|
||||||
#define SECMOD_MAKE_NSS_FLAGS(fips,slot) \
|
|
||||||
-"Flags=internal,critical" fips " slotparams=(" #slot "={" SECMOD_SLOT_FLAGS "})"
|
|
||||||
+"Flags=internal,critical" fips" slotparams=("#slot"={" SECMOD_SLOT_FLAGS"})"
|
|
||||||
|
|
||||||
#define SECMOD_INT_NAME "NSS Internal PKCS #11 Module"
|
|
||||||
#define SECMOD_INT_FLAGS SECMOD_MAKE_NSS_FLAGS("",1)
|
|
81
nss.spec
81
nss.spec
|
@ -1,13 +1,13 @@
|
||||||
%global nspr_version 4.9
|
%global nspr_version 4.9
|
||||||
%global nss_util_version 3.13.3
|
%global nss_util_version 3.13.4
|
||||||
%global nss_softokn_fips_version 3.12.9
|
%global nss_softokn_fips_version 3.12.9
|
||||||
%global nss_softokn_version 3.13.3
|
%global nss_softokn_version 3.13.4
|
||||||
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
%global unsupported_tools_directory %{_libdir}/nss/unsupported-tools
|
||||||
|
|
||||||
Summary: Network Security Services
|
Summary: Network Security Services
|
||||||
Name: nss
|
Name: nss
|
||||||
Version: 3.13.3
|
Version: 3.13.4
|
||||||
Release: 3%{?dist}
|
Release: 2%{?dist}
|
||||||
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
License: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||||
URL: http://www.mozilla.org/projects/security/pki/nss/
|
URL: http://www.mozilla.org/projects/security/pki/nss/
|
||||||
Group: System Environment/Libraries
|
Group: System Environment/Libraries
|
||||||
|
@ -52,31 +52,23 @@ Source7: blank-key4.db
|
||||||
Source8: system-pkcs11.txt
|
Source8: system-pkcs11.txt
|
||||||
Source9: setup-nsssysinit.sh
|
Source9: setup-nsssysinit.sh
|
||||||
Source10: PayPalEE.cert
|
Source10: PayPalEE.cert
|
||||||
Source12: %{name}-pem-20101125.tar.bz2
|
Source12: %{name}-pem-20120402.tar.bz2
|
||||||
|
|
||||||
|
Patch2: add-relro-linker-option.patch
|
||||||
Patch3: renegotiate-transitional.patch
|
Patch3: renegotiate-transitional.patch
|
||||||
Patch6: nss-enable-pem.patch
|
Patch6: nss-enable-pem.patch
|
||||||
Patch7: nsspem-642433.patch
|
|
||||||
Patch8: 0001-Bug-695011-PEM-logging.patch
|
|
||||||
Patch16: nss-539183.patch
|
Patch16: nss-539183.patch
|
||||||
Patch18: nss-646045.patch
|
Patch18: nss-646045.patch
|
||||||
Patch20: nsspem-createobject-initialize-pointer.patch
|
# must statically link pem against the freebl in the buildroot
|
||||||
Patch21: 0001-libnsspem-rhbz-734760.patch
|
# Needed only when freebl on tree has newe APIS
|
||||||
Patch22: nsspem-init-inform-not-thread-safe.patch
|
|
||||||
# must statically link pem against the 3.12.x system freebl in the buildroot
|
|
||||||
Patch25: nsspem-use-system-freebl.patch
|
Patch25: nsspem-use-system-freebl.patch
|
||||||
# don't compile the fipstest application
|
# don't compile the fipstest application
|
||||||
Patch26: nofipstest.patch
|
Patch26: nofipstest.patch
|
||||||
# include this patch in the upstream pem review
|
# This patch is currently meant for stable branches
|
||||||
Patch28: nsspem-bz754771.patch
|
|
||||||
# This patch is currently meant for f16 and f15 only, and f17 now
|
|
||||||
Patch29: nss-ssl-cbc-random-iv-off-by-default.patch
|
Patch29: nss-ssl-cbc-random-iv-off-by-default.patch
|
||||||
|
|
||||||
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
|
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
|
||||||
Patch30: bz784672-protect-against-calls-before-nss_init.patch
|
Patch30: bz784672-protect-against-calls-before-nss_init.patch
|
||||||
# Fix gcc 4.7 c++ issue in secmodt.h
|
|
||||||
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50917
|
|
||||||
Patch31: nss-fix-gcc47-secmodt.patch
|
|
||||||
|
|
||||||
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734484
|
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734484
|
||||||
Patch32: Bug-800674-Unable-to-contact-LDAP-Server-during-winsync.patch
|
Patch32: Bug-800674-Unable-to-contact-LDAP-Server-during-winsync.patch
|
||||||
|
@ -84,12 +76,6 @@ Patch32: Bug-800674-Unable-to-contact-LDAP-Server-during-winsync.patch
|
||||||
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
|
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734492
|
||||||
Patch33: Bug-800682-Qpid-AMQP-daemon-fails-to-load-after-nss-update.patch
|
Patch33: Bug-800682-Qpid-AMQP-daemon-fails-to-load-after-nss-update.patch
|
||||||
|
|
||||||
# upstream: https://bugzilla.mozilla.org/show_bug.cgi?id=734441
|
|
||||||
Patch34: Bug-800676-nss-workaround-for-freebl-bug-that-causes-openswan-to-drop-connections.patch
|
|
||||||
|
|
||||||
# Activate when verified in RHEL
|
|
||||||
# Patch55: Bug-746632-pem_CreateObject-mem-leak-on-non-existing-file-name.patch
|
|
||||||
|
|
||||||
|
|
||||||
%description
|
%description
|
||||||
Network Security Services (NSS) is a set of libraries designed to
|
Network Security Services (NSS) is a set of libraries designed to
|
||||||
|
@ -163,26 +149,18 @@ low level services.
|
||||||
%{__cp} %{SOURCE10} -f ./mozilla/security/nss/tests/libpkix/certs
|
%{__cp} %{SOURCE10} -f ./mozilla/security/nss/tests/libpkix/certs
|
||||||
%setup -q -T -D -n %{name}-%{version} -a 12
|
%setup -q -T -D -n %{name}-%{version} -a 12
|
||||||
|
|
||||||
|
%patch2 -p0 -b .relro
|
||||||
%patch3 -p0 -b .transitional
|
%patch3 -p0 -b .transitional
|
||||||
%patch6 -p0 -b .libpem
|
%patch6 -p0 -b .libpem
|
||||||
%patch7 -p0 -b .642433
|
|
||||||
%patch8 -p1 -b .695011
|
|
||||||
%patch16 -p0 -b .539183
|
%patch16 -p0 -b .539183
|
||||||
%patch18 -p0 -b .646045
|
%patch18 -p0 -b .646045
|
||||||
%patch20 -p1 -b .717338
|
# link pem against buildroot's freebl, esential wen mixing and matching
|
||||||
%patch21 -p1 -b .734760
|
|
||||||
%patch22 -p0 -b .736410
|
|
||||||
# link pem against buildroot's 3.12 freebl
|
|
||||||
%patch25 -p0 -b .systemfreebl
|
%patch25 -p0 -b .systemfreebl
|
||||||
%patch26 -p0 -b .nofipstest
|
%patch26 -p0 -b .nofipstest
|
||||||
%patch28 -p0 -b .754771
|
%patch29 -p0 -b .770682
|
||||||
# activate only if requested for f17
|
|
||||||
#%patch29 -p0 -b .770682
|
|
||||||
%patch30 -p0 -b .784672
|
%patch30 -p0 -b .784672
|
||||||
%patch31 -p0 -b .gcc47
|
|
||||||
%patch32 -p0 -b .800674
|
%patch32 -p0 -b .800674
|
||||||
%patch33 -p0 -b .800682
|
%patch33 -p0 -b .800682
|
||||||
%patch34 -p0 -b .800676
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
@ -597,32 +575,33 @@ rm -rf $RPM_BUILD_ROOT/%{_includedir}/nss3/nsslowhash.h
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Fri Mar 09 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.3-3
|
* Sun Apr 08 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.4-2
|
||||||
- Cleanup of the spec file
|
- Resolves: Bug 805723 - Library needs partial RELRO support added
|
||||||
- Add references to the upstream bugs
|
- Patch coreconf/Linux.mk as done on RHEL 6.2
|
||||||
- Fix typo in Summary for sysinit
|
|
||||||
|
|
||||||
* Thu Mar 08 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.3-2
|
* Sat Apr 07 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.4-1
|
||||||
|
- Update to NSS_3_13_4_RTM
|
||||||
|
- Update the nss-pem source archive to the latest version
|
||||||
|
- Remove no longer needed patches
|
||||||
|
- Resolves: Bug 806043 - use pem files interchangeably in a single process
|
||||||
|
- Resolves: Bug 806051 - PEM various flaws detected by Coverity
|
||||||
|
- Resolves: Bug 806058 - PEM pem_CreateObject leaks memory given a non-existing file name
|
||||||
|
|
||||||
|
* Wed Mar 28 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.3-2
|
||||||
|
- Resolves: Bug 805723 - Library needs partial RELRO support added
|
||||||
|
|
||||||
|
* Sat Mar 10 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.3-1
|
||||||
|
- Update to NSS_3_13_3_RTM
|
||||||
|
- spec file cleanup: add references to upstream bugs
|
||||||
|
- spec file cleanup: fix typo in Summary for sysinit
|
||||||
- Pick up fixes from RHEL
|
- Pick up fixes from RHEL
|
||||||
- Resolves: rhbz#800674 - Unable to contact LDAP Server during winsync
|
- Resolves: rhbz#800674 - Unable to contact LDAP Server during winsync
|
||||||
- Resolves: rhbz#800682 - Qpid AMQP daemon fails to load after nss update
|
- Resolves: rhbz#800682 - Qpid AMQP daemon fails to load after nss update
|
||||||
- Resolves: rhbz#800676 - NSS workaround for freebl bug that causes openswan to drop connections
|
- Resolves: rhbz#800676 - NSS workaround for freebl bug that causes openswan to drop connections
|
||||||
|
|
||||||
* Thu Mar 01 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.3-1
|
|
||||||
- Update to NSS_3_13_3_RTM
|
|
||||||
|
|
||||||
* Mon Jan 30 2012 Tom Callaway <spot@fedoraproject.org> - 3.13.1-13
|
|
||||||
- fix issue with gcc 4.7 in secmodt.h and C++11 user-defined literals
|
|
||||||
|
|
||||||
* Thu Jan 26 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.1-12
|
* Thu Jan 26 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.1-12
|
||||||
- Resolves: Bug 784672 - nss should protect against being called before nss_Init
|
- Resolves: Bug 784672 - nss should protect against being called before nss_Init
|
||||||
|
|
||||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.13.1-11
|
|
||||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
|
||||||
|
|
||||||
* Fri Jan 06 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.1-11
|
|
||||||
- Deactivate a patch currently meant for stable branches only
|
|
||||||
|
|
||||||
* Fri Jan 06 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.1-10
|
* Fri Jan 06 2012 Elio Maldonado <emaldona@redhat.com> - 3.13.1-10
|
||||||
- Resolves: Bug 770682 - nss update breaks pidgin-sipe connectivity
|
- Resolves: Bug 770682 - nss update breaks pidgin-sipe connectivity
|
||||||
- NSS_SSL_CBC_RANDOM_IV set to 0 by default and changed to 1 on user request
|
- NSS_SSL_CBC_RANDOM_IV set to 0 by default and changed to 1 on user request
|
||||||
|
|
|
@ -1,52 +0,0 @@
|
||||||
diff -up ./mozilla/security/nss/lib/ckfw/pem/util.c.642433 ./mozilla/security/nss/lib/ckfw/pem/util.c
|
|
||||||
--- ./mozilla/security/nss/lib/ckfw/pem/util.c.642433 2010-11-25 10:49:27.000000000 -0800
|
|
||||||
+++ ./mozilla/security/nss/lib/ckfw/pem/util.c 2010-12-08 08:02:02.618304926 -0800
|
|
||||||
@@ -96,9 +96,6 @@ static SECItem *AllocItem(SECItem * item
|
|
||||||
return (result);
|
|
||||||
|
|
||||||
loser:
|
|
||||||
- if (result != NULL) {
|
|
||||||
- SECITEM_FreeItem(result, (item == NULL) ? PR_TRUE : PR_FALSE);
|
|
||||||
- }
|
|
||||||
return (NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -110,7 +107,7 @@ static SECStatus FileToItem(SECItem * ds
|
|
||||||
|
|
||||||
prStatus = PR_GetOpenFileInfo(src, &info);
|
|
||||||
|
|
||||||
- if (prStatus != PR_SUCCESS) {
|
|
||||||
+ if (prStatus != PR_SUCCESS || info.type == PR_FILE_DIRECTORY) {
|
|
||||||
return SECFailure;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -126,8 +123,7 @@ static SECStatus FileToItem(SECItem * ds
|
|
||||||
|
|
||||||
return SECSuccess;
|
|
||||||
loser:
|
|
||||||
- SECITEM_FreeItem(dst, PR_FALSE);
|
|
||||||
- nss_ZFreeIf(dst);
|
|
||||||
+ nss_ZFreeIf(dst->data);
|
|
||||||
return SECFailure;
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -153,6 +149,10 @@ ReadDERFromFile(SECItem *** derlist, cha
|
|
||||||
|
|
||||||
/* Read in ascii data */
|
|
||||||
rv = FileToItem(&filedata, inFile);
|
|
||||||
+ if (rv != SECSuccess) {
|
|
||||||
+ PR_Close(inFile);
|
|
||||||
+ return -1;
|
|
||||||
+ }
|
|
||||||
asc = (char *) filedata.data;
|
|
||||||
if (!asc) {
|
|
||||||
PR_Close(inFile);
|
|
||||||
@@ -252,7 +252,7 @@ ReadDERFromFile(SECItem *** derlist, cha
|
|
||||||
} else {
|
|
||||||
/* Read in binary der */
|
|
||||||
rv = FileToItem(der, inFile);
|
|
||||||
- if (rv) {
|
|
||||||
+ if (rv != SECSuccess) {
|
|
||||||
PR_Close(inFile);
|
|
||||||
return -1;
|
|
||||||
}
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff -up ./mozilla/security/nss/lib/ckfw/pem/pinst.c.754771 ./mozilla/security/nss/lib/ckfw/pem/pinst.c
|
|
||||||
--- ./mozilla/security/nss/lib/ckfw/pem/pinst.c.754771 2011-12-12 09:38:51.839104295 -0800
|
|
||||||
+++ ./mozilla/security/nss/lib/ckfw/pem/pinst.c 2011-12-12 09:44:40.437096761 -0800
|
|
||||||
@@ -350,6 +350,9 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla
|
|
||||||
if (io == NULL)
|
|
||||||
return NULL;
|
|
||||||
|
|
||||||
+ /* initialize pointers to functions */
|
|
||||||
+ pem_CreateMDObject(NULL, io, NULL);
|
|
||||||
+
|
|
||||||
io->gobjIndex = count;
|
|
||||||
|
|
||||||
/* add object to global array */
|
|
|
@ -1,11 +0,0 @@
|
||||||
diff -up ./mozilla/security/nss/lib/ckfw/pem/pobject.c.717338 ./mozilla/security/nss/lib/ckfw/pem/pobject.c
|
|
||||||
--- ./mozilla/security/nss/lib/ckfw/pem/pobject.c.717338 2010-11-25 10:49:27.000000000 -0800
|
|
||||||
+++ ./mozilla/security/nss/lib/ckfw/pem/pobject.c 2011-09-10 10:16:58.752726964 -0700
|
|
||||||
@@ -1179,6 +1179,7 @@ pem_CreateObject
|
|
||||||
return (NSSCKMDObject *) NULL;
|
|
||||||
|
|
||||||
certDER.len = 0; /* in case there is no equivalent cert */
|
|
||||||
+ certDER.data = NULL;
|
|
||||||
|
|
||||||
objid = -1;
|
|
||||||
for (i = 0; i < pem_nobjs; i++) {
|
|
|
@ -1,129 +0,0 @@
|
||||||
--- mozilla/security/nss/lib/ckfw/pem/pinst.c.736410 2010-11-25 11:51:52.000000000 -0800
|
|
||||||
+++ mozilla/security/nss/lib/ckfw/pem/pinst.c 2011-09-13 16:59:49.325215540 -0700
|
|
||||||
@@ -364,39 +364,37 @@ AddObjectIfNeeded(CK_OBJECT_CLASS objCla
|
|
||||||
size += PEM_ITEM_CHUNK;
|
|
||||||
}
|
|
||||||
gobj[count] = io;
|
|
||||||
count++;
|
|
||||||
pem_nobjs++;
|
|
||||||
|
|
||||||
io->refCount ++;
|
|
||||||
return io;
|
|
||||||
}
|
|
||||||
|
|
||||||
CK_RV
|
|
||||||
AddCertificate(char *certfile, char *keyfile, PRBool cacert,
|
|
||||||
CK_SLOT_ID slotID)
|
|
||||||
{
|
|
||||||
pemInternalObject *o;
|
|
||||||
- SECItem certDER;
|
|
||||||
CK_RV error = 0;
|
|
||||||
int objid, i;
|
|
||||||
int nobjs = 0;
|
|
||||||
SECItem **objs = NULL;
|
|
||||||
char *ivstring = NULL;
|
|
||||||
int cipher;
|
|
||||||
|
|
||||||
- certDER.data = NULL;
|
|
||||||
nobjs = ReadDERFromFile(&objs, certfile, PR_TRUE, &cipher, &ivstring, PR_TRUE /* certs only */);
|
|
||||||
if (nobjs <= 0) {
|
|
||||||
nss_ZFreeIf(objs);
|
|
||||||
return CKR_GENERAL_ERROR;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* For now load as many certs as are in the file for CAs only */
|
|
||||||
if (cacert) {
|
|
||||||
for (i = 0; i < nobjs; i++) {
|
|
||||||
char nickname[1024];
|
|
||||||
objid = pem_nobjs + 1;
|
|
||||||
|
|
||||||
snprintf(nickname, 1024, "%s - %d", certfile, i);
|
|
||||||
|
|
||||||
o = AddObjectIfNeeded(CKO_CERTIFICATE, pemCert, objs[i], NULL,
|
|
||||||
@@ -456,72 +454,76 @@ AddCertificate(char *certfile, char *key
|
|
||||||
loser:
|
|
||||||
nss_ZFreeIf(objs);
|
|
||||||
nss_ZFreeIf(o);
|
|
||||||
return error;
|
|
||||||
}
|
|
||||||
|
|
||||||
CK_RV
|
|
||||||
pem_Initialize
|
|
||||||
(
|
|
||||||
NSSCKMDInstance * mdInstance,
|
|
||||||
NSSCKFWInstance * fwInstance,
|
|
||||||
NSSUTF8 * configurationData
|
|
||||||
)
|
|
||||||
{
|
|
||||||
CK_RV rv;
|
|
||||||
- /* parse the initialization string and initialize CRLInstances */
|
|
||||||
+ /* parse the initialization string */
|
|
||||||
char **certstrings = NULL;
|
|
||||||
+ char *modparms = NULL;
|
|
||||||
PRInt32 numcerts = 0;
|
|
||||||
PRBool status, error = PR_FALSE;
|
|
||||||
int i;
|
|
||||||
+ CK_C_INITIALIZE_ARGS_PTR modArgs = NULL;
|
|
||||||
+
|
|
||||||
+ if (!fwInstance) return CKR_ARGUMENTS_BAD;
|
|
||||||
+
|
|
||||||
+ modArgs = NSSCKFWInstance_GetInitArgs(fwInstance);
|
|
||||||
+ if (modArgs &&
|
|
||||||
+ ((modArgs->flags & CKF_OS_LOCKING_OK) || (modArgs->CreateMutex != 0))) {
|
|
||||||
+ return CKR_CANT_LOCK;
|
|
||||||
+ }
|
|
||||||
|
|
||||||
if (pemInitialized) {
|
|
||||||
return CKR_OK;
|
|
||||||
}
|
|
||||||
+
|
|
||||||
RNG_RNGInit();
|
|
||||||
|
|
||||||
open_log();
|
|
||||||
|
|
||||||
plog("pem_Initialize\n");
|
|
||||||
|
|
||||||
- unsigned char *modparms = NULL;
|
|
||||||
- if (!fwInstance) {
|
|
||||||
- return CKR_ARGUMENTS_BAD;
|
|
||||||
- }
|
|
||||||
-
|
|
||||||
- CK_C_INITIALIZE_ARGS_PTR modArgs =
|
|
||||||
- NSSCKFWInstance_GetInitArgs(fwInstance);
|
|
||||||
if (!modArgs || !modArgs->LibraryParameters) {
|
|
||||||
goto done;
|
|
||||||
}
|
|
||||||
- modparms = (unsigned char *) modArgs->LibraryParameters;
|
|
||||||
+ modparms = (char *) modArgs->LibraryParameters;
|
|
||||||
plog("Initialized with %s\n", modparms);
|
|
||||||
|
|
||||||
/*
|
|
||||||
* The initialization string format is a space-delimited file of
|
|
||||||
* pairs of paths which are delimited by a semi-colon. The first
|
|
||||||
* entry of the pair is the path to the certificate file. The
|
|
||||||
* second is the path to the key file.
|
|
||||||
*
|
|
||||||
* CA certificates do not need the semi-colon.
|
|
||||||
*
|
|
||||||
* Example:
|
|
||||||
* /etc/certs/server.pem;/etc/certs/server.key /etc/certs/ca.pem
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
status =
|
|
||||||
- pem_ParseString((const char *) modparms, ' ', &numcerts,
|
|
||||||
+ pem_ParseString(modparms, ' ', &numcerts,
|
|
||||||
&certstrings);
|
|
||||||
if (status == PR_FALSE) {
|
|
||||||
return CKR_ARGUMENTS_BAD;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i = 0; i < numcerts && error != PR_TRUE; i++) {
|
|
||||||
char *cert = certstrings[i];
|
|
||||||
PRInt32 attrcount = 0;
|
|
||||||
char **certattrs = NULL;
|
|
||||||
status = pem_ParseString(cert, ';', &attrcount, &certattrs);
|
|
||||||
if (status == PR_FALSE) {
|
|
||||||
error = PR_TRUE;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
4
sources
4
sources
|
@ -1,8 +1,8 @@
|
||||||
3d211ab803585d449f94e67cbeca8502 nss-3.13.3-stripped.tar.bz2
|
|
||||||
e63cddf74c07f0d818d1052ecc6fbb1f nss-pem-20101125.tar.bz2
|
|
||||||
a5ae49867124ac75f029a9a33af31bad blank-cert8.db
|
a5ae49867124ac75f029a9a33af31bad blank-cert8.db
|
||||||
9315689bbd9f28ceebd47894f99fccbd blank-key3.db
|
9315689bbd9f28ceebd47894f99fccbd blank-key3.db
|
||||||
73bc040a0542bba387e6dd7fb9fd7d23 blank-secmod.db
|
73bc040a0542bba387e6dd7fb9fd7d23 blank-secmod.db
|
||||||
691e663ccc07b7a1eaa6f088e03bf8e2 blank-cert9.db
|
691e663ccc07b7a1eaa6f088e03bf8e2 blank-cert9.db
|
||||||
2ec9e0606ba40fe65196545564b7cc2a blank-key4.db
|
2ec9e0606ba40fe65196545564b7cc2a blank-key4.db
|
||||||
bf47cecad861efa77d1488ad4a73cb5b PayPalEE.cert
|
bf47cecad861efa77d1488ad4a73cb5b PayPalEE.cert
|
||||||
|
d19159b7f91b94afaf7fa78bba006c13 nss-pem-20120402.tar.bz2
|
||||||
|
74bbd7b520179c2e226a021fba8ff365 nss-3.13.4-stripped.tar.bz2
|
||||||
|
|
Loading…
Reference in New Issue