Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-25 05:41:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

b=116334 NSS 3.4 landing

Browse Source 
r=cls/wtc sr=kin/simon
This commit is contained in:
kaie%netscape.com 2002-02-06 13:31:07 +00:00
parent 42c487f008
commit 7792168b34
17 changed files with 407 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
build/mac/build_scripts/MozillaBuildList.pm
View File

@ -1511,6 +1511,51 @@ sub BuildNeckoProjects()
#// Build Security projects
#//--------------------------------------------------------------------------------------------------
sub CreateNSSExportList($$)
{
my ($source_def_file, $final_exp_file) = @_;
if (! -e $source_def_file) {
die "NSS file $source_def_file does not exist";
}
my($def_mod_time) = GetFileModDate($source_def_file);
my($exp_mod_time) = (-e $final_exp_file ? GetFileModDate($final_exp_file) : 0);
if ($exp_mod_time > $def_mod_time) {
return;
}
open (DEF_FILE, "< $source_def_file") || die "can't open NSS def file $!";
open (EXP_FILE, "> $final_exp_file");
print("Creating $final_exp_file from $source_def_file\n");
while (<DEF_FILE>) {
my ($line) = $_;
if ($line =~ /^;\+./) {
next;
}
if ($line =~ /^LIBRARY/) {
next;
}
if ($line =~ /^EXPORTS/) {
next;
}
if ($line =~ s/^;;(.*) DATA ;//) {
print EXP_FILE "$1\n";
}
if ($line =~ s/^(.*) DATA ;//) {
print EXP_FILE "$1\n";
}
if ($line =~ s/^(.*);//) {
print EXP_FILE "$1\n";
}
}
close DEF_FILE;
close EXP_FILE;
}
sub BuildSecurityProjects()
{
unless( $main::build{security} && $main::options{psm}) { return; }
@ -1523,7 +1568,28 @@ sub BuildSecurityProjects()
StartBuildModule("security");
BuildProject(":mozilla:security:nss:macbuild:NSS.xml","NSS$D.o");
#First we need to build all of the NSS shared libraries now.
#The order is important because they link against each other.
BuildProject(":mozilla:security:nss:macbuild:util.xml","util$D.o");
BuildProject(":mozilla:security:nss:macbuild:crmf.xml","crmf$D.o");
CreateNSSExportList(":mozilla:security:nss:lib:softoken:softokn.def",
":mozilla:security:nss:macbuild:softoken.mcp.exp");
BuildOneProjectWithOutput(":mozilla:security:nss:macbuild:softoken.xml","Softoken3$D.shlb","Softoken3$D.shlb",1, $main::ALIAS_SYM_FILES, 0);
CreateNSSExportList(":mozilla:security:nss:lib:nss:nss.def",
":mozilla:security:nss:macbuild:NSS.mcp.exp");
BuildOneProjectWithOutput(":mozilla:security:nss:macbuild:NSS.xml","NSS3$D.shlb","NSS3$D.shlb",1, $main::ALIAS_SYM_FILES, 0);
CreateNSSExportList(":mozilla:security:nss:lib:ssl:ssl.def",
":mozilla:security:nss:macbuild:ssl.mcp.exp");
BuildOneProjectWithOutput(":mozilla:security:nss:macbuild:ssl.xml","SSL3$D.shlb","SSL3$D.shlb",1, $main::ALIAS_SYM_FILES, 0);
CreateNSSExportList(":mozilla:security:nss:lib:smime:smime.def",
":mozilla:security:nss:macbuild:smime.mcp.exp");
BuildOneProjectWithOutput(":mozilla:security:nss:macbuild:smime.xml","SMIME3$D.shlb","SMIME3$D.shlb",1, $main::ALIAS_SYM_FILES, 0);
BuildOneProject(":mozilla:security:manager:boot:macbuild:pipboot.xml", "pipboot$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
BuildOneProject(":mozilla:security:manager:ssl:macbuild:PIPNSS.xml", "PIPNSS$D.$S", 1, $main::ALIAS_SYM_FILES, 1);
BuildOneProject(":mozilla:security:manager:pki:macbuild:PIPPKI.xml", "PIPPKI$D.$S", 1, $main::ALIAS_SYM_FILES, 1);

2
client.mak
View File

@ -130,10 +130,8 @@ NSS_CO_FLAGS=$(MOZ_CO_FLAGS)
!if "$(NSS_CO_TAG)" != ""
NSS_CO_FLAGS=$(NSS_CO_FLAGS) -r $(NSS_CO_TAG)
!else
!ifndef NSS_3_4
NSS_CO_FLAGS=$(NSS_CO_FLAGS) -r NSS_CLIENT_TAG
!endif
!endif
CVSCO_NSS = cvs $(CVS_FLAGS) co $(NSS_CO_FLAGS)

2
client.mk
View File

@ -55,9 +55,7 @@
#MOZ_CO_TAG = <tag>
NSPR_CO_TAG = NSPRPUB_PRE_4_2_CLIENT_BRANCH
PSM_CO_TAG = #We will now build PSM from the tip instead of a branch.
ifndef NSS_3_4
NSS_CO_TAG = NSS_CLIENT_TAG
endif
LDAPCSDK_CO_TAG = LDAPCSDK_40_BRANCH
ACCESSIBLE_CO_TAG =
GFX2_CO_TAG =

12
config/config.mk
View File

@ -169,6 +169,17 @@ endif
#
# NSS libs needed for final link in static build
#
NSS_3_4=1
ifdef NSS_3_4
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)ssl3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)nss3$(DLL_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)softokn3$(DLL_SUFFIX) \
$(NULL)
else
NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)smime.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
@ -185,6 +196,7 @@ NSS_LIBS = \
$(DIST)/lib/$(NSS_LIB_PREFIX)secutil.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)dbm.$(LIB_SUFFIX) \
$(NULL)
endif
MOZ_UNICHARUTIL_LIBS = $(DIST)/lib/$(LIB_PREFIX)unicharutil_s.$(LIB_SUFFIX)
MOZ_REGISTRY_LIBS = $(DIST)/lib/$(LIB_PREFIX)mozreg_s.$(LIB_SUFFIX)

2
security/manager/Makefile.in
View File

@ -29,6 +29,8 @@ include $(DEPTH)/config/autoconf.mk
LOADABLE_ROOT_MODULE = $(LIB_PREFIX)nssckbi$(DLL_SUFFIX)
NSS_3_4=1
ifdef NSS_3_4
DEFINES += -DNSS_3_4

41
security/manager/ssl/macbuild/PIPNSS.Prefix Normal file
View File

@ -0,0 +1,41 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Javier Delgadillo <javi@netscape.com>
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "MacSharedPrefix.h"
#include "PIPNSSCommon.h"

220
security/manager/ssl/macbuild/PIPNSS.xml
View File

@ -536,7 +536,7 @@
<SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacSharedPrefix.h</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>PIPNSS.Prefix</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
@ -1040,20 +1040,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>DBM.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSPR20.shlb</PATH>
@ -1180,6 +1166,34 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>crmf.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>SMIME3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>SSL3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -1227,16 +1241,6 @@
<PATH>nsSDR.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>DBM.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSPR20.shlb</PATH>
@ -1327,6 +1331,26 @@
<PATH>nsCMSSecureMessage.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>crmf.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>SMIME3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>SSL3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
<TARGET>
@ -1812,7 +1836,7 @@
<SETTING><NAME>MWFrontEnd_C_onlystdkeywords</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_enumsalwaysint</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_mpwpointerstyle</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>MacSharedPrefix_debug.h</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_prefixname</NAME><VALUE>PIPNSSDebug.Prefix</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_ansistrict</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_mpwcnewline</NAME><VALUE>0</VALUE></SETTING>
<SETTING><NAME>MWFrontEnd_C_wchar_type</NAME><VALUE>1</VALUE></SETTING>
@ -2288,13 +2312,6 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSSDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSRuntimeDebug.shlb</PATH>
@ -2323,13 +2340,6 @@
<FILEKIND>Library</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>DBMDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>InterfacesStubs</PATH>
@ -2456,6 +2466,34 @@
<FILEKIND>Text</FILEKIND>
<FILEFLAGS></FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>crmfDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>SMIME3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
<FILE>
<PATHTYPE>Name</PATHTYPE>
<PATH>SSL3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
<FILEKIND>Library</FILEKIND>
<FILEFLAGS>Debug</FILEFLAGS>
</FILE>
</FILELIST>
<LINKORDER>
<FILEREF>
@ -2483,11 +2521,6 @@
<PATH>nsTLSSocketProvider.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSSDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSRuntimeDebug.shlb</PATH>
@ -2508,11 +2541,6 @@
<PATH>NSComponentStartup.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>DBMDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>InterfacesStubs</PATH>
@ -2603,6 +2631,26 @@
<PATH>nsCMSSecureMessage.cpp</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>crmfDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>SMIME3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<PATHTYPE>Name</PATHTYPE>
<PATH>SSL3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</LINKORDER>
</TARGET>
</TARGETLIST>
@ -2615,44 +2663,32 @@
<GROUPLIST>
<GROUP><NAME>Static Libraries</NAME>
<GROUP><NAME>Optimized</NAME>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>DBM.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>UnicharUtilsStatic.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>crmf.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
<GROUP><NAME>Debug</NAME>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSSDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>DBMDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>UnicharUtilsStaticDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>crmfDebug.o</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
@ -2699,6 +2735,24 @@
<PATH>JavaScriptDebug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>SMIME3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSSDebug.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>SSL3Debug.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
<GROUP><NAME>Optmized</NAME>
<FILEREF>
@ -2731,6 +2785,24 @@
<PATH>JavaScript.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>NSS3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>SMIME3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
<FILEREF>
<TARGETNAME>PIPNSS.shlb</TARGETNAME>
<PATHTYPE>Name</PATHTYPE>
<PATH>SSL3.shlb</PATH>
<PATHFORMAT>MacOS</PATHFORMAT>
</FILEREF>
</GROUP>
</GROUP>
<GROUP><NAME>src</NAME>

40
security/manager/ssl/macbuild/PIPNSSCommon.h Normal file
View File

@ -0,0 +1,40 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Javier Delgadillo <javi@netscape.com>
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#define NSS_3_4

41
security/manager/ssl/macbuild/PIPNSSDebug.Prefix Normal file
View File

@ -0,0 +1,41 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* The contents of this file are subject to the Netscape 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/NPL/
*
* 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 mozilla.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Javier Delgadillo <javi@netscape.com>
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
#include "MacSharedPrefix_debug.h"
#include "PIPNSSCommon.h"

14
security/manager/ssl/src/Makefile.in
View File

@ -96,16 +96,26 @@ REQUIRES = nspr \
pipboot \
$(NULL)
NSS_3_4=1
ifdef NSS_3_4
DEFINES += -DNSS_3_4
ifeq ($(OS_ARCH),OS2)
# Link with import libs on OS/2
NSS3_LIB = nss3.$(LIB_SUFFIX)
SMIME3_LIB = smime3.$(LIB_SUFFIX)
SSL3_LIB = ssl3.$(LIB_SUFFIX)
SOFTOKEN3_LIB = softokn3.$(LIB_SUFFIX)
else
NSS3_LIB = $(LIB_PREFIX)nss3$(DLL_SUFFIX)
SMIME3_LIB = $(LIB_PREFIX)smime3$(DLL_SUFFIX)
SSL3_LIB = $(LIB_PREFIX)ssl3$(DLL_SUFFIX)
SOFTOKEN3_LIB = $(LIB_PREFIX)softokn3$(DLL_SUFFIX)
endif
EXTRA_LIBS = \
$(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(NSS_LIB_PREFIX)crmf.$(LIB_SUFFIX) \
$(DIST)/lib/$(SMIME3_LIB) \
$(DIST)/lib/$(SSL3_LIB) \
$(DIST)/lib/$(NSS3_LIB) \
@ -117,9 +127,11 @@ endif
EXTRA_DEPS = $(EXTRA_LIBS)
ifndef NSS_3_4
ifeq ($(OS_ARCH),WINNT)
DEFINES += -DNSS_USE_STATIC_LIBS
endif
endif
include $(topsrcdir)/config/rules.mk

4
security/manager/ssl/src/makefile.win
View File

@ -73,7 +73,11 @@ REQUIRES = \
include <$(DEPTH)/config/config.mak>
NSS_3_4=1
!if !defined(NSS_3_4)
CFLAGS = $(CFLAGS) -DNSS_USE_STATIC_LIBS
!endif
LINCS = $(LINCS) \
-I$(XPDIST)/public/security \

28
security/manager/ssl/src/nsNSSComponent.cpp
View File

@ -92,29 +92,6 @@ static NS_DEFINE_CID(kDateTimeFormatCID, NS_DATETIMEFORMAT_CID);
static NS_DEFINE_CID(kNSSComponentCID, NS_NSSCOMPONENT_CID);
int nsNSSComponent::mInstanceCount = 0;
#ifdef XP_MAC
OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath)
{
PRIntn len;
char *cursor;
len = PL_strlen(macPath);
cursor = (char*)PR_Malloc(len+2);
if (!cursor)
return memFullErr;
memcpy(cursor+1, macPath, len+1);
*unixPath = cursor;
*cursor = '/';
while ((cursor = PL_strchr(cursor, ':')) != NULL) {
*cursor = '/';
cursor++;
}
return noErr;
}
#endif
// XXX tmp callback for slot password
#ifdef NSS_3_4
extern char * PR_CALLBACK
@ -401,10 +378,7 @@ nsNSSComponent::InstallLoadableRoots()
char *unixModulePath=nsnull;
mozFile->Append("Essential Files");
mozFile->Append(LOADABLE_CERTS_MODULE);
mozFile->GetPath(&fullModuleName);
ConvertMacPathToUnixPath(fullModuleName, &unixModulePath);
nsMemory::Free(fullModuleName);
fullModuleName = unixModulePath;
mozFile->GetPath(&fullModuleName);
#else
char *processDir = nsnull;
mozFile->GetPath(&processDir);

25
security/manager/ssl/src/nsPKCS12Blob.cpp
View File

@ -31,7 +31,7 @@
* may use your version of this file under either the MPL or the
* GPL.
*
* $Id: nsPKCS12Blob.cpp,v 1.22 2002/01/16 04:30:55 kaie%netscape.com Exp $
* $Id: nsPKCS12Blob.cpp,v 1.23 2002/02/06 13:31:04 kaie%netscape.com Exp $
*/
#include "prmem.h"
@ -495,6 +495,29 @@ nsPKCS12Blob::inputToDecoder(SEC_PKCS12DecoderContext *dcx, nsILocalFile *file)
return NS_OK;
}
#ifdef XP_MAC
OSErr ConvertMacPathToUnixPath(const char *macPath, char **unixPath)
{
PRIntn len;
char *cursor;
len = PL_strlen(macPath);
cursor = (char*)PR_Malloc(len+2);
if (!cursor)
return memFullErr;
memcpy(cursor+1, macPath, len+1);
*unixPath = cursor;
*cursor = '/';
while ((cursor = PL_strchr(cursor, ':')) != NULL) {
*cursor = '/';
cursor++;
}
return noErr;
}
#endif
//
// C callback methods
//

4
xpinstall/packager/packages-static-unix
View File

@ -256,6 +256,10 @@ bin/libnssckbi.so
bin/components/pipboot.xpt
bin/components/pipnss.xpt
bin/components/pippki.xpt
bin/libnss3.so
bin/libsmime3.so
bin/libsoftokn3.so
bin/libssl3.so
bin/chrome/pipnss.jar
bin/chrome/pippki.jar
; These are required for solaris 32-bit builds

4
xpinstall/packager/packages-static-win
View File

@ -266,6 +266,10 @@ bin\components\pipboot.xpt
bin\components\pipnss.xpt
;bin\components\pippki.dll
bin\components\pippki.xpt
bin\nss3.dll
bin\smime3.dll
bin\softokn3.dll
bin\ssl3.dll
bin\chrome\pipnss.jar
bin\chrome\pippki.jar

4
xpinstall/packager/packages-unix
View File

@ -370,6 +370,10 @@ bin/components/libpipnss.so
bin/components/pipnss.xpt
bin/components/libpippki.so
bin/components/pippki.xpt
bin/libnss3.so
bin/libsmime3.so
bin/libsoftokn3.so
bin/libssl3.so
bin/chrome/pipnss.jar
bin/chrome/pippki.jar
; These are required for solaris 32-bit builds

4
xpinstall/packager/packages-win
View File

@ -383,6 +383,10 @@ bin\components\pipnss.dll
bin\components\pipnss.xpt
bin\components\pippki.dll
bin\components\pippki.xpt
bin\nss3.dll
bin\smime3.dll
bin\softokn3.dll
bin\ssl3.dll
bin\chrome\pipnss.jar
bin\chrome\pippki.jar