Bug 1164714 - Flatten security/manager/ssl/src/ directory. r=keeler
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Tue, 26 May 2015 10:31:23 -0700
changeset 245882 ff4f7f2aabb147682823177dcfa80a12b0ecb759
parent 245881 92f57efec3059a8947bc1e9fc02dec6ab191e7dd
child 245883 0c1cdda7c32391636dd1d4ea23d00c4b53f04cfe
push id60306
push userbirunthan@mohanathas.com
push dateThu, 28 May 2015 00:47:10 +0000
treeherdermozilla-inbound@297bf44ee11b [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskeeler
bugs1164714
milestone41.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1164714 - Flatten security/manager/ssl/src/ directory. r=keeler
dom/crypto/moz.build
security/apps/moz.build
security/certverifier/moz.build
security/manager/ssl/CryptoTask.cpp
security/manager/ssl/CryptoTask.h
security/manager/ssl/CryptoUtil.h
security/manager/ssl/IntolerantFallbackList.inc
security/manager/ssl/NSSErrorsService.cpp
security/manager/ssl/NSSErrorsService.h
security/manager/ssl/PPSMContentDownloader.ipdl
security/manager/ssl/PSMContentListener.cpp
security/manager/ssl/PSMContentListener.h
security/manager/ssl/PSMRunnable.cpp
security/manager/ssl/PSMRunnable.h
security/manager/ssl/PublicSSL.h
security/manager/ssl/SSLServerCertVerification.cpp
security/manager/ssl/SSLServerCertVerification.h
security/manager/ssl/ScopedNSSTypes.h
security/manager/ssl/SharedCertVerifier.h
security/manager/ssl/SharedSSLState.cpp
security/manager/ssl/SharedSSLState.h
security/manager/ssl/TransportSecurityInfo.cpp
security/manager/ssl/TransportSecurityInfo.h
security/manager/ssl/md4.c
security/manager/ssl/md4.h
security/manager/ssl/moz.build
security/manager/ssl/nsCertOverrideService.cpp
security/manager/ssl/nsCertOverrideService.h
security/manager/ssl/nsCertPicker.cpp
security/manager/ssl/nsCertPicker.h
security/manager/ssl/nsCertTree.cpp
security/manager/ssl/nsCertTree.h
security/manager/ssl/nsCertVerificationThread.cpp
security/manager/ssl/nsCertVerificationThread.h
security/manager/ssl/nsClientAuthRemember.cpp
security/manager/ssl/nsClientAuthRemember.h
security/manager/ssl/nsCrypto.cpp
security/manager/ssl/nsCrypto.h
security/manager/ssl/nsCryptoHash.cpp
security/manager/ssl/nsCryptoHash.h
security/manager/ssl/nsDataSignatureVerifier.cpp
security/manager/ssl/nsDataSignatureVerifier.h
security/manager/ssl/nsKeyModule.cpp
security/manager/ssl/nsKeyModule.h
security/manager/ssl/nsKeygenHandler.cpp
security/manager/ssl/nsKeygenHandler.h
security/manager/ssl/nsKeygenHandlerContent.cpp
security/manager/ssl/nsKeygenHandlerContent.h
security/manager/ssl/nsKeygenThread.cpp
security/manager/ssl/nsKeygenThread.h
security/manager/ssl/nsNSSASN1Object.cpp
security/manager/ssl/nsNSSASN1Object.h
security/manager/ssl/nsNSSCallbacks.cpp
security/manager/ssl/nsNSSCallbacks.h
security/manager/ssl/nsNSSCertHelper.cpp
security/manager/ssl/nsNSSCertHelper.h
security/manager/ssl/nsNSSCertTrust.cpp
security/manager/ssl/nsNSSCertTrust.h
security/manager/ssl/nsNSSCertValidity.cpp
security/manager/ssl/nsNSSCertValidity.h
security/manager/ssl/nsNSSCertificate.cpp
security/manager/ssl/nsNSSCertificate.h
security/manager/ssl/nsNSSCertificateDB.cpp
security/manager/ssl/nsNSSCertificateDB.h
security/manager/ssl/nsNSSCertificateFakeTransport.cpp
security/manager/ssl/nsNSSCertificateFakeTransport.h
security/manager/ssl/nsNSSComponent.cpp
security/manager/ssl/nsNSSComponent.h
security/manager/ssl/nsNSSErrors.cpp
security/manager/ssl/nsNSSHelper.h
security/manager/ssl/nsNSSIOLayer.cpp
security/manager/ssl/nsNSSIOLayer.h
security/manager/ssl/nsNSSModule.cpp
security/manager/ssl/nsNSSShutDown.cpp
security/manager/ssl/nsNSSShutDown.h
security/manager/ssl/nsNSSVersion.cpp
security/manager/ssl/nsNSSVersion.h
security/manager/ssl/nsNTLMAuthModule.cpp
security/manager/ssl/nsNTLMAuthModule.h
security/manager/ssl/nsPK11TokenDB.cpp
security/manager/ssl/nsPK11TokenDB.h
security/manager/ssl/nsPKCS11Slot.cpp
security/manager/ssl/nsPKCS11Slot.h
security/manager/ssl/nsPKCS12Blob.cpp
security/manager/ssl/nsPKCS12Blob.h
security/manager/ssl/nsPSMBackgroundThread.cpp
security/manager/ssl/nsPSMBackgroundThread.h
security/manager/ssl/nsProtectedAuthThread.cpp
security/manager/ssl/nsProtectedAuthThread.h
security/manager/ssl/nsRandomGenerator.cpp
security/manager/ssl/nsRandomGenerator.h
security/manager/ssl/nsSDR.cpp
security/manager/ssl/nsSDR.h
security/manager/ssl/nsSSLSocketProvider.cpp
security/manager/ssl/nsSSLSocketProvider.h
security/manager/ssl/nsSSLStatus.cpp
security/manager/ssl/nsSSLStatus.h
security/manager/ssl/nsSmartCardMonitor.cpp
security/manager/ssl/nsSmartCardMonitor.h
security/manager/ssl/nsTLSSocketProvider.cpp
security/manager/ssl/nsTLSSocketProvider.h
security/manager/ssl/nsUsageArrayHelper.cpp
security/manager/ssl/nsUsageArrayHelper.h
security/manager/ssl/nsVerificationJob.h
security/manager/ssl/src/CryptoTask.cpp
security/manager/ssl/src/CryptoTask.h
security/manager/ssl/src/CryptoUtil.h
security/manager/ssl/src/IntolerantFallbackList.inc
security/manager/ssl/src/NSSErrorsService.cpp
security/manager/ssl/src/NSSErrorsService.h
security/manager/ssl/src/PPSMContentDownloader.ipdl
security/manager/ssl/src/PSMContentListener.cpp
security/manager/ssl/src/PSMContentListener.h
security/manager/ssl/src/PSMRunnable.cpp
security/manager/ssl/src/PSMRunnable.h
security/manager/ssl/src/PublicSSL.h
security/manager/ssl/src/SSLServerCertVerification.cpp
security/manager/ssl/src/SSLServerCertVerification.h
security/manager/ssl/src/ScopedNSSTypes.h
security/manager/ssl/src/SharedCertVerifier.h
security/manager/ssl/src/SharedSSLState.cpp
security/manager/ssl/src/SharedSSLState.h
security/manager/ssl/src/TransportSecurityInfo.cpp
security/manager/ssl/src/TransportSecurityInfo.h
security/manager/ssl/src/md4.c
security/manager/ssl/src/md4.h
security/manager/ssl/src/moz.build
security/manager/ssl/src/nsCertOverrideService.cpp
security/manager/ssl/src/nsCertOverrideService.h
security/manager/ssl/src/nsCertPicker.cpp
security/manager/ssl/src/nsCertPicker.h
security/manager/ssl/src/nsCertTree.cpp
security/manager/ssl/src/nsCertTree.h
security/manager/ssl/src/nsCertVerificationThread.cpp
security/manager/ssl/src/nsCertVerificationThread.h
security/manager/ssl/src/nsClientAuthRemember.cpp
security/manager/ssl/src/nsClientAuthRemember.h
security/manager/ssl/src/nsCrypto.cpp
security/manager/ssl/src/nsCrypto.h
security/manager/ssl/src/nsCryptoHash.cpp
security/manager/ssl/src/nsCryptoHash.h
security/manager/ssl/src/nsDataSignatureVerifier.cpp
security/manager/ssl/src/nsDataSignatureVerifier.h
security/manager/ssl/src/nsKeyModule.cpp
security/manager/ssl/src/nsKeyModule.h
security/manager/ssl/src/nsKeygenHandler.cpp
security/manager/ssl/src/nsKeygenHandler.h
security/manager/ssl/src/nsKeygenHandlerContent.cpp
security/manager/ssl/src/nsKeygenHandlerContent.h
security/manager/ssl/src/nsKeygenThread.cpp
security/manager/ssl/src/nsKeygenThread.h
security/manager/ssl/src/nsNSSASN1Object.cpp
security/manager/ssl/src/nsNSSASN1Object.h
security/manager/ssl/src/nsNSSCallbacks.cpp
security/manager/ssl/src/nsNSSCallbacks.h
security/manager/ssl/src/nsNSSCertHelper.cpp
security/manager/ssl/src/nsNSSCertHelper.h
security/manager/ssl/src/nsNSSCertTrust.cpp
security/manager/ssl/src/nsNSSCertTrust.h
security/manager/ssl/src/nsNSSCertValidity.cpp
security/manager/ssl/src/nsNSSCertValidity.h
security/manager/ssl/src/nsNSSCertificate.cpp
security/manager/ssl/src/nsNSSCertificate.h
security/manager/ssl/src/nsNSSCertificateDB.cpp
security/manager/ssl/src/nsNSSCertificateDB.h
security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp
security/manager/ssl/src/nsNSSCertificateFakeTransport.h
security/manager/ssl/src/nsNSSComponent.cpp
security/manager/ssl/src/nsNSSComponent.h
security/manager/ssl/src/nsNSSErrors.cpp
security/manager/ssl/src/nsNSSHelper.h
security/manager/ssl/src/nsNSSIOLayer.cpp
security/manager/ssl/src/nsNSSIOLayer.h
security/manager/ssl/src/nsNSSModule.cpp
security/manager/ssl/src/nsNSSShutDown.cpp
security/manager/ssl/src/nsNSSShutDown.h
security/manager/ssl/src/nsNSSVersion.cpp
security/manager/ssl/src/nsNSSVersion.h
security/manager/ssl/src/nsNTLMAuthModule.cpp
security/manager/ssl/src/nsNTLMAuthModule.h
security/manager/ssl/src/nsPK11TokenDB.cpp
security/manager/ssl/src/nsPK11TokenDB.h
security/manager/ssl/src/nsPKCS11Slot.cpp
security/manager/ssl/src/nsPKCS11Slot.h
security/manager/ssl/src/nsPKCS12Blob.cpp
security/manager/ssl/src/nsPKCS12Blob.h
security/manager/ssl/src/nsPSMBackgroundThread.cpp
security/manager/ssl/src/nsPSMBackgroundThread.h
security/manager/ssl/src/nsProtectedAuthThread.cpp
security/manager/ssl/src/nsProtectedAuthThread.h
security/manager/ssl/src/nsRandomGenerator.cpp
security/manager/ssl/src/nsRandomGenerator.h
security/manager/ssl/src/nsSDR.cpp
security/manager/ssl/src/nsSDR.h
security/manager/ssl/src/nsSSLSocketProvider.cpp
security/manager/ssl/src/nsSSLSocketProvider.h
security/manager/ssl/src/nsSSLStatus.cpp
security/manager/ssl/src/nsSSLStatus.h
security/manager/ssl/src/nsSmartCardMonitor.cpp
security/manager/ssl/src/nsSmartCardMonitor.h
security/manager/ssl/src/nsTLSSocketProvider.cpp
security/manager/ssl/src/nsTLSSocketProvider.h
security/manager/ssl/src/nsUsageArrayHelper.cpp
security/manager/ssl/src/nsUsageArrayHelper.h
security/manager/ssl/src/nsVerificationJob.h
security/manager/ssl/tests/gtest/moz.build
toolkit/devtools/webconsole/network-helper.js
--- a/dom/crypto/moz.build
+++ b/dom/crypto/moz.build
@@ -21,12 +21,12 @@ UNIFIED_SOURCES += [
 
 FAIL_ON_WARNINGS = True
 
 include('/ipc/chromium/chromium-config.mozbuild')
 
 FINAL_LIBRARY = 'xul'
 
 LOCAL_INCLUDES += [
-    '/security/manager/ssl/src',
+    '/security/manager/ssl',
 ]
 
 MOCHITEST_MANIFESTS += ['test/mochitest.ini']
--- a/security/apps/moz.build
+++ b/security/apps/moz.build
@@ -9,19 +9,19 @@ UNIFIED_SOURCES += [
     'AppTrustDomain.cpp',
 ]
 
 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'
 for var in ('DLL_PREFIX', 'DLL_SUFFIX'):
     DEFINES[var] = '"%s"' % CONFIG[var]
 
 test_ssl_path = TOPSRCDIR + '/security/manager/ssl/tests/unit'
 
--- a/security/certverifier/moz.build
+++ b/security/certverifier/moz.build
@@ -17,19 +17,19 @@ UNIFIED_SOURCES += [
 ]
 
 if not CONFIG['NSS_NO_EV_CERTS']:
     UNIFIED_SOURCES += [
         'ExtendedValidation.cpp',
     ]
 
 LOCAL_INCLUDES += [
-    '../manager/boot/src',
-    '../manager/ssl/src',
-    '../pkix/include',
+    '/security/manager/boot/src',
+    '/security/manager/ssl',
+    '/security/pkix/include',
 ]
 
 DIRS += [
     '../pkix',
 ]
 
 CXXFLAGS += ['-Wall']
 if CONFIG['_MSC_VER']:
rename from security/manager/ssl/src/CryptoTask.cpp
rename to security/manager/ssl/CryptoTask.cpp
rename from security/manager/ssl/src/CryptoTask.h
rename to security/manager/ssl/CryptoTask.h
rename from security/manager/ssl/src/CryptoUtil.h
rename to security/manager/ssl/CryptoUtil.h
rename from security/manager/ssl/src/IntolerantFallbackList.inc
rename to security/manager/ssl/IntolerantFallbackList.inc
rename from security/manager/ssl/src/NSSErrorsService.cpp
rename to security/manager/ssl/NSSErrorsService.cpp
rename from security/manager/ssl/src/NSSErrorsService.h
rename to security/manager/ssl/NSSErrorsService.h
rename from security/manager/ssl/src/PPSMContentDownloader.ipdl
rename to security/manager/ssl/PPSMContentDownloader.ipdl
rename from security/manager/ssl/src/PSMContentListener.cpp
rename to security/manager/ssl/PSMContentListener.cpp
rename from security/manager/ssl/src/PSMContentListener.h
rename to security/manager/ssl/PSMContentListener.h
rename from security/manager/ssl/src/PSMRunnable.cpp
rename to security/manager/ssl/PSMRunnable.cpp
rename from security/manager/ssl/src/PSMRunnable.h
rename to security/manager/ssl/PSMRunnable.h
rename from security/manager/ssl/src/PublicSSL.h
rename to security/manager/ssl/PublicSSL.h
rename from security/manager/ssl/src/SSLServerCertVerification.cpp
rename to security/manager/ssl/SSLServerCertVerification.cpp
rename from security/manager/ssl/src/SSLServerCertVerification.h
rename to security/manager/ssl/SSLServerCertVerification.h
rename from security/manager/ssl/src/ScopedNSSTypes.h
rename to security/manager/ssl/ScopedNSSTypes.h
rename from security/manager/ssl/src/SharedCertVerifier.h
rename to security/manager/ssl/SharedCertVerifier.h
rename from security/manager/ssl/src/SharedSSLState.cpp
rename to security/manager/ssl/SharedSSLState.cpp
rename from security/manager/ssl/src/SharedSSLState.h
rename to security/manager/ssl/SharedSSLState.h
rename from security/manager/ssl/src/TransportSecurityInfo.cpp
rename to security/manager/ssl/TransportSecurityInfo.cpp
rename from security/manager/ssl/src/TransportSecurityInfo.h
rename to security/manager/ssl/TransportSecurityInfo.h
rename from security/manager/ssl/src/md4.c
rename to security/manager/ssl/md4.c
rename from security/manager/ssl/src/md4.h
rename to security/manager/ssl/md4.h
--- a/security/manager/ssl/moz.build
+++ b/security/manager/ssl/moz.build
@@ -1,16 +1,14 @@
 # -*- 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/.
 
-DIRS += ['src']
-
 TEST_DIRS += [ 'tests' ]
 
 XPIDL_SOURCES += [
     'nsIASN1Object.idl',
     'nsIASN1PrintableItem.idl',
     'nsIASN1Sequence.idl',
     'nsIAssociatedContentSecurity.idl',
     'nsIBadCertListener2.idl',
@@ -41,8 +39,128 @@ XPIDL_SOURCES += [
 ]
 
 if CONFIG['MOZ_XUL']:
     XPIDL_SOURCES += [
         'nsICertTree.idl',
     ]
 
 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')
rename from security/manager/ssl/src/nsCertOverrideService.cpp
rename to security/manager/ssl/nsCertOverrideService.cpp
rename from security/manager/ssl/src/nsCertOverrideService.h
rename to security/manager/ssl/nsCertOverrideService.h
rename from security/manager/ssl/src/nsCertPicker.cpp
rename to security/manager/ssl/nsCertPicker.cpp
rename from security/manager/ssl/src/nsCertPicker.h
rename to security/manager/ssl/nsCertPicker.h
rename from security/manager/ssl/src/nsCertTree.cpp
rename to security/manager/ssl/nsCertTree.cpp
rename from security/manager/ssl/src/nsCertTree.h
rename to security/manager/ssl/nsCertTree.h
rename from security/manager/ssl/src/nsCertVerificationThread.cpp
rename to security/manager/ssl/nsCertVerificationThread.cpp
rename from security/manager/ssl/src/nsCertVerificationThread.h
rename to security/manager/ssl/nsCertVerificationThread.h
rename from security/manager/ssl/src/nsClientAuthRemember.cpp
rename to security/manager/ssl/nsClientAuthRemember.cpp
rename from security/manager/ssl/src/nsClientAuthRemember.h
rename to security/manager/ssl/nsClientAuthRemember.h
rename from security/manager/ssl/src/nsCrypto.cpp
rename to security/manager/ssl/nsCrypto.cpp
rename from security/manager/ssl/src/nsCrypto.h
rename to security/manager/ssl/nsCrypto.h
rename from security/manager/ssl/src/nsCryptoHash.cpp
rename to security/manager/ssl/nsCryptoHash.cpp
rename from security/manager/ssl/src/nsCryptoHash.h
rename to security/manager/ssl/nsCryptoHash.h
rename from security/manager/ssl/src/nsDataSignatureVerifier.cpp
rename to security/manager/ssl/nsDataSignatureVerifier.cpp
rename from security/manager/ssl/src/nsDataSignatureVerifier.h
rename to security/manager/ssl/nsDataSignatureVerifier.h
rename from security/manager/ssl/src/nsKeyModule.cpp
rename to security/manager/ssl/nsKeyModule.cpp
rename from security/manager/ssl/src/nsKeyModule.h
rename to security/manager/ssl/nsKeyModule.h
rename from security/manager/ssl/src/nsKeygenHandler.cpp
rename to security/manager/ssl/nsKeygenHandler.cpp
rename from security/manager/ssl/src/nsKeygenHandler.h
rename to security/manager/ssl/nsKeygenHandler.h
rename from security/manager/ssl/src/nsKeygenHandlerContent.cpp
rename to security/manager/ssl/nsKeygenHandlerContent.cpp
rename from security/manager/ssl/src/nsKeygenHandlerContent.h
rename to security/manager/ssl/nsKeygenHandlerContent.h
rename from security/manager/ssl/src/nsKeygenThread.cpp
rename to security/manager/ssl/nsKeygenThread.cpp
rename from security/manager/ssl/src/nsKeygenThread.h
rename to security/manager/ssl/nsKeygenThread.h
rename from security/manager/ssl/src/nsNSSASN1Object.cpp
rename to security/manager/ssl/nsNSSASN1Object.cpp
rename from security/manager/ssl/src/nsNSSASN1Object.h
rename to security/manager/ssl/nsNSSASN1Object.h
rename from security/manager/ssl/src/nsNSSCallbacks.cpp
rename to security/manager/ssl/nsNSSCallbacks.cpp
rename from security/manager/ssl/src/nsNSSCallbacks.h
rename to security/manager/ssl/nsNSSCallbacks.h
rename from security/manager/ssl/src/nsNSSCertHelper.cpp
rename to security/manager/ssl/nsNSSCertHelper.cpp
rename from security/manager/ssl/src/nsNSSCertHelper.h
rename to security/manager/ssl/nsNSSCertHelper.h
rename from security/manager/ssl/src/nsNSSCertTrust.cpp
rename to security/manager/ssl/nsNSSCertTrust.cpp
rename from security/manager/ssl/src/nsNSSCertTrust.h
rename to security/manager/ssl/nsNSSCertTrust.h
rename from security/manager/ssl/src/nsNSSCertValidity.cpp
rename to security/manager/ssl/nsNSSCertValidity.cpp
rename from security/manager/ssl/src/nsNSSCertValidity.h
rename to security/manager/ssl/nsNSSCertValidity.h
rename from security/manager/ssl/src/nsNSSCertificate.cpp
rename to security/manager/ssl/nsNSSCertificate.cpp
rename from security/manager/ssl/src/nsNSSCertificate.h
rename to security/manager/ssl/nsNSSCertificate.h
rename from security/manager/ssl/src/nsNSSCertificateDB.cpp
rename to security/manager/ssl/nsNSSCertificateDB.cpp
rename from security/manager/ssl/src/nsNSSCertificateDB.h
rename to security/manager/ssl/nsNSSCertificateDB.h
rename from security/manager/ssl/src/nsNSSCertificateFakeTransport.cpp
rename to security/manager/ssl/nsNSSCertificateFakeTransport.cpp
rename from security/manager/ssl/src/nsNSSCertificateFakeTransport.h
rename to security/manager/ssl/nsNSSCertificateFakeTransport.h
rename from security/manager/ssl/src/nsNSSComponent.cpp
rename to security/manager/ssl/nsNSSComponent.cpp
rename from security/manager/ssl/src/nsNSSComponent.h
rename to security/manager/ssl/nsNSSComponent.h
rename from security/manager/ssl/src/nsNSSErrors.cpp
rename to security/manager/ssl/nsNSSErrors.cpp
rename from security/manager/ssl/src/nsNSSHelper.h
rename to security/manager/ssl/nsNSSHelper.h
rename from security/manager/ssl/src/nsNSSIOLayer.cpp
rename to security/manager/ssl/nsNSSIOLayer.cpp
rename from security/manager/ssl/src/nsNSSIOLayer.h
rename to security/manager/ssl/nsNSSIOLayer.h
rename from security/manager/ssl/src/nsNSSModule.cpp
rename to security/manager/ssl/nsNSSModule.cpp
rename from security/manager/ssl/src/nsNSSShutDown.cpp
rename to security/manager/ssl/nsNSSShutDown.cpp
rename from security/manager/ssl/src/nsNSSShutDown.h
rename to security/manager/ssl/nsNSSShutDown.h
rename from security/manager/ssl/src/nsNSSVersion.cpp
rename to security/manager/ssl/nsNSSVersion.cpp
rename from security/manager/ssl/src/nsNSSVersion.h
rename to security/manager/ssl/nsNSSVersion.h
rename from security/manager/ssl/src/nsNTLMAuthModule.cpp
rename to security/manager/ssl/nsNTLMAuthModule.cpp
rename from security/manager/ssl/src/nsNTLMAuthModule.h
rename to security/manager/ssl/nsNTLMAuthModule.h
rename from security/manager/ssl/src/nsPK11TokenDB.cpp
rename to security/manager/ssl/nsPK11TokenDB.cpp
rename from security/manager/ssl/src/nsPK11TokenDB.h
rename to security/manager/ssl/nsPK11TokenDB.h
rename from security/manager/ssl/src/nsPKCS11Slot.cpp
rename to security/manager/ssl/nsPKCS11Slot.cpp
rename from security/manager/ssl/src/nsPKCS11Slot.h
rename to security/manager/ssl/nsPKCS11Slot.h
rename from security/manager/ssl/src/nsPKCS12Blob.cpp
rename to security/manager/ssl/nsPKCS12Blob.cpp
rename from security/manager/ssl/src/nsPKCS12Blob.h
rename to security/manager/ssl/nsPKCS12Blob.h
rename from security/manager/ssl/src/nsPSMBackgroundThread.cpp
rename to security/manager/ssl/nsPSMBackgroundThread.cpp
rename from security/manager/ssl/src/nsPSMBackgroundThread.h
rename to security/manager/ssl/nsPSMBackgroundThread.h
rename from security/manager/ssl/src/nsProtectedAuthThread.cpp
rename to security/manager/ssl/nsProtectedAuthThread.cpp
rename from security/manager/ssl/src/nsProtectedAuthThread.h
rename to security/manager/ssl/nsProtectedAuthThread.h
rename from security/manager/ssl/src/nsRandomGenerator.cpp
rename to security/manager/ssl/nsRandomGenerator.cpp
rename from security/manager/ssl/src/nsRandomGenerator.h
rename to security/manager/ssl/nsRandomGenerator.h
rename from security/manager/ssl/src/nsSDR.cpp
rename to security/manager/ssl/nsSDR.cpp
rename from security/manager/ssl/src/nsSDR.h
rename to security/manager/ssl/nsSDR.h
rename from security/manager/ssl/src/nsSSLSocketProvider.cpp
rename to security/manager/ssl/nsSSLSocketProvider.cpp
rename from security/manager/ssl/src/nsSSLSocketProvider.h
rename to security/manager/ssl/nsSSLSocketProvider.h
rename from security/manager/ssl/src/nsSSLStatus.cpp
rename to security/manager/ssl/nsSSLStatus.cpp
rename from security/manager/ssl/src/nsSSLStatus.h
rename to security/manager/ssl/nsSSLStatus.h
rename from security/manager/ssl/src/nsSmartCardMonitor.cpp
rename to security/manager/ssl/nsSmartCardMonitor.cpp
rename from security/manager/ssl/src/nsSmartCardMonitor.h
rename to security/manager/ssl/nsSmartCardMonitor.h
rename from security/manager/ssl/src/nsTLSSocketProvider.cpp
rename to security/manager/ssl/nsTLSSocketProvider.cpp
rename from security/manager/ssl/src/nsTLSSocketProvider.h
rename to security/manager/ssl/nsTLSSocketProvider.h
rename from security/manager/ssl/src/nsUsageArrayHelper.cpp
rename to security/manager/ssl/nsUsageArrayHelper.cpp
rename from security/manager/ssl/src/nsUsageArrayHelper.h
rename to security/manager/ssl/nsUsageArrayHelper.h
rename from security/manager/ssl/src/nsVerificationJob.h
rename to security/manager/ssl/nsVerificationJob.h
deleted file mode 100644
--- 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')
--- a/security/manager/ssl/tests/gtest/moz.build
+++ b/security/manager/ssl/tests/gtest/moz.build
@@ -6,19 +6,19 @@
 
 SOURCES += [
     'DataStorageTest.cpp',
     'OCSPCacheTest.cpp',
     'TLSIntoleranceTest.cpp',
 ]
 
 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')
 
 FINAL_LIBRARY = 'xul-gtest'
 
 FAIL_ON_WARNINGS = True
--- a/toolkit/devtools/webconsole/network-helper.js
+++ b/toolkit/devtools/webconsole/network-helper.js
@@ -547,17 +547,17 @@ let NetworkHelper = {
      *   could be validated
      *   => .securityState has STATE_IS_INSECURE flag
      *   => .errorCode is NOT an NSS error code.
      *   => .errorMessage is not available.
      *      => state === "insecure"
      *
      * - 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
      *   => .errorMessage is not available
      *      => state === "weak"
      */
 
     securityInfo.QueryInterface(Ci.nsITransportSecurityInfo);
@@ -720,17 +720,17 @@ let NetworkHelper = {
    *         List of weakness reasons. A subset of { cipher } where
    *         * cipher: The cipher suite is consireded to be weak (RC4).
    */
   getReasonsForWeakness: function NH_getReasonsForWeakness(state) {
     const wpl = Ci.nsIWebProgressListener;
 
     // 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) {
       let isCipher = state & wpl.STATE_USES_WEAK_CRYPTO;
 
       if (isCipher) {
         reasons.push("cipher");
       }