Port bug 1479787 - Use NSS mozpkix instead of pkix (analysis by Rob Lemley). rs=bustage-fix
authorJorg K <jorgk@jorgk.com>
Wed, 03 Oct 2018 01:50:56 +0200
changeset 33290 b9846bdfa088b43e94d7a801d87622248c79e78d
parent 33289 686249883a13de5ea4f23965cf2895c7fa006563
child 33291 dd917dc324b68599974ff6db50d115b67d118bbe
push id387
push userclokep@gmail.com
push dateMon, 10 Dec 2018 21:30:47 +0000
reviewersbustage-fix
bugs1479787
Port bug 1479787 - Use NSS mozpkix instead of pkix (analysis by Rob Lemley). rs=bustage-fix
mailnews/extensions/smime/src/moz.build
mailnews/extensions/smime/src/nsCertPicker.cpp
mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
mailnews/mime/src/moz.build
mailnews/mime/src/nsCMS.cpp
--- a/mailnews/extensions/smime/src/moz.build
+++ b/mailnews/extensions/smime/src/moz.build
@@ -14,11 +14,10 @@ EXTRA_COMPONENTS += [
     'smime-service.js',
     'smime-service.manifest',
 ]
 
 FINAL_LIBRARY = 'mail'
 
 LOCAL_INCLUDES += [
     '/%s/security/manager/pki' % CONFIG['mozreltopsrcdir'],
-    '/%s/security/manager/ssl' % CONFIG['mozreltopsrcdir'],
-    '/%s/security/pkix/include' % CONFIG['mozreltopsrcdir']
+    '/%s/security/manager/ssl' % CONFIG['mozreltopsrcdir']
 ]
--- a/mailnews/extensions/smime/src/nsCertPicker.cpp
+++ b/mailnews/extensions/smime/src/nsCertPicker.cpp
@@ -18,17 +18,17 @@
 #include "nsMsgComposeSecure.h"
 #include "nsNSSCertificate.h"
 #include "nsNSSComponent.h"
 #include "nsNSSDialogHelper.h"
 #include "nsNSSHelper.h"
 #include "nsNSSCertHelper.h"
 #include "nsReadableUtils.h"
 #include "nsString.h"
-#include "pkix/pkixtypes.h"
+#include "mozpkix/pkixtypes.h"
 
 using namespace mozilla;
 
 MOZ_TYPE_SPECIFIC_UNIQUE_PTR_TEMPLATE(UniqueCERTCertNicknames,
                                       CERTCertNicknames,
                                       CERT_FreeNicknames)
 
 CERTCertNicknames*
--- a/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
+++ b/mailnews/extensions/smime/src/nsMsgComposeSecure.cpp
@@ -21,17 +21,17 @@
 #include "nsIMsgIdentity.h"
 #include "nsIX509CertDB.h"
 #include "nsMemory.h"
 #include "nsMimeTypes.h"
 #include "nsMsgMimeCID.h"
 #include "nsNSSComponent.h"
 #include "nsServiceManagerUtils.h"
 #include "nspr.h"
-#include "pkix/Result.h"
+#include "mozpkix/Result.h"
 #include "nsNSSCertificate.h"
 
 using namespace mozilla::mailnews;
 using namespace mozilla;
 using namespace mozilla::psm;
 
 #define MK_MIME_ERROR_WRITING_FILE -1
 
--- a/mailnews/mime/src/moz.build
+++ b/mailnews/mime/src/moz.build
@@ -70,18 +70,17 @@ SOURCES += [
     'nsStreamConverter.cpp',
 ]
 
 LOCAL_INCLUDES += [
     '/%s/extensions/universalchardet/src/base' % CONFIG['mozreltopsrcdir'],
     '/%s/extensions/universalchardet/src/xpcom' % CONFIG['mozreltopsrcdir'],
     '/%s/intl/chardet' % CONFIG['mozreltopsrcdir'],
     '/%s/security/certverifier' % CONFIG['mozreltopsrcdir'],
-    '/%s/security/manager/ssl' % CONFIG['mozreltopsrcdir'],
-    '/%s/security/pkix/include' % CONFIG['mozreltopsrcdir'],
+    '/%s/security/manager/ssl' % CONFIG['mozreltopsrcdir']
 ]
 
 EXTRA_COMPONENTS += [
     'mimeJSComponents.js',
     'msgMime.manifest',
 ]
 
 EXTRA_JS_MODULES += [
--- a/mailnews/mime/src/nsCMS.cpp
+++ b/mailnews/mime/src/nsCMS.cpp
@@ -16,18 +16,18 @@
 #include "nsIArray.h"
 #include "nsICryptoHash.h"
 #include "nsISupports.h"
 #include "nsIX509CertDB.h"
 #include "nsNSSCertificate.h"
 #include "nsNSSComponent.h"
 #include "nsNSSHelper.h"
 #include "nsServiceManagerUtils.h"
-#include "pkix/Result.h"
-#include "pkix/pkixtypes.h"
+#include "mozpkix/Result.h"
+#include "mozpkix/pkixtypes.h"
 #include "smime.h"
 
 using namespace mozilla;
 using namespace mozilla::psm;
 using namespace mozilla::pkix;
 
 extern mozilla::LazyLogModule gPIPNSSLog;