|
3062
|
1 |
--- a/security/nss/lib/crmf/cmmfchal.c Thu May 21 15:04:02 2009
|
|
|
2 |
+++ b/security/nss/lib/crmf/cmmfchal.c Wed May 20 17:58:31 2009
|
|
|
3 |
@@ -38,7 +38,7 @@
|
|
|
4 |
#include "cmmf.h"
|
|
|
5 |
#include "cmmfi.h"
|
|
|
6 |
#include "sechash.h"
|
|
|
7 |
-#include "genname.h"
|
|
|
8 |
+#include "../certdb/genname.h"
|
|
|
9 |
#include "pk11func.h"
|
|
|
10 |
#include "cert.h"
|
|
|
11 |
#include "secitem.h"
|
|
|
12 |
--- a/security/manager/Makefile.in Thu May 21 15:02:44 2009
|
|
|
13 |
+++ b/security/manager/Makefile.in Thu May 21 15:02:07 2009
|
|
|
14 |
@@ -82,7 +82,12 @@
|
|
|
15 |
$(DIST)/lib/$(LIB_PREFIX)softokn.$(LIB_SUFFIX) \
|
|
|
16 |
$(NULL)
|
|
|
17 |
endif
|
|
|
18 |
+else
|
|
|
19 |
+ifeq ($(OS_ARCH), SunOS)
|
|
|
20 |
+SDK_LIBS = \
|
|
|
21 |
+ $(DIST)/lib/$(LIB_PREFIX)crmf.$(LIB_SUFFIX)
|
|
|
22 |
endif
|
|
|
23 |
+endif
|
|
|
24 |
|
|
|
25 |
# Default
|
|
|
26 |
HAVE_FREEBL_LIBS = 1
|
|
|
27 |
@@ -251,7 +256,13 @@
|
|
|
28 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
29 |
endif
|
|
|
30 |
touch $@
|
|
|
31 |
+else
|
|
|
32 |
+ifeq ($(OS_ARCH), SunOS)
|
|
|
33 |
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
34 |
+ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
35 |
+ touch $@
|
|
|
36 |
endif
|
|
|
37 |
+endif
|
|
|
38 |
|
|
|
39 |
GARBAGE += .nss.cleaned
|
|
|
40 |
|
|
|
41 |
@@ -328,7 +339,13 @@
|
|
|
42 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64INT_LIB) $(DIST)/bin
|
|
|
43 |
$(INSTALL) -m 755 $(DIST)/lib/$(FREEBL_64FPU_LIB) $(DIST)/bin
|
|
|
44 |
endif
|
|
|
45 |
+else
|
|
|
46 |
+ifeq ($(OS_ARCH), SunOS)
|
|
|
47 |
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS)
|
|
|
48 |
+ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS)
|
|
|
49 |
+ $(INSTALL) -m 755 $(SDK_LIBS) $(DIST)/sdk/lib
|
|
|
50 |
endif
|
|
|
51 |
+endif
|
|
|
52 |
ifndef MOZ_NATIVE_NSS
|
|
|
53 |
# NSS installs headers to dist/public and we want them in dist/include
|
|
|
54 |
$(NSINSTALL) -D $(DIST)/include/nss
|
|
|
55 |
@@ -409,7 +426,12 @@
|
|
|
56 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/lib $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
57 |
$(MAKE) -C $(topsrcdir)/security/nss/cmd/shlibsign $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
58 |
endif
|
|
|
59 |
+else
|
|
|
60 |
+ifeq ($(OS_ARCH), SunOS)
|
|
|
61 |
+ $(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
62 |
+ $(MAKE) -C $(topsrcdir)/security/nss/lib/crmf $(DEFAULT_GMAKE_FLAGS) clean
|
|
|
63 |
endif
|
|
|
64 |
+endif
|
|
|
65 |
|
|
|
66 |
echo-requires-recursive::
|
|
|
67 |
$(MAKE) -C boot $@
|
|
|
68 |
--- a/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:39:37 2009
|
|
|
69 |
+++ b/security/manager/ssl/src/nsNSSComponent.cpp Thu May 21 18:52:06 2009
|
|
|
70 |
@@ -812,6 +812,7 @@
|
|
|
71 |
const char *possible_ckbi_locations[] = {
|
|
|
72 |
NS_XPCOM_CURRENT_PROCESS_DIR,
|
|
|
73 |
NS_GRE_DIR,
|
|
|
74 |
+ (const char *)-1, // This special value means: /usr/lib/mps
|
|
|
75 |
0 // This special value means:
|
|
|
76 |
// search for ckbi in the directories on the shared
|
|
|
77 |
// library/DLL search path
|
|
|
78 |
@@ -821,8 +822,12 @@
|
|
|
79 |
nsCOMPtr<nsILocalFile> mozFile;
|
|
|
80 |
char *fullLibraryPath = nsnull;
|
|
|
81 |
|
|
|
82 |
- if (!possible_ckbi_locations[il])
|
|
|
83 |
+ if (possible_ckbi_locations[il] == (const char *)-1)
|
|
|
84 |
{
|
|
|
85 |
+ fullLibraryPath = PR_GetLibraryName("/usr/lib/mps", "nssckbi");
|
|
|
86 |
+ }
|
|
|
87 |
+ else if (!possible_ckbi_locations[il])
|
|
|
88 |
+ {
|
|
|
89 |
fullLibraryPath = PR_GetLibraryName(nsnull, "nssckbi");
|
|
|
90 |
}
|
|
|
91 |
else
|