From 207d0c106c841c0efd549eda92773a426dc041bd Mon Sep 17 00:00:00 2001
From: "javi%netscape.com" <devnull@localhost>
Date: Tue, 24 Apr 2001 22:39:34 +0000
Subject: Fix for Bug 75950.  The loadable root certs module on Mac caused an
 assertion every time when loaded because of 2 sets of PR_* functions being
 loaded.

---
 security/nss/macbuild/LoadableRoots.mcp | Bin 48691 -> 49971 bytes
 security/nss/macbuild/NSSckfw.mcp       | Bin 44740 -> 44740 bytes
 security/nss/macbuild/macstubs.c        |  45 ++++++++++++++++++++++++++++++++
 3 files changed, 45 insertions(+)
 create mode 100644 security/nss/macbuild/macstubs.c

(limited to 'security/nss/macbuild')

diff --git a/security/nss/macbuild/LoadableRoots.mcp b/security/nss/macbuild/LoadableRoots.mcp
index 65b39aa0b..6ff2ddf41 100644
Binary files a/security/nss/macbuild/LoadableRoots.mcp and b/security/nss/macbuild/LoadableRoots.mcp differ
diff --git a/security/nss/macbuild/NSSckfw.mcp b/security/nss/macbuild/NSSckfw.mcp
index d16cdaf24..cbcaefa23 100644
Binary files a/security/nss/macbuild/NSSckfw.mcp and b/security/nss/macbuild/NSSckfw.mcp differ
diff --git a/security/nss/macbuild/macstubs.c b/security/nss/macbuild/macstubs.c
new file mode 100644
index 000000000..98613cd06
--- /dev/null
+++ b/security/nss/macbuild/macstubs.c
@@ -0,0 +1,45 @@
+/* 
+ * The contents of this file are subject to the Mozilla Public
+ * License Version 1.1 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.mozilla.org/MPL/
+ * 
+ * Software distributed under the License is distributed on an "AS
+ * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
+ * implied. See the License for the specific language governing
+ * rights and limitations under the License.
+ * 
+ * The Original Code is the Netscape security libraries.
+ * 
+ * The Initial Developer of the Original Code is Netscape
+ * Communications Corporation.  Portions created by Netscape are 
+ * Copyright (C) 1994-2000 Netscape Communications Corporation.  All
+ * Rights Reserved.
+ * 
+ * Contributor(s):
+ * 
+ * Alternatively, the contents of this file may be used under the
+ * terms of the GNU General Public License Version 2 or later (the
+ * "GPL"), in which case the provisions of the GPL are applicable 
+ * instead of those above.  If you wish to allow use of your 
+ * version of this file only under the terms of the GPL and not to
+ * allow others to use your version of this file under the MPL,
+ * indicate your decision by deleting the provisions above and
+ * replace them with the notice and other provisions required by
+ * the GPL.  If you do not delete the provisions above, a recipient
+ * may use your version of this file under either the MPL or the
+ * GPL.
+ */
+ 
+ /*
+  * This file is meant only to make the Mac version of the 
+  * loadable root certs not have to build the nsprstub for NSS
+  * which causes 2 versions of the PR_* functions to be loaded.
+  * Very bad potentially.
+  */
+  
+  #include "pkcs11t.h"
+  
+  void
+  nssSetLockArgs(CK_C_INITIALIZE_ARGS_PTR pInitArgs) {}
+  
\ No newline at end of file
-- 
cgit v1.2.1