5 References: |
5 References: |
6 |
6 |
7 diff --git a/old-configure.in b/old-configure.in |
7 diff --git a/old-configure.in b/old-configure.in |
8 --- a/old-configure.in |
8 --- a/old-configure.in |
9 +++ b/old-configure.in |
9 +++ b/old-configure.in |
10 @@ -8187,16 +8187,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
10 @@ -6495,16 +6495,31 @@ if test "$MOZ_ENABLE_SKIA"; then |
11 AC_DEFINE(USE_SKIA_GPU) |
11 AC_DEFINE(USE_SKIA_GPU) |
12 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
12 AC_SUBST(MOZ_ENABLE_SKIA_GPU) |
13 fi |
13 fi |
14 fi |
14 fi |
15 AC_SUBST(MOZ_ENABLE_SKIA) |
15 AC_SUBST(MOZ_ENABLE_SKIA) |
40 AC_DEFINE(MOZ_XUL) |
40 AC_DEFINE(MOZ_XUL) |
41 else |
41 else |
42 diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build |
42 diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build |
43 --- a/security/manager/ssl/moz.build |
43 --- a/security/manager/ssl/moz.build |
44 +++ b/security/manager/ssl/moz.build |
44 +++ b/security/manager/ssl/moz.build |
45 @@ -160,16 +160,19 @@ UNIFIED_SOURCES += [ |
45 @@ -159,16 +159,19 @@ if CONFIG['MOZ_XUL']: |
|
46 ] |
|
47 |
|
48 UNIFIED_SOURCES += [ |
|
49 'md4.c', |
|
50 ] |
|
51 |
46 FINAL_LIBRARY = 'xul' |
52 FINAL_LIBRARY = 'xul' |
47 |
|
48 LOCAL_INCLUDES += [ |
|
49 '/dom/base', |
|
50 '/security/certverifier', |
|
51 '/security/pkix/include', |
|
52 ] |
|
53 |
53 |
54 +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) |
54 +CXXFLAGS += sorted(CONFIG['NSSHELPER_CFLAGS']) |
55 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
55 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
56 + |
56 + |
57 LOCAL_INCLUDES += [ |
57 LOCAL_INCLUDES += [ |
58 '!/dist/public/nss', |
58 '/dom/base', |
|
59 '/dom/crypto', |
|
60 '/security/certverifier', |
|
61 '/security/pkix/include', |
59 ] |
62 ] |
60 |
63 |
61 if CONFIG['NSS_DISABLE_DBM']: |
64 LOCAL_INCLUDES += [ |
62 DEFINES['NSS_DISABLE_DBM'] = '1' |
|
63 |
|
64 DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' |
|
65 diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp |
65 diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/nsNSSComponent.cpp |
66 --- a/security/manager/ssl/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/nsNSSComponent.cpp |
67 +++ b/security/manager/ssl/nsNSSComponent.cpp |
68 @@ -1,14 +1,21 @@ |
68 @@ -1,14 +1,21 @@ |
69 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
69 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
81 + |
81 + |
82 #include "nsNSSComponent.h" |
82 #include "nsNSSComponent.h" |
83 |
83 |
84 #include "ExtendedValidation.h" |
84 #include "ExtendedValidation.h" |
85 #include "NSSCertDBTrustDomain.h" |
85 #include "NSSCertDBTrustDomain.h" |
|
86 #include "ScopedNSSTypes.h" |
86 #include "SharedSSLState.h" |
87 #include "SharedSSLState.h" |
87 #include "mozilla/Preferences.h" |
88 #include "cert.h" |
88 #include "mozilla/PublicSSL.h" |
89 #include "certdb.h" |
89 #include "mozilla/Services.h" |
90 @@ -1491,17 +1498,31 @@ nsNSSComponent::InitializeNSS() |
90 @@ -1017,17 +1024,31 @@ nsNSSComponent::InitializeNSS() |
|
91 return rv; |
91 return rv; |
92 } |
92 } |
93 } |
93 } |
94 MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("inSafeMode: %u\n", inSafeMode)); |
94 MOZ_LOG(gPIPNSSLog, LogLevel::Debug, ("inSafeMode: %u\n", inSafeMode)); |
95 |
95 |
131 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
131 OS_LIBS += CONFIG['MOZ_WEBRTC_X11_LIBS'] |
132 OS_LIBS += CONFIG['MOZ_SERVO_LIBS'] |
132 OS_LIBS += CONFIG['MOZ_SERVO_LIBS'] |
133 |
133 |
134 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
134 +OS_LIBS += sorted(CONFIG['NSSHELPER_LIBS']) |
135 + |
135 + |
136 if CONFIG['MOZ_NATIVE_JPEG']: |
136 if CONFIG['MOZ_SYSTEM_JPEG']: |
137 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |
137 OS_LIBS += CONFIG['MOZ_JPEG_LIBS'] |
138 |
138 |
139 if CONFIG['MOZ_NATIVE_PNG']: |
139 if CONFIG['MOZ_SYSTEM_PNG']: |
140 OS_LIBS += CONFIG['MOZ_PNG_LIBS'] |
140 OS_LIBS += CONFIG['MOZ_PNG_LIBS'] |
141 |
141 |
142 if CONFIG['MOZ_NATIVE_HUNSPELL']: |
142 if CONFIG['MOZ_SYSTEM_HUNSPELL']: |
143 OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] |
143 OS_LIBS += CONFIG['MOZ_HUNSPELL_LIBS'] |