From 8ff6132e53c9cfee6d8cdfe5f089755ab7e14aa1 Mon Sep 17 00:00:00 2001 From: Birunthan Mohanathas Date: Tue, 26 May 2015 10:31:23 -0700 Subject: [PATCH] Bug 1164714 - Flatten security/manager/ssl/src/ directory. r=keeler --- dom/crypto/moz.build | 2 +- security/apps/moz.build | 6 +- security/certverifier/moz.build | 6 +- security/manager/ssl/{src => }/CryptoTask.cpp | 0 security/manager/ssl/{src => }/CryptoTask.h | 0 security/manager/ssl/{src => }/CryptoUtil.h | 0 .../ssl/{src => }/IntolerantFallbackList.inc | 0 .../ssl/{src => }/NSSErrorsService.cpp | 0 .../manager/ssl/{src => }/NSSErrorsService.h | 0 .../ssl/{src => }/PPSMContentDownloader.ipdl | 0 .../ssl/{src => }/PSMContentListener.cpp | 0 .../ssl/{src => }/PSMContentListener.h | 0 .../manager/ssl/{src => }/PSMRunnable.cpp | 0 security/manager/ssl/{src => }/PSMRunnable.h | 0 security/manager/ssl/{src => }/PublicSSL.h | 0 .../{src => }/SSLServerCertVerification.cpp | 0 .../ssl/{src => }/SSLServerCertVerification.h | 0 .../manager/ssl/{src => }/ScopedNSSTypes.h | 0 .../ssl/{src => }/SharedCertVerifier.h | 0 .../manager/ssl/{src => }/SharedSSLState.cpp | 0 .../manager/ssl/{src => }/SharedSSLState.h | 0 .../ssl/{src => }/TransportSecurityInfo.cpp | 0 .../ssl/{src => }/TransportSecurityInfo.h | 0 security/manager/ssl/{src => }/md4.c | 0 security/manager/ssl/{src => }/md4.h | 0 security/manager/ssl/moz.build | 122 ++++++++++++++++- .../ssl/{src => }/nsCertOverrideService.cpp | 0 .../ssl/{src => }/nsCertOverrideService.h | 0 .../manager/ssl/{src => }/nsCertPicker.cpp | 0 security/manager/ssl/{src => }/nsCertPicker.h | 0 security/manager/ssl/{src => }/nsCertTree.cpp | 0 security/manager/ssl/{src => }/nsCertTree.h | 0 .../{src => }/nsCertVerificationThread.cpp | 0 .../ssl/{src => }/nsCertVerificationThread.h | 0 .../ssl/{src => }/nsClientAuthRemember.cpp | 0 .../ssl/{src => }/nsClientAuthRemember.h | 0 security/manager/ssl/{src => }/nsCrypto.cpp | 0 security/manager/ssl/{src => }/nsCrypto.h | 0 .../manager/ssl/{src => }/nsCryptoHash.cpp | 0 security/manager/ssl/{src => }/nsCryptoHash.h | 0 .../ssl/{src => }/nsDataSignatureVerifier.cpp | 0 .../ssl/{src => }/nsDataSignatureVerifier.h | 0 .../manager/ssl/{src => }/nsKeyModule.cpp | 0 security/manager/ssl/{src => }/nsKeyModule.h | 0 .../manager/ssl/{src => }/nsKeygenHandler.cpp | 0 .../manager/ssl/{src => }/nsKeygenHandler.h | 0 .../ssl/{src => }/nsKeygenHandlerContent.cpp | 0 .../ssl/{src => }/nsKeygenHandlerContent.h | 0 .../manager/ssl/{src => }/nsKeygenThread.cpp | 0 .../manager/ssl/{src => }/nsKeygenThread.h | 0 .../manager/ssl/{src => }/nsNSSASN1Object.cpp | 0 .../manager/ssl/{src => }/nsNSSASN1Object.h | 0 .../manager/ssl/{src => }/nsNSSCallbacks.cpp | 0 .../manager/ssl/{src => }/nsNSSCallbacks.h | 0 .../manager/ssl/{src => }/nsNSSCertHelper.cpp | 0 .../manager/ssl/{src => }/nsNSSCertHelper.h | 0 .../manager/ssl/{src => }/nsNSSCertTrust.cpp | 0 .../manager/ssl/{src => }/nsNSSCertTrust.h | 0 .../ssl/{src => }/nsNSSCertValidity.cpp | 0 .../manager/ssl/{src => }/nsNSSCertValidity.h | 0 .../ssl/{src => }/nsNSSCertificate.cpp | 0 .../manager/ssl/{src => }/nsNSSCertificate.h | 0 .../ssl/{src => }/nsNSSCertificateDB.cpp | 0 .../ssl/{src => }/nsNSSCertificateDB.h | 0 .../nsNSSCertificateFakeTransport.cpp | 0 .../{src => }/nsNSSCertificateFakeTransport.h | 0 .../manager/ssl/{src => }/nsNSSComponent.cpp | 0 .../manager/ssl/{src => }/nsNSSComponent.h | 0 .../manager/ssl/{src => }/nsNSSErrors.cpp | 0 security/manager/ssl/{src => }/nsNSSHelper.h | 0 .../manager/ssl/{src => }/nsNSSIOLayer.cpp | 0 security/manager/ssl/{src => }/nsNSSIOLayer.h | 0 .../manager/ssl/{src => }/nsNSSModule.cpp | 0 .../manager/ssl/{src => }/nsNSSShutDown.cpp | 0 .../manager/ssl/{src => }/nsNSSShutDown.h | 0 .../manager/ssl/{src => }/nsNSSVersion.cpp | 0 security/manager/ssl/{src => }/nsNSSVersion.h | 0 .../ssl/{src => }/nsNTLMAuthModule.cpp | 0 .../manager/ssl/{src => }/nsNTLMAuthModule.h | 0 .../manager/ssl/{src => }/nsPK11TokenDB.cpp | 0 .../manager/ssl/{src => }/nsPK11TokenDB.h | 0 .../manager/ssl/{src => }/nsPKCS11Slot.cpp | 0 security/manager/ssl/{src => }/nsPKCS11Slot.h | 0 .../manager/ssl/{src => }/nsPKCS12Blob.cpp | 0 security/manager/ssl/{src => }/nsPKCS12Blob.h | 0 .../ssl/{src => }/nsPSMBackgroundThread.cpp | 0 .../ssl/{src => }/nsPSMBackgroundThread.h | 0 .../ssl/{src => }/nsProtectedAuthThread.cpp | 0 .../ssl/{src => }/nsProtectedAuthThread.h | 0 .../ssl/{src => }/nsRandomGenerator.cpp | 0 .../manager/ssl/{src => }/nsRandomGenerator.h | 0 security/manager/ssl/{src => }/nsSDR.cpp | 0 security/manager/ssl/{src => }/nsSDR.h | 0 .../ssl/{src => }/nsSSLSocketProvider.cpp | 0 .../ssl/{src => }/nsSSLSocketProvider.h | 0 .../manager/ssl/{src => }/nsSSLStatus.cpp | 0 security/manager/ssl/{src => }/nsSSLStatus.h | 0 .../ssl/{src => }/nsSmartCardMonitor.cpp | 0 .../ssl/{src => }/nsSmartCardMonitor.h | 0 .../ssl/{src => }/nsTLSSocketProvider.cpp | 0 .../ssl/{src => }/nsTLSSocketProvider.h | 0 .../ssl/{src => }/nsUsageArrayHelper.cpp | 0 .../ssl/{src => }/nsUsageArrayHelper.h | 0 .../manager/ssl/{src => }/nsVerificationJob.h | 0 security/manager/ssl/src/moz.build | 125 ------------------ security/manager/ssl/tests/gtest/moz.build | 8 +- toolkit/devtools/webconsole/network-helper.js | 4 +- 107 files changed, 133 insertions(+), 140 deletions(-) rename security/manager/ssl/{src => }/CryptoTask.cpp (100%) rename security/manager/ssl/{src => }/CryptoTask.h (100%) rename security/manager/ssl/{src => }/CryptoUtil.h (100%) rename security/manager/ssl/{src => }/IntolerantFallbackList.inc (100%) rename security/manager/ssl/{src => }/NSSErrorsService.cpp (100%) rename security/manager/ssl/{src => }/NSSErrorsService.h (100%) rename security/manager/ssl/{src => }/PPSMContentDownloader.ipdl (100%) rename security/manager/ssl/{src => }/PSMContentListener.cpp (100%) rename security/manager/ssl/{src => }/PSMContentListener.h (100%) rename security/manager/ssl/{src => }/PSMRunnable.cpp (100%) rename security/manager/ssl/{src => }/PSMRunnable.h (100%) rename security/manager/ssl/{src => }/PublicSSL.h (100%) rename security/manager/ssl/{src => }/SSLServerCertVerification.cpp (100%) rename security/manager/ssl/{src => }/SSLServerCertVerification.h (100%) rename security/manager/ssl/{src => }/ScopedNSSTypes.h (100%) rename security/manager/ssl/{src => }/SharedCertVerifier.h (100%) rename security/manager/ssl/{src => }/SharedSSLState.cpp (100%) rename security/manager/ssl/{src => }/SharedSSLState.h (100%) rename security/manager/ssl/{src => }/TransportSecurityInfo.cpp (100%) rename security/manager/ssl/{src => }/TransportSecurityInfo.h (100%) rename security/manager/ssl/{src => }/md4.c (100%) rename security/manager/ssl/{src => }/md4.h (100%) rename security/manager/ssl/{src => }/nsCertOverrideService.cpp (100%) rename security/manager/ssl/{src => }/nsCertOverrideService.h (100%) rename security/manager/ssl/{src => }/nsCertPicker.cpp (100%) rename security/manager/ssl/{src => }/nsCertPicker.h (100%) rename security/manager/ssl/{src => }/nsCertTree.cpp (100%) rename security/manager/ssl/{src => }/nsCertTree.h (100%) rename security/manager/ssl/{src => }/nsCertVerificationThread.cpp (100%) rename security/manager/ssl/{src => }/nsCertVerificationThread.h (100%) rename security/manager/ssl/{src => }/nsClientAuthRemember.cpp (100%) rename security/manager/ssl/{src => }/nsClientAuthRemember.h (100%) rename security/manager/ssl/{src => }/nsCrypto.cpp (100%) rename security/manager/ssl/{src => }/nsCrypto.h (100%) rename security/manager/ssl/{src => }/nsCryptoHash.cpp (100%) rename security/manager/ssl/{src => }/nsCryptoHash.h (100%) rename security/manager/ssl/{src => }/nsDataSignatureVerifier.cpp (100%) rename security/manager/ssl/{src => }/nsDataSignatureVerifier.h (100%) rename security/manager/ssl/{src => }/nsKeyModule.cpp (100%) rename security/manager/ssl/{src => }/nsKeyModule.h (100%) rename security/manager/ssl/{src => }/nsKeygenHandler.cpp (100%) rename security/manager/ssl/{src => }/nsKeygenHandler.h (100%) rename security/manager/ssl/{src => }/nsKeygenHandlerContent.cpp (100%) rename security/manager/ssl/{src => }/nsKeygenHandlerContent.h (100%) rename security/manager/ssl/{src => }/nsKeygenThread.cpp (100%) rename security/manager/ssl/{src => }/nsKeygenThread.h (100%) rename security/manager/ssl/{src => }/nsNSSASN1Object.cpp (100%) rename security/manager/ssl/{src => }/nsNSSASN1Object.h (100%) rename security/manager/ssl/{src => }/nsNSSCallbacks.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCallbacks.h (100%) rename security/manager/ssl/{src => }/nsNSSCertHelper.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCertHelper.h (100%) rename security/manager/ssl/{src => }/nsNSSCertTrust.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCertTrust.h (100%) rename security/manager/ssl/{src => }/nsNSSCertValidity.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCertValidity.h (100%) rename security/manager/ssl/{src => }/nsNSSCertificate.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCertificate.h (100%) rename security/manager/ssl/{src => }/nsNSSCertificateDB.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCertificateDB.h (100%) rename security/manager/ssl/{src => }/nsNSSCertificateFakeTransport.cpp (100%) rename security/manager/ssl/{src => }/nsNSSCertificateFakeTransport.h (100%) rename security/manager/ssl/{src => }/nsNSSComponent.cpp (100%) rename security/manager/ssl/{src => }/nsNSSComponent.h (100%) rename security/manager/ssl/{src => }/nsNSSErrors.cpp (100%) rename security/manager/ssl/{src => }/nsNSSHelper.h (100%) rename security/manager/ssl/{src => }/nsNSSIOLayer.cpp (100%) rename security/manager/ssl/{src => }/nsNSSIOLayer.h (100%) rename security/manager/ssl/{src => }/nsNSSModule.cpp (100%) rename security/manager/ssl/{src => }/nsNSSShutDown.cpp (100%) rename security/manager/ssl/{src => }/nsNSSShutDown.h (100%) rename security/manager/ssl/{src => }/nsNSSVersion.cpp (100%) rename security/manager/ssl/{src => }/nsNSSVersion.h (100%) rename security/manager/ssl/{src => }/nsNTLMAuthModule.cpp (100%) rename security/manager/ssl/{src => }/nsNTLMAuthModule.h (100%) rename security/manager/ssl/{src => }/nsPK11TokenDB.cpp (100%) rename security/manager/ssl/{src => }/nsPK11TokenDB.h (100%) rename security/manager/ssl/{src => }/nsPKCS11Slot.cpp (100%) rename security/manager/ssl/{src => }/nsPKCS11Slot.h (100%) rename security/manager/ssl/{src => }/nsPKCS12Blob.cpp (100%) rename security/manager/ssl/{src => }/nsPKCS12Blob.h (100%) rename security/manager/ssl/{src => }/nsPSMBackgroundThread.cpp (100%) rename security/manager/ssl/{src => }/nsPSMBackgroundThread.h (100%) rename security/manager/ssl/{src => }/nsProtectedAuthThread.cpp (100%) rename security/manager/ssl/{src => }/nsProtectedAuthThread.h (100%) rename security/manager/ssl/{src => }/nsRandomGenerator.cpp (100%) rename security/manager/ssl/{src => }/nsRandomGenerator.h (100%) rename security/manager/ssl/{src => }/nsSDR.cpp (100%) rename security/manager/ssl/{src => }/nsSDR.h (100%) rename security/manager/ssl/{src => }/nsSSLSocketProvider.cpp (100%) rename security/manager/ssl/{src => }/nsSSLSocketProvider.h (100%) rename security/manager/ssl/{src => }/nsSSLStatus.cpp (100%) rename security/manager/ssl/{src => }/nsSSLStatus.h (100%) rename security/manager/ssl/{src => }/nsSmartCardMonitor.cpp (100%) rename security/manager/ssl/{src => }/nsSmartCardMonitor.h (100%) rename security/manager/ssl/{src => }/nsTLSSocketProvider.cpp (100%) rename security/manager/ssl/{src => }/nsTLSSocketProvider.h (100%) rename security/manager/ssl/{src => }/nsUsageArrayHelper.cpp (100%) rename security/manager/ssl/{src => }/nsUsageArrayHelper.h (100%) rename security/manager/ssl/{src => }/nsVerificationJob.h (100%) delete mode 100644 security/manager/ssl/src/moz.build diff --git a/dom/crypto/moz.build b/dom/crypto/moz.build index b4f1fc3180a..0299501502d 100644 --- a/dom/crypto/moz.build +++ b/dom/crypto/moz.build @@ -26,7 +26,7 @@ include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '/security/manager/ssl/src', + '/security/manager/ssl', ] MOCHITEST_MANIFESTS += ['test/mochitest.ini'] diff --git a/security/apps/moz.build b/security/apps/moz.build index 9f36e177cd0..d046492afcd 100644 --- a/security/apps/moz.build +++ b/security/apps/moz.build @@ -14,9 +14,9 @@ FAIL_ON_WARNINGS = True FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ - '../certverifier', - '../manager/ssl/src', - '../pkix/include', + '/security/certverifier', + '/security/manager/ssl', + '/security/pkix/include', ] DEFINES['NSS_ENABLE_ECC'] = 'True' diff --git a/security/certverifier/moz.build b/security/certverifier/moz.build index ef89e9d8f6d..4081359734f 100644 --- a/security/certverifier/moz.build +++ b/security/certverifier/moz.build @@ -22,9 +22,9 @@ if not CONFIG['NSS_NO_EV_CERTS']: ] LOCAL_INCLUDES += [ - '../manager/boot/src', - '../manager/ssl/src', - '../pkix/include', + '/security/manager/boot/src', + '/security/manager/ssl', + '/security/pkix/include', ] DIRS += [ diff --git a/security/manager/ssl/src/CryptoTask.cpp b/security/manager/ssl/CryptoTask.cpp similarity index 100% rename from security/manager/ssl/src/CryptoTask.cpp rename to security/manager/ssl/CryptoTask.cpp diff --git a/security/manager/ssl/src/CryptoTask.h b/security/manager/ssl/CryptoTask.h similarity index 100% rename from security/manager/ssl/src/CryptoTask.h rename to security/manager/ssl/CryptoTask.h diff --git a/security/manager/ssl/src/CryptoUtil.h b/security/manager/ssl/CryptoUtil.h similarity index 100% rename from security/manager/ssl/src/CryptoUtil.h rename to security/manager/ssl/CryptoUtil.h diff --git a/security/manager/ssl/src/IntolerantFallbackList.inc b/security/manager/ssl/IntolerantFallbackList.inc similarity index 100% rename from security/manager/ssl/src/IntolerantFallbackList.inc rename to security/manager/ssl/IntolerantFallbackList.inc diff --git a/security/manager/ssl/src/NSSErrorsService.cpp b/security/manager/ssl/NSSErrorsService.cpp similarity index 100% rename from security/manager/ssl/src/NSSErrorsService.cpp rename to security/manager/ssl/NSSErrorsService.cpp diff --git a/security/manager/ssl/src/NSSErrorsService.h b/security/manager/ssl/NSSErrorsService.h similarity index 100% rename from security/manager/ssl/src/NSSErrorsService.h rename to security/manager/ssl/NSSErrorsService.h diff --git a/security/manager/ssl/src/PPSMContentDownloader.ipdl b/security/manager/ssl/PPSMContentDownloader.ipdl similarity index 100% rename from security/manager/ssl/src/PPSMContentDownloader.ipdl rename to security/manager/ssl/PPSMContentDownloader.ipdl diff --git a/security/manager/ssl/src/PSMContentListener.cpp b/security/manager/ssl/PSMContentListener.cpp similarity index 100% rename from security/manager/ssl/src/PSMContentListener.cpp rename to security/manager/ssl/PSMContentListener.cpp diff --git a/security/manager/ssl/src/PSMContentListener.h b/security/manager/ssl/PSMContentListener.h similarity index 100% rename from security/manager/ssl/src/PSMContentListener.h rename to security/manager/ssl/PSMContentListener.h diff --git a/security/manager/ssl/src/PSMRunnable.cpp b/security/manager/ssl/PSMRunnable.cpp similarity index 100% rename from security/manager/ssl/src/PSMRunnable.cpp rename to security/manager/ssl/PSMRunnable.cpp diff --git a/security/manager/ssl/src/PSMRunnable.h b/security/manager/ssl/PSMRunnable.h similarity index 100% rename from security/manager/ssl/src/PSMRunnable.h rename to security/manager/ssl/PSMRunnable.h diff --git a/security/manager/ssl/src/PublicSSL.h b/security/manager/ssl/PublicSSL.h similarity index 100% rename from security/manager/ssl/src/PublicSSL.h rename to security/manager/ssl/PublicSSL.h diff --git a/security/manager/ssl/src/SSLServerCertVerification.cpp b/security/manager/ssl/SSLServerCertVerification.cpp similarity index 100% rename from security/manager/ssl/src/SSLServerCertVerification.cpp rename to security/manager/ssl/SSLServerCertVerification.cpp diff --git a/security/manager/ssl/src/SSLServerCertVerification.h b/security/manager/ssl/SSLServerCertVerification.h similarity index 100% rename from security/manager/ssl/src/SSLServerCertVerification.h rename to security/manager/ssl/SSLServerCertVerification.h diff --git a/security/manager/ssl/src/ScopedNSSTypes.h b/security/manager/ssl/ScopedNSSTypes.h similarity index 100% rename from security/manager/ssl/src/ScopedNSSTypes.h rename to security/manager/ssl/ScopedNSSTypes.h diff --git a/security/manager/ssl/src/SharedCertVerifier.h b/security/manager/ssl/SharedCertVerifier.h similarity index 100% rename from security/manager/ssl/src/SharedCertVerifier.h rename to security/manager/ssl/SharedCertVerifier.h diff --git a/security/manager/ssl/src/SharedSSLState.cpp b/security/manager/ssl/SharedSSLState.cpp similarity index 100% rename from security/manager/ssl/src/SharedSSLState.cpp rename to security/manager/ssl/SharedSSLState.cpp diff --git a/security/manager/ssl/src/SharedSSLState.h b/security/manager/ssl/SharedSSLState.h similarity index 100% rename from security/manager/ssl/src/SharedSSLState.h rename to security/manager/ssl/SharedSSLState.h diff --git a/security/manager/ssl/src/TransportSecurityInfo.cpp b/security/manager/ssl/TransportSecurityInfo.cpp similarity index 100% rename from security/manager/ssl/src/TransportSecurityInfo.cpp rename to security/manager/ssl/TransportSecurityInfo.cpp diff --git a/security/manager/ssl/src/TransportSecurityInfo.h b/security/manager/ssl/TransportSecurityInfo.h similarity index 100% rename from security/manager/ssl/src/TransportSecurityInfo.h rename to security/manager/ssl/TransportSecurityInfo.h diff --git a/security/manager/ssl/src/md4.c b/security/manager/ssl/md4.c similarity index 100% rename from security/manager/ssl/src/md4.c rename to security/manager/ssl/md4.c diff --git a/security/manager/ssl/src/md4.h b/security/manager/ssl/md4.h similarity index 100% rename from security/manager/ssl/src/md4.h rename to security/manager/ssl/md4.h diff --git a/security/manager/ssl/moz.build b/security/manager/ssl/moz.build index 2f7d6b22915..821d40f9328 100644 --- a/security/manager/ssl/moz.build +++ b/security/manager/ssl/moz.build @@ -4,8 +4,6 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -DIRS += ['src'] - TEST_DIRS += [ 'tests' ] XPIDL_SOURCES += [ @@ -46,3 +44,123 @@ if CONFIG['MOZ_XUL']: ] XPIDL_MODULE = 'pipnss' + +EXPORTS += [ + 'CryptoTask.h', + 'nsClientAuthRemember.h', + 'nsCrypto.h', + 'nsNSSCallbacks.h', + 'nsNSSCertificate.h', + 'nsNSSComponent.h', + 'nsNSSHelper.h', + 'nsNSSShutDown.h', + 'nsRandomGenerator.h', + 'NSSErrorsService.h', + 'ScopedNSSTypes.h', + 'SharedCertVerifier.h', +] + +EXPORTS.mozilla += [ + 'PublicSSL.h', +] + +EXPORTS.mozilla.psm += [ + 'PSMContentListener.h', +] + +UNIFIED_SOURCES += [ + 'CryptoTask.cpp', + 'nsCertOverrideService.cpp', + 'nsCertPicker.cpp', + 'nsCertVerificationThread.cpp', + 'nsClientAuthRemember.cpp', + 'nsCrypto.cpp', + 'nsCryptoHash.cpp', + 'nsDataSignatureVerifier.cpp', + 'nsKeygenHandler.cpp', + 'nsKeygenHandlerContent.cpp', + 'nsKeygenThread.cpp', + 'nsKeyModule.cpp', + 'nsNSSASN1Object.cpp', + 'nsNSSCallbacks.cpp', + 'nsNSSCertHelper.cpp', + 'nsNSSCertificate.cpp', + 'nsNSSCertificateFakeTransport.cpp', + 'nsNSSCertTrust.cpp', + 'nsNSSCertValidity.cpp', + 'nsNSSComponent.cpp', + 'nsNSSErrors.cpp', + 'nsNSSIOLayer.cpp', + 'nsNSSModule.cpp', + 'nsNSSShutDown.cpp', + 'nsNSSVersion.cpp', + 'nsNTLMAuthModule.cpp', + 'nsPK11TokenDB.cpp', + 'nsPKCS11Slot.cpp', + 'nsPKCS12Blob.cpp', + 'nsProtectedAuthThread.cpp', + 'nsPSMBackgroundThread.cpp', + 'nsRandomGenerator.cpp', + 'nsSDR.cpp', + 'NSSErrorsService.cpp', + 'nsSSLSocketProvider.cpp', + 'nsSSLStatus.cpp', + 'nsTLSSocketProvider.cpp', + 'nsUsageArrayHelper.cpp', + 'PSMContentListener.cpp', + 'PSMRunnable.cpp', + 'SharedSSLState.cpp', + 'SSLServerCertVerification.cpp', + 'TransportSecurityInfo.cpp', +] + +# nsNSSCertificateDB.cpp needs to include nscert.h before everything else. +SOURCES += [ + 'nsNSSCertificateDB.cpp', +] + +IPDL_SOURCES += [ + 'PPSMContentDownloader.ipdl', +] + +LOCAL_INCLUDES += [ + '/security/manager/boot/src', +] + +if not CONFIG['MOZ_NO_SMART_CARDS']: + UNIFIED_SOURCES += [ + 'nsSmartCardMonitor.cpp', + ] + +if CONFIG['MOZ_XUL']: + UNIFIED_SOURCES += [ + 'nsCertTree.cpp', + ] + +UNIFIED_SOURCES += [ + 'md4.c', +] + +FAIL_ON_WARNINGS = True + +FINAL_LIBRARY = 'xul' + +LOCAL_INCLUDES += [ + '/dom/base', + '/security/certverifier', + '/security/pkix/include', +] + +if CONFIG['NSS_DISABLE_DBM']: + DEFINES['NSS_DISABLE_DBM'] = '1' + +DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' +DEFINES['NSS_ENABLE_ECC'] = 'True' +for var in ('DLL_PREFIX', 'DLL_SUFFIX'): + DEFINES[var] = '"%s"' % CONFIG[var] + +USE_LIBS += [ + 'crmf', +] + +include('/ipc/chromium/chromium-config.mozbuild') diff --git a/security/manager/ssl/src/nsCertOverrideService.cpp b/security/manager/ssl/nsCertOverrideService.cpp similarity index 100% rename from security/manager/ssl/src/nsCertOverrideService.cpp rename to security/manager/ssl/nsCertOverrideService.cpp diff --git a/security/manager/ssl/src/nsCertOverrideService.h b/security/manager/ssl/nsCertOverrideService.h similarity index 100% rename from security/manager/ssl/src/nsCertOverrideService.h rename to security/manager/ssl/nsCertOverrideService.h diff --git a/security/manager/ssl/src/nsCertPicker.cpp b/security/manager/ssl/nsCertPicker.cpp similarity index 100% rename from security/manager/ssl/src/nsCertPicker.cpp rename to security/manager/ssl/nsCertPicker.cpp diff --git a/security/manager/ssl/src/nsCertPicker.h b/security/manager/ssl/nsCertPicker.h similarity index 100% rename from security/manager/ssl/src/nsCertPicker.h rename to security/manager/ssl/nsCertPicker.h diff --git a/security/manager/ssl/src/nsCertTree.cpp b/security/manager/ssl/nsCertTree.cpp similarity index 100% rename from security/manager/ssl/src/nsCertTree.cpp rename to security/manager/ssl/nsCertTree.cpp diff --git a/security/manager/ssl/src/nsCertTree.h b/security/manager/ssl/nsCertTree.h similarity index 100% rename from security/manager/ssl/src/nsCertTree.h rename to security/manager/ssl/nsCertTree.h diff --git a/security/manager/ssl/src/nsCertVerificationThread.cpp b/security/manager/ssl/nsCertVerificationThread.cpp similarity index 100% rename from security/manager/ssl/src/nsCertVerificationThread.cpp rename to security/manager/ssl/nsCertVerificationThread.cpp diff --git a/security/manager/ssl/src/nsCertVerificationThread.h b/security/manager/ssl/nsCertVerificationThread.h similarity index 100% rename from security/manager/ssl/src/nsCertVerificationThread.h rename to security/manager/ssl/nsCertVerificationThread.h diff --git a/security/manager/ssl/src/nsClientAuthRemember.cpp b/security/manager/ssl/nsClientAuthRemember.cpp similarity index 100% rename from security/manager/ssl/src/nsClientAuthRemember.cpp rename to security/manager/ssl/nsClientAuthRemember.cpp diff --git a/security/manager/ssl/src/nsClientAuthRemember.h b/security/manager/ssl/nsClientAuthRemember.h similarity index 100% rename from security/manager/ssl/src/nsClientAuthRemember.h rename to security/manager/ssl/nsClientAuthRemember.h diff --git a/security/manager/ssl/src/nsCrypto.cpp b/security/manager/ssl/nsCrypto.cpp similarity index 100% rename from security/manager/ssl/src/nsCrypto.cpp rename to security/manager/ssl/nsCrypto.cpp diff --git a/security/manager/ssl/src/nsCrypto.h b/security/manager/ssl/nsCrypto.h similarity index 100% rename from security/manager/ssl/src/nsCrypto.h rename to security/manager/ssl/nsCrypto.h diff --git a/security/manager/ssl/src/nsCryptoHash.cpp b/security/manager/ssl/nsCryptoHash.cpp similarity index 100% rename from security/manager/ssl/src/nsCryptoHash.cpp rename to security/manager/ssl/nsCryptoHash.cpp diff --git a/security/manager/ssl/src/nsCryptoHash.h b/security/manager/ssl/nsCryptoHash.h similarity index 100% rename from security/manager/ssl/src/nsCryptoHash.h rename to security/manager/ssl/nsCryptoHash.h diff --git a/security/manager/ssl/src/nsDataSignatureVerifier.cpp b/security/manager/ssl/nsDataSignatureVerifier.cpp similarity index 100% rename from security/manager/ssl/src/nsDataSignatureVerifier.cpp rename to security/manager/ssl/nsDataSignatureVerifier.cpp diff --git a/security/manager/ssl/src/nsDataSignatureVerifier.h b/security/manager/ssl/nsDataSignatureVerifier.h similarity index 100% rename from security/manager/ssl/src/nsDataSignatureVerifier.h rename to security/manager/ssl/nsDataSignatureVerifier.h diff --git a/security/manager/ssl/src/nsKeyModule.cpp b/security/manager/ssl/nsKeyModule.cpp similarity index 100% rename from security/manager/ssl/src/nsKeyModule.cpp rename to security/manager/ssl/nsKeyModule.cpp diff --git a/security/manager/ssl/src/nsKeyModule.h b/security/manager/ssl/nsKeyModule.h similarity index 100% rename from security/manager/ssl/src/nsKeyModule.h rename to security/manager/ssl/nsKeyModule.h diff --git a/security/manager/ssl/src/nsKeygenHandler.cpp b/security/manager/ssl/nsKeygenHandler.cpp similarity index 100% rename from security/manager/ssl/src/nsKeygenHandler.cpp rename to security/manager/ssl/nsKeygenHandler.cpp diff --git a/security/manager/ssl/src/nsKeygenHandler.h b/security/manager/ssl/nsKeygenHandler.h similarity index 100% rename from security/manager/ssl/src/nsKeygenHandler.h rename to security/manager/ssl/nsKeygenHandler.h diff --git a/security/manager/ssl/src/nsKeygenHandlerContent.cpp b/security/manager/ssl/nsKeygenHandlerContent.cpp similarity index 100% rename from security/manager/ssl/src/nsKeygenHandlerContent.cpp rename to security/manager/ssl/nsKeygenHandlerContent.cpp diff --git a/security/manager/ssl/src/nsKeygenHandlerContent.h b/security/manager/ssl/nsKeygenHandlerContent.h similarity index 100% rename from security/manager/ssl/src/nsKeygenHandlerContent.h rename to security/manager/ssl/nsKeygenHandlerContent.h diff --git a/security/manager/ssl/src/nsKeygenThread.cpp b/security/manager/ssl/nsKeygenThread.cpp similarity index 100% rename from security/manager/ssl/src/nsKeygenThread.cpp rename to security/manager/ssl/nsKeygenThread.cpp diff --git a/security/manager/ssl/src/nsKeygenThread.h b/security/manager/ssl/nsKeygenThread.h similarity index 100% rename from security/manager/ssl/src/nsKeygenThread.h rename to security/manager/ssl/nsKeygenThread.h diff --git a/security/manager/ssl/src/nsNSSASN1Object.cpp b/security/manager/ssl/nsNSSASN1Object.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSASN1Object.cpp rename to security/manager/ssl/nsNSSASN1Object.cpp diff --git a/security/manager/ssl/src/nsNSSASN1Object.h b/security/manager/ssl/nsNSSASN1Object.h similarity index 100% rename from security/manager/ssl/src/nsNSSASN1Object.h rename to security/manager/ssl/nsNSSASN1Object.h diff --git a/security/manager/ssl/src/nsNSSCallbacks.cpp b/security/manager/ssl/nsNSSCallbacks.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCallbacks.cpp rename to security/manager/ssl/nsNSSCallbacks.cpp diff --git a/security/manager/ssl/src/nsNSSCallbacks.h b/security/manager/ssl/nsNSSCallbacks.h similarity index 100% rename from security/manager/ssl/src/nsNSSCallbacks.h rename to security/manager/ssl/nsNSSCallbacks.h diff --git a/security/manager/ssl/src/nsNSSCertHelper.cpp b/security/manager/ssl/nsNSSCertHelper.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCertHelper.cpp rename to security/manager/ssl/nsNSSCertHelper.cpp diff --git a/security/manager/ssl/src/nsNSSCertHelper.h b/security/manager/ssl/nsNSSCertHelper.h similarity index 100% rename from security/manager/ssl/src/nsNSSCertHelper.h rename to security/manager/ssl/nsNSSCertHelper.h diff --git a/security/manager/ssl/src/nsNSSCertTrust.cpp b/security/manager/ssl/nsNSSCertTrust.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCertTrust.cpp rename to security/manager/ssl/nsNSSCertTrust.cpp diff --git a/security/manager/ssl/src/nsNSSCertTrust.h b/security/manager/ssl/nsNSSCertTrust.h similarity index 100% rename from security/manager/ssl/src/nsNSSCertTrust.h rename to security/manager/ssl/nsNSSCertTrust.h diff --git a/security/manager/ssl/src/nsNSSCertValidity.cpp b/security/manager/ssl/nsNSSCertValidity.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCertValidity.cpp rename to security/manager/ssl/nsNSSCertValidity.cpp diff --git a/security/manager/ssl/src/nsNSSCertValidity.h b/security/manager/ssl/nsNSSCertValidity.h similarity index 100% rename from security/manager/ssl/src/nsNSSCertValidity.h rename to security/manager/ssl/nsNSSCertValidity.h diff --git a/security/manager/ssl/src/nsNSSCertificate.cpp b/security/manager/ssl/nsNSSCertificate.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCertificate.cpp rename to security/manager/ssl/nsNSSCertificate.cpp diff --git a/security/manager/ssl/src/nsNSSCertificate.h b/security/manager/ssl/nsNSSCertificate.h similarity index 100% rename from security/manager/ssl/src/nsNSSCertificate.h rename to security/manager/ssl/nsNSSCertificate.h diff --git a/security/manager/ssl/src/nsNSSCertificateDB.cpp b/security/manager/ssl/nsNSSCertificateDB.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCertificateDB.cpp rename to security/manager/ssl/nsNSSCertificateDB.cpp diff --git a/security/manager/ssl/src/nsNSSCertificateDB.h b/security/manager/ssl/nsNSSCertificateDB.h similarity index 100% rename from security/manager/ssl/src/nsNSSCertificateDB.h rename to security/manager/ssl/nsNSSCertificateDB.h diff --git a/security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp b/security/manager/ssl/nsNSSCertificateFakeTransport.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp rename to security/manager/ssl/nsNSSCertificateFakeTransport.cpp diff --git a/security/manager/ssl/src/nsNSSCertificateFakeTransport.h b/security/manager/ssl/nsNSSCertificateFakeTransport.h similarity index 100% rename from security/manager/ssl/src/nsNSSCertificateFakeTransport.h rename to security/manager/ssl/nsNSSCertificateFakeTransport.h diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/nsNSSComponent.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSComponent.cpp rename to security/manager/ssl/nsNSSComponent.cpp diff --git a/security/manager/ssl/src/nsNSSComponent.h b/security/manager/ssl/nsNSSComponent.h similarity index 100% rename from security/manager/ssl/src/nsNSSComponent.h rename to security/manager/ssl/nsNSSComponent.h diff --git a/security/manager/ssl/src/nsNSSErrors.cpp b/security/manager/ssl/nsNSSErrors.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSErrors.cpp rename to security/manager/ssl/nsNSSErrors.cpp diff --git a/security/manager/ssl/src/nsNSSHelper.h b/security/manager/ssl/nsNSSHelper.h similarity index 100% rename from security/manager/ssl/src/nsNSSHelper.h rename to security/manager/ssl/nsNSSHelper.h diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/nsNSSIOLayer.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSIOLayer.cpp rename to security/manager/ssl/nsNSSIOLayer.cpp diff --git a/security/manager/ssl/src/nsNSSIOLayer.h b/security/manager/ssl/nsNSSIOLayer.h similarity index 100% rename from security/manager/ssl/src/nsNSSIOLayer.h rename to security/manager/ssl/nsNSSIOLayer.h diff --git a/security/manager/ssl/src/nsNSSModule.cpp b/security/manager/ssl/nsNSSModule.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSModule.cpp rename to security/manager/ssl/nsNSSModule.cpp diff --git a/security/manager/ssl/src/nsNSSShutDown.cpp b/security/manager/ssl/nsNSSShutDown.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSShutDown.cpp rename to security/manager/ssl/nsNSSShutDown.cpp diff --git a/security/manager/ssl/src/nsNSSShutDown.h b/security/manager/ssl/nsNSSShutDown.h similarity index 100% rename from security/manager/ssl/src/nsNSSShutDown.h rename to security/manager/ssl/nsNSSShutDown.h diff --git a/security/manager/ssl/src/nsNSSVersion.cpp b/security/manager/ssl/nsNSSVersion.cpp similarity index 100% rename from security/manager/ssl/src/nsNSSVersion.cpp rename to security/manager/ssl/nsNSSVersion.cpp diff --git a/security/manager/ssl/src/nsNSSVersion.h b/security/manager/ssl/nsNSSVersion.h similarity index 100% rename from security/manager/ssl/src/nsNSSVersion.h rename to security/manager/ssl/nsNSSVersion.h diff --git a/security/manager/ssl/src/nsNTLMAuthModule.cpp b/security/manager/ssl/nsNTLMAuthModule.cpp similarity index 100% rename from security/manager/ssl/src/nsNTLMAuthModule.cpp rename to security/manager/ssl/nsNTLMAuthModule.cpp diff --git a/security/manager/ssl/src/nsNTLMAuthModule.h b/security/manager/ssl/nsNTLMAuthModule.h similarity index 100% rename from security/manager/ssl/src/nsNTLMAuthModule.h rename to security/manager/ssl/nsNTLMAuthModule.h diff --git a/security/manager/ssl/src/nsPK11TokenDB.cpp b/security/manager/ssl/nsPK11TokenDB.cpp similarity index 100% rename from security/manager/ssl/src/nsPK11TokenDB.cpp rename to security/manager/ssl/nsPK11TokenDB.cpp diff --git a/security/manager/ssl/src/nsPK11TokenDB.h b/security/manager/ssl/nsPK11TokenDB.h similarity index 100% rename from security/manager/ssl/src/nsPK11TokenDB.h rename to security/manager/ssl/nsPK11TokenDB.h diff --git a/security/manager/ssl/src/nsPKCS11Slot.cpp b/security/manager/ssl/nsPKCS11Slot.cpp similarity index 100% rename from security/manager/ssl/src/nsPKCS11Slot.cpp rename to security/manager/ssl/nsPKCS11Slot.cpp diff --git a/security/manager/ssl/src/nsPKCS11Slot.h b/security/manager/ssl/nsPKCS11Slot.h similarity index 100% rename from security/manager/ssl/src/nsPKCS11Slot.h rename to security/manager/ssl/nsPKCS11Slot.h diff --git a/security/manager/ssl/src/nsPKCS12Blob.cpp b/security/manager/ssl/nsPKCS12Blob.cpp similarity index 100% rename from security/manager/ssl/src/nsPKCS12Blob.cpp rename to security/manager/ssl/nsPKCS12Blob.cpp diff --git a/security/manager/ssl/src/nsPKCS12Blob.h b/security/manager/ssl/nsPKCS12Blob.h similarity index 100% rename from security/manager/ssl/src/nsPKCS12Blob.h rename to security/manager/ssl/nsPKCS12Blob.h diff --git a/security/manager/ssl/src/nsPSMBackgroundThread.cpp b/security/manager/ssl/nsPSMBackgroundThread.cpp similarity index 100% rename from security/manager/ssl/src/nsPSMBackgroundThread.cpp rename to security/manager/ssl/nsPSMBackgroundThread.cpp diff --git a/security/manager/ssl/src/nsPSMBackgroundThread.h b/security/manager/ssl/nsPSMBackgroundThread.h similarity index 100% rename from security/manager/ssl/src/nsPSMBackgroundThread.h rename to security/manager/ssl/nsPSMBackgroundThread.h diff --git a/security/manager/ssl/src/nsProtectedAuthThread.cpp b/security/manager/ssl/nsProtectedAuthThread.cpp similarity index 100% rename from security/manager/ssl/src/nsProtectedAuthThread.cpp rename to security/manager/ssl/nsProtectedAuthThread.cpp diff --git a/security/manager/ssl/src/nsProtectedAuthThread.h b/security/manager/ssl/nsProtectedAuthThread.h similarity index 100% rename from security/manager/ssl/src/nsProtectedAuthThread.h rename to security/manager/ssl/nsProtectedAuthThread.h diff --git a/security/manager/ssl/src/nsRandomGenerator.cpp b/security/manager/ssl/nsRandomGenerator.cpp similarity index 100% rename from security/manager/ssl/src/nsRandomGenerator.cpp rename to security/manager/ssl/nsRandomGenerator.cpp diff --git a/security/manager/ssl/src/nsRandomGenerator.h b/security/manager/ssl/nsRandomGenerator.h similarity index 100% rename from security/manager/ssl/src/nsRandomGenerator.h rename to security/manager/ssl/nsRandomGenerator.h diff --git a/security/manager/ssl/src/nsSDR.cpp b/security/manager/ssl/nsSDR.cpp similarity index 100% rename from security/manager/ssl/src/nsSDR.cpp rename to security/manager/ssl/nsSDR.cpp diff --git a/security/manager/ssl/src/nsSDR.h b/security/manager/ssl/nsSDR.h similarity index 100% rename from security/manager/ssl/src/nsSDR.h rename to security/manager/ssl/nsSDR.h diff --git a/security/manager/ssl/src/nsSSLSocketProvider.cpp b/security/manager/ssl/nsSSLSocketProvider.cpp similarity index 100% rename from security/manager/ssl/src/nsSSLSocketProvider.cpp rename to security/manager/ssl/nsSSLSocketProvider.cpp diff --git a/security/manager/ssl/src/nsSSLSocketProvider.h b/security/manager/ssl/nsSSLSocketProvider.h similarity index 100% rename from security/manager/ssl/src/nsSSLSocketProvider.h rename to security/manager/ssl/nsSSLSocketProvider.h diff --git a/security/manager/ssl/src/nsSSLStatus.cpp b/security/manager/ssl/nsSSLStatus.cpp similarity index 100% rename from security/manager/ssl/src/nsSSLStatus.cpp rename to security/manager/ssl/nsSSLStatus.cpp diff --git a/security/manager/ssl/src/nsSSLStatus.h b/security/manager/ssl/nsSSLStatus.h similarity index 100% rename from security/manager/ssl/src/nsSSLStatus.h rename to security/manager/ssl/nsSSLStatus.h diff --git a/security/manager/ssl/src/nsSmartCardMonitor.cpp b/security/manager/ssl/nsSmartCardMonitor.cpp similarity index 100% rename from security/manager/ssl/src/nsSmartCardMonitor.cpp rename to security/manager/ssl/nsSmartCardMonitor.cpp diff --git a/security/manager/ssl/src/nsSmartCardMonitor.h b/security/manager/ssl/nsSmartCardMonitor.h similarity index 100% rename from security/manager/ssl/src/nsSmartCardMonitor.h rename to security/manager/ssl/nsSmartCardMonitor.h diff --git a/security/manager/ssl/src/nsTLSSocketProvider.cpp b/security/manager/ssl/nsTLSSocketProvider.cpp similarity index 100% rename from security/manager/ssl/src/nsTLSSocketProvider.cpp rename to security/manager/ssl/nsTLSSocketProvider.cpp diff --git a/security/manager/ssl/src/nsTLSSocketProvider.h b/security/manager/ssl/nsTLSSocketProvider.h similarity index 100% rename from security/manager/ssl/src/nsTLSSocketProvider.h rename to security/manager/ssl/nsTLSSocketProvider.h diff --git a/security/manager/ssl/src/nsUsageArrayHelper.cpp b/security/manager/ssl/nsUsageArrayHelper.cpp similarity index 100% rename from security/manager/ssl/src/nsUsageArrayHelper.cpp rename to security/manager/ssl/nsUsageArrayHelper.cpp diff --git a/security/manager/ssl/src/nsUsageArrayHelper.h b/security/manager/ssl/nsUsageArrayHelper.h similarity index 100% rename from security/manager/ssl/src/nsUsageArrayHelper.h rename to security/manager/ssl/nsUsageArrayHelper.h diff --git a/security/manager/ssl/src/nsVerificationJob.h b/security/manager/ssl/nsVerificationJob.h similarity index 100% rename from security/manager/ssl/src/nsVerificationJob.h rename to security/manager/ssl/nsVerificationJob.h diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build deleted file mode 100644 index 2efc4a6ae4f..00000000000 --- a/security/manager/ssl/src/moz.build +++ /dev/null @@ -1,125 +0,0 @@ -# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*- -# vim: set filetype=python: -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. - -EXPORTS += [ - 'CryptoTask.h', - 'nsClientAuthRemember.h', - 'nsCrypto.h', - 'nsNSSCallbacks.h', - 'nsNSSCertificate.h', - 'nsNSSComponent.h', - 'nsNSSHelper.h', - 'nsNSSShutDown.h', - 'nsRandomGenerator.h', - 'NSSErrorsService.h', - 'ScopedNSSTypes.h', - 'SharedCertVerifier.h', -] - -EXPORTS.mozilla += [ - 'PublicSSL.h', -] - -EXPORTS.mozilla.psm += [ - 'PSMContentListener.h', -] - -UNIFIED_SOURCES += [ - 'CryptoTask.cpp', - 'nsCertOverrideService.cpp', - 'nsCertPicker.cpp', - 'nsCertVerificationThread.cpp', - 'nsClientAuthRemember.cpp', - 'nsCrypto.cpp', - 'nsCryptoHash.cpp', - 'nsDataSignatureVerifier.cpp', - 'nsKeygenHandler.cpp', - 'nsKeygenHandlerContent.cpp', - 'nsKeygenThread.cpp', - 'nsKeyModule.cpp', - 'nsNSSASN1Object.cpp', - 'nsNSSCallbacks.cpp', - 'nsNSSCertHelper.cpp', - 'nsNSSCertificate.cpp', - 'nsNSSCertificateFakeTransport.cpp', - 'nsNSSCertTrust.cpp', - 'nsNSSCertValidity.cpp', - 'nsNSSComponent.cpp', - 'nsNSSErrors.cpp', - 'nsNSSIOLayer.cpp', - 'nsNSSModule.cpp', - 'nsNSSShutDown.cpp', - 'nsNSSVersion.cpp', - 'nsNTLMAuthModule.cpp', - 'nsPK11TokenDB.cpp', - 'nsPKCS11Slot.cpp', - 'nsPKCS12Blob.cpp', - 'nsProtectedAuthThread.cpp', - 'nsPSMBackgroundThread.cpp', - 'nsRandomGenerator.cpp', - 'nsSDR.cpp', - 'NSSErrorsService.cpp', - 'nsSSLSocketProvider.cpp', - 'nsSSLStatus.cpp', - 'nsTLSSocketProvider.cpp', - 'nsUsageArrayHelper.cpp', - 'PSMContentListener.cpp', - 'PSMRunnable.cpp', - 'SharedSSLState.cpp', - 'SSLServerCertVerification.cpp', - 'TransportSecurityInfo.cpp', -] - -# nsNSSCertificateDB.cpp needs to include nscert.h before everything else. -SOURCES += [ - 'nsNSSCertificateDB.cpp', -] - -IPDL_SOURCES += [ - 'PPSMContentDownloader.ipdl', -] - -LOCAL_INCLUDES += [ - '/security/manager/boot/src', -] - -if not CONFIG['MOZ_NO_SMART_CARDS']: - UNIFIED_SOURCES += [ - 'nsSmartCardMonitor.cpp', - ] - -if CONFIG['MOZ_XUL']: - UNIFIED_SOURCES += [ - 'nsCertTree.cpp', - ] - -UNIFIED_SOURCES += [ - 'md4.c', -] - -FAIL_ON_WARNINGS = True - -FINAL_LIBRARY = 'xul' - -LOCAL_INCLUDES += [ - '../../../certverifier', - '../../../pkix/include', - '/dom/base', -] - -if CONFIG['NSS_DISABLE_DBM']: - DEFINES['NSS_DISABLE_DBM'] = '1' - -DEFINES['SSL_DISABLE_DEPRECATED_CIPHER_SUITE_NAMES'] = 'True' -DEFINES['NSS_ENABLE_ECC'] = 'True' -for var in ('DLL_PREFIX', 'DLL_SUFFIX'): - DEFINES[var] = '"%s"' % CONFIG[var] - -USE_LIBS += [ - 'crmf', -] - -include('/ipc/chromium/chromium-config.mozbuild') diff --git a/security/manager/ssl/tests/gtest/moz.build b/security/manager/ssl/tests/gtest/moz.build index 95ff6645037..0f9cf2dab6c 100644 --- a/security/manager/ssl/tests/gtest/moz.build +++ b/security/manager/ssl/tests/gtest/moz.build @@ -11,10 +11,10 @@ SOURCES += [ ] LOCAL_INCLUDES += [ - '../../../../certverifier', - '../../../../pkix/include', - '../../../../pkix/test/lib', - '/security/manager/ssl/src', + '/security/certverifier', + '/security/manager/ssl', + '/security/pkix/include', + '/security/pkix/test/lib', ] include('/ipc/chromium/chromium-config.mozbuild') diff --git a/toolkit/devtools/webconsole/network-helper.js b/toolkit/devtools/webconsole/network-helper.js index 91684e4c182..cac28666117 100644 --- a/toolkit/devtools/webconsole/network-helper.js +++ b/toolkit/devtools/webconsole/network-helper.js @@ -552,7 +552,7 @@ let NetworkHelper = { * * - request is HTTPS but it uses a weak cipher or old protocol, see * http://hg.mozilla.org/mozilla-central/annotate/def6ed9d1c1a/ - * security/manager/ssl/src/nsNSSCallbacks.cpp#l1233 + * security/manager/ssl/nsNSSCallbacks.cpp#l1233 * - request is mixed content (which makes no sense whatsoever) * => .securityState has STATE_IS_BROKEN flag * => .errorCode is NOT an NSS error code @@ -725,7 +725,7 @@ let NetworkHelper = { // If there's non-fatal security issues the request has STATE_IS_BROKEN // flag set. See http://hg.mozilla.org/mozilla-central/file/44344099d119 - // /security/manager/ssl/src/nsNSSCallbacks.cpp#l1233 + // /security/manager/ssl/nsNSSCallbacks.cpp#l1233 let reasons = []; if (state & wpl.STATE_IS_BROKEN) {