5 References: |
5 References: |
6 |
6 |
7 diff --git a/configure.in b/configure.in |
7 diff --git a/configure.in b/configure.in |
8 --- a/configure.in |
8 --- a/configure.in |
9 +++ b/configure.in |
9 +++ b/configure.in |
10 @@ -8303,16 +8303,31 @@ AC_SUBST(QCMS_LIBS) |
10 @@ -8309,16 +8309,31 @@ AC_SUBST(QCMS_LIBS) |
11 |
11 |
12 dnl ======================================================== |
12 dnl ======================================================== |
13 dnl HarfBuzz |
13 dnl HarfBuzz |
14 dnl ======================================================== |
14 dnl ======================================================== |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
15 MOZ_HARFBUZZ_LIBS='$(DEPTH)/gfx/harfbuzz/src/$(LIB_PREFIX)mozharfbuzz.$(LIB_SUFFIX)' |
40 dnl OTS |
40 dnl OTS |
41 dnl ======================================================== |
41 dnl ======================================================== |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
42 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
43 --- a/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
44 +++ b/security/manager/ssl/src/Makefile.in |
45 @@ -93,16 +93,19 @@ DEFINES += \ |
45 @@ -87,10 +87,13 @@ endif |
|
46 CSRCS += md4.c |
46 |
47 |
47 EXPORTS += \ |
48 DEFINES += \ |
48 CryptoTask.h \ |
49 -DNSS_ENABLE_ECC \ |
49 nsNSSShutDown.h \ |
50 -DDLL_PREFIX=\"$(DLL_PREFIX)\" \ |
50 ScopedNSSTypes.h \ |
51 -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \ |
51 nsRandomGenerator.h \ |
|
52 $(NULL) |
52 $(NULL) |
53 |
53 |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
54 +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) |
55 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
55 +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) |
56 + |
56 + |
57 EXPORTS_NAMESPACES = mozilla |
|
58 |
|
59 EXPORTS_mozilla += \ |
|
60 PublicSSL.h \ |
|
61 $(NULL) |
|
62 |
|
63 include $(topsrcdir)/config/rules.mk |
57 include $(topsrcdir)/config/rules.mk |
64 |
58 |
65 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
59 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
60 --- a/security/manager/ssl/src/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
61 +++ b/security/manager/ssl/src/nsNSSComponent.cpp |
80 +#pragma GCC visibility pop |
74 +#pragma GCC visibility pop |
81 +#include "prenv.h" |
75 +#include "prenv.h" |
82 +#endif |
76 +#endif |
83 + |
77 + |
84 #include "nsNSSComponent.h" |
78 #include "nsNSSComponent.h" |
|
79 |
|
80 #include "CertVerifier.h" |
85 #include "nsNSSCallbacks.h" |
81 #include "nsNSSCallbacks.h" |
86 #include "nsNSSIOLayer.h" |
82 #include "nsNSSIOLayer.h" |
87 #include "nsCertVerificationThread.h" |
83 #include "nsCertVerificationThread.h" |
88 |
84 |
89 #include "nsNetUtil.h" |
85 #include "nsNetUtil.h" |
90 #include "nsAppDirectoryServiceDefs.h" |
86 @@ -1721,18 +1728,34 @@ nsNSSComponent::InitializeNSS(bool showW |
91 #include "nsDirectoryService.h" |
|
92 @@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW |
|
93 ConfigureInternalPKCS11Token(); |
87 ConfigureInternalPKCS11Token(); |
94 |
88 |
95 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
89 // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs |
96 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
90 // module by NSS_Initialize because we will load it in InstallLoadableRoots |
97 // later. It also allows us to work around a bug in the system NSS in |
91 // later. It also allows us to work around a bug in the system NSS in |
127 } |
121 } |
128 else { |
122 else { |
129 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
123 diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in |
130 --- a/toolkit/library/Makefile.in |
124 --- a/toolkit/library/Makefile.in |
131 +++ b/toolkit/library/Makefile.in |
125 +++ b/toolkit/library/Makefile.in |
132 @@ -501,17 +501,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
126 @@ -510,17 +510,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO |
133 endif |
127 endif |
134 endif |
128 endif |
135 endif |
129 endif |
136 |
130 |
137 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |
131 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS) |