Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by George Sherwood (6f6849530c49689fa456aa81b2fcb0ca7611cbd5)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: George Sherwood <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by George Sherwood (6f6849530c49689fa456aa81b2fcb0ca7611cbd5)
  • Date: Thu, 4 Dec 2008 12:25:24 -0600

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

crypto/nss/CONFIGURE | 1 +
crypto/nss/HISTORY | 4 ++++
crypto/nss/PRE_BUILD | 8 +++++++-
crypto/nss/nss-enable-pem.patch | 12 ++++++++++++
crypto/nss/nss-pem-20080124.tar.bz2 |binary
crypto/nss/nss-pem-bug429175.patch | 12 ++++++++++++
6 files changed, 36 insertions(+), 1 deletion(-)

New commits:
commit 6f6849530c49689fa456aa81b2fcb0ca7611cbd5
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

nss: Add Fedora patches to allow nss to work with pem
certificates.

diff --git a/crypto/nss/CONFIGURE b/crypto/nss/CONFIGURE
new file mode 100755
index 0000000..2e5cd6b
--- /dev/null
+++ b/crypto/nss/CONFIGURE
@@ -0,0 +1 @@
+config_query NSS_PEM "Do you want to enable nss for PEM certs?" n
diff --git a/crypto/nss/HISTORY b/crypto/nss/HISTORY
index 52a482f..d60b893 100644
--- a/crypto/nss/HISTORY
+++ b/crypto/nss/HISTORY
@@ -1,3 +1,7 @@
+2008-12-04 George Sherwood <gsherwood AT sourcemage.org>
+ * CONFIGURE: Add option to build nss with pem support
+ * PRE_BUILD: Added fedora patches for pem support if requested
+
2008-11-29 George Sherwood <gsherwood AT sourcemage.org>
* Add needed build option NSS_ENABLE_ECC=1

diff --git a/crypto/nss/PRE_BUILD b/crypto/nss/PRE_BUILD
index b9db6e6..4c67d87 100755
--- a/crypto/nss/PRE_BUILD
+++ b/crypto/nss/PRE_BUILD
@@ -2,4 +2,10 @@ default_pre_build &&

cd $SOURCE_DIRECTORY &&

-patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch
+patch -p1 < $SCRIPT_DIRECTORY/nss-3.12-config-1.patch &&
+
+if [[ "$NSS_PEM" == "y" ]]; then
+tar jxvf $SCRIPT_DIRECTORY/nss-pem-20080124.tar.bz2 &&
+patch -p0 < $SCRIPT_DIRECTORY/nss-enable-pem.patch &&
+patch -p0 < $SCRIPT_DIRECTORY/nss-pem-bug429175.patch
+fi
diff --git a/crypto/nss/nss-enable-pem.patch b/crypto/nss/nss-enable-pem.patch
new file mode 100644
index 0000000..665a148
--- /dev/null
+++ b/crypto/nss/nss-enable-pem.patch
@@ -0,0 +1,12 @@
+diff -up ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem
./mozilla/security/nss/lib/ckfw/manifest.mn
+--- ./mozilla/security/nss/lib/ckfw/manifest.mn.prepem 2008-08-05
16:34:23.000000000 -0700
++++ ./mozilla/security/nss/lib/ckfw/manifest.mn 2008-08-05
16:34:30.000000000 -0700
+@@ -38,7 +38,7 @@ MANIFEST_CVS_ID = "@(#) $RCSfile: manife
+
+ CORE_DEPTH = ../../..
+
+-DIRS = builtins
++DIRS = builtins pem
+
+ PRIVATE_EXPORTS = \
+ ck.h \
diff --git a/crypto/nss/nss-pem-20080124.tar.bz2
b/crypto/nss/nss-pem-20080124.tar.bz2
new file mode 100644
index 0000000..b977ece
Binary files /dev/null and b/crypto/nss/nss-pem-20080124.tar.bz2 differ
diff --git a/crypto/nss/nss-pem-bug429175.patch
b/crypto/nss/nss-pem-bug429175.patch
new file mode 100644
index 0000000..6732c04
--- /dev/null
+++ b/crypto/nss/nss-pem-bug429175.patch
@@ -0,0 +1,12 @@
+diff -u --recursive mozilla.orig/security/nss/lib/ckfw/pem/pobject.c
mozilla/security/nss/lib/ckfw/pem/pobject.c
+--- mozilla.orig/security/nss/lib/ckfw/pem/pobject.c 2007-09-06
16:46:30.000000000 -0400
++++ mozilla/security/nss/lib/ckfw/pem/pobject.c 2008-08-13
21:08:43.000000000 -0400
+@@ -160,7 +160,7 @@
+ (void *) &ck_false, (PRUint32) sizeof(CK_BBOOL)
+ };
+ static const NSSItem pem_x509Item = {
+- (void *) &ckc_x509, (PRUint32) sizeof(CKC_X_509)
++ (void *) &ckc_x509, (PRUint32) sizeof(CK_ULONG)
+ };
+ static const NSSItem pem_rsaItem = {
+ (void *) &ckk_rsa, (PRUint32) sizeof(CK_KEY_TYPE)



  • [SM-Commit] GIT changes to master grimoire by George Sherwood (6f6849530c49689fa456aa81b2fcb0ca7611cbd5), George Sherwood, 12/04/2008

Archive powered by MHonArc 2.6.24.

Top of Page