diff options
author | javi%netscape.com <devnull@localhost> | 2001-04-24 22:39:34 +0000 |
---|---|---|
committer | javi%netscape.com <devnull@localhost> | 2001-04-24 22:39:34 +0000 |
commit | 207d0c106c841c0efd549eda92773a426dc041bd (patch) | |
tree | 0862f6ff19d20a32edd0ea2bb7e7ecd522c9c759 /security/nss/macbuild | |
parent | dac8a25418a22f3b979c6dac6a7afbe5e1906242 (diff) | |
download | nss-hg-207d0c106c841c0efd549eda92773a426dc041bd.tar.gz |
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.
Diffstat (limited to 'security/nss/macbuild')
-rw-r--r-- | security/nss/macbuild/LoadableRoots.mcp | bin | 48691 -> 49971 bytes | |||
-rw-r--r-- | security/nss/macbuild/NSSckfw.mcp | bin | 44740 -> 44740 bytes | |||
-rw-r--r-- | security/nss/macbuild/macstubs.c | 45 |
3 files changed, 45 insertions, 0 deletions
diff --git a/security/nss/macbuild/LoadableRoots.mcp b/security/nss/macbuild/LoadableRoots.mcp Binary files differindex 65b39aa0b..6ff2ddf41 100644 --- a/security/nss/macbuild/LoadableRoots.mcp +++ b/security/nss/macbuild/LoadableRoots.mcp diff --git a/security/nss/macbuild/NSSckfw.mcp b/security/nss/macbuild/NSSckfw.mcp Binary files differindex d16cdaf24..cbcaefa23 100644 --- a/security/nss/macbuild/NSSckfw.mcp +++ b/security/nss/macbuild/NSSckfw.mcp 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 |