Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Bug 1515236 - Centralize a SSLKEYLOGFILE enable/disable flag at build…
….sh r=mt

Backs out backout 31656990b5d083f97aecc3bb9ff0685e7f444bbb

Differential Revision: https://phabricator.services.mozilla.com/D17380

--HG--
branch : NSS_3_44_BRANCH
extra : transplant_source : J%08%AF%60%C2%B7%B4%D8%C6%9A%93k%D9%5D%C8%3FP%DC%C7%E2
  • Loading branch information
jcjones committed Jan 24, 2019
1 parent 154ec8e commit be49a83
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 10 deletions.
4 changes: 4 additions & 0 deletions build.sh
Expand Up @@ -50,6 +50,7 @@ fuzz=0
fuzz_tls=0
fuzz_oss=0
no_local_nspr=0
sslkeylogfile=1

gyp_params=(--depth="$cwd" --generator-output=".")
ninja_params=()
Expand Down Expand Up @@ -104,6 +105,7 @@ while [ $# -gt 0 ]; do
--enable-fips) gyp_params+=(-Ddisable_fips=0) ;;
--enable-libpkix) gyp_params+=(-Ddisable_libpkix=0) ;;
--mozpkix-only) gyp_params+=(-Dmozpkix_only=1 -Ddisable_tests=1 -Dsign_libs=0) ;;
--disable-keylog) sslkeylogfile=0 ;;
-D*) gyp_params+=("$1") ;;
*) show_help; exit 2 ;;
esac
Expand All @@ -118,6 +120,8 @@ else
target=Debug
fi

gyp_params+=(-Denable_sslkeylogfile="$sslkeylogfile")

# Do special setup.
if [ "$fuzz" = 1 ]; then
source "$cwd"/coreconf/fuzz.sh
Expand Down
9 changes: 8 additions & 1 deletion gtests/ssl_gtest/ssl_gtest.gyp
Expand Up @@ -32,7 +32,6 @@
'ssl_gather_unittest.cc',
'ssl_gtest.cc',
'ssl_hrr_unittest.cc',
'ssl_keylog_unittest.cc',
'ssl_keyupdate_unittest.cc',
'ssl_loopback_unittest.cc',
'ssl_misc_unittest.cc',
Expand Down Expand Up @@ -93,6 +92,14 @@
'<(DEPTH)/lib/dbm/src/src.gyp:dbm',
],
}],
[ 'enable_sslkeylogfile==1', {
'sources': [
'ssl_keylog_unittest.cc',
],
'defines': [
'NSS_ALLOW_SSLKEYLOGFILE',
],
}],
],
}
],
Expand Down
4 changes: 0 additions & 4 deletions gtests/ssl_gtest/ssl_keylog_unittest.cc
Expand Up @@ -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/. */

#ifdef NSS_ALLOW_SSLKEYLOGFILE

#include <cstdlib>
#include <fstream>
#include <sstream>
Expand Down Expand Up @@ -114,5 +112,3 @@ INSTANTIATE_TEST_CASE_P(
#endif

} // namespace nss_test

#endif // NSS_ALLOW_SSLKEYLOGFILE
2 changes: 2 additions & 0 deletions help.txt
Expand Up @@ -52,4 +52,6 @@ NSS build tool options:
--enable-libpkix make libpkix part of the build
--mozpkix-only build only static mozpkix and mozpkix-test libraries
support for this build option is limited
--disable-keylog disable support for logging key data to a file specified
by the SSLKEYLOGFILE environment variable
-D<gyp-option> pass an option directly to gyp
10 changes: 5 additions & 5 deletions lib/ssl/ssl.gyp
Expand Up @@ -74,6 +74,11 @@
'-std=gnu99',
],
}],
[ 'enable_sslkeylogfile==1', {
'defines': [
'NSS_ALLOW_SSLKEYLOGFILE',
],
}],
],
'dependencies': [
'<(DEPTH)/exports.gyp:nss_exports',
Expand All @@ -93,11 +98,6 @@
}
}
],
'target_defaults': {
'defines': [
'NSS_ALLOW_SSLKEYLOGFILE=1'
]
},
'variables': {
'module': 'nss'
}
Expand Down

0 comments on commit be49a83

Please sign in to comment.