Fix handling of --without-osx-keychain

Refs: #3338
Change-Id: Ib9f7ff94d7436d618c5e9055f59b71f1e41893d5

docs/manpages/ndn-client.conf.rst

@@ -75,7 +75,7 @@ tpm
 
   Possible values for ``[scheme]`` are:
 
-  * ``tpm-osx-keychain`` (default on macOS): secure storage of private keys in the macOS
+  * ``tpm-osxkeychain`` (default on macOS): secure storage of private keys in the macOS
     Keychain with OS-provided access restrictions.
 
     The ``[location]`` parameter is ignored.

ndn-cxx/security/key-chain.cpp

@@ -59,9 +59,9 @@ NDN_CXX_KEYCHAIN_REGISTER_PIB_BACKEND(PibMemory);
 } // namespace pib
 
 namespace tpm {
-#if defined(NDN_CXX_HAVE_OSX_FRAMEWORKS) && defined(NDN_CXX_WITH_OSX_KEYCHAIN)
+#ifdef NDN_CXX_HAVE_OSX_FRAMEWORKS
 NDN_CXX_KEYCHAIN_REGISTER_TPM_BACKEND(BackEndOsx);
-#endif // defined(NDN_CXX_HAVE_OSX_FRAMEWORKS) && defined(NDN_CXX_WITH_OSX_KEYCHAIN)
+#endif // NDN_CXX_HAVE_OSX_FRAMEWORKS
 NDN_CXX_KEYCHAIN_REGISTER_TPM_BACKEND(BackEndFile);
 NDN_CXX_KEYCHAIN_REGISTER_TPM_BACKEND(BackEndMem);
 } // namespace tpm

tests/unit/security/key-chain.t.cpp

@@ -99,7 +99,7 @@ BOOST_FIXTURE_TEST_CASE(ConstructorEmptyConfig, TestHomeAndPibFixture<PibPathCon
   KeyChain keyChain;
   BOOST_CHECK_EQUAL(keyChain.getPib().getPibLocator(), "pib-memory:");
 
-#if defined(NDN_CXX_HAVE_OSX_FRAMEWORKS)
+#if defined(NDN_CXX_HAVE_OSX_FRAMEWORKS) && defined(NDN_CXX_WITH_OSX_KEYCHAIN)
   BOOST_CHECK_EQUAL(keyChain.getPib().getTpmLocator(), "tpm-osxkeychain:");
   BOOST_CHECK_EQUAL(keyChain.getTpm().getTpmLocator(), "tpm-osxkeychain:");
 #else

tests/unit/security/tpm/back-end.t.cpp

@@ -53,9 +53,9 @@ BOOST_AUTO_TEST_SUITE(TestBackEnd)
 using tpm::Tpm;
 
 using TestBackEnds = boost::mpl::vector<
-#ifdef NDN_CXX_HAVE_OSX_FRAMEWORKS
+#if defined(NDN_CXX_HAVE_OSX_FRAMEWORKS) && defined(NDN_CXX_WITH_OSX_KEYCHAIN)
   BackEndWrapperOsx,
-#endif // NDN_CXX_HAVE_OSX_FRAMEWORKS
+#endif
   BackEndWrapperMem,
   BackEndWrapperFile>;