add NDNCERT_prefix and small fixes
Change-Id: I7ad5e3258599e62cce437555e64a3b461b08f8e6
diff --git a/src/ca-module.hpp b/src/ca-module.hpp
index 22c53fc..0e6ea06 100644
--- a/src/ca-module.hpp
+++ b/src/ca-module.hpp
@@ -54,7 +54,7 @@
Data
getCaProfileData();
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
void
onCaProfileDiscovery(const Interest& request);
@@ -82,7 +82,7 @@
Data
generateErrorDataPacket(const Name& name, ErrorCode error, const std::string& errorInfo);
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
Face& m_face;
CaConfig m_config;
unique_ptr<CaStorage> m_storage;
diff --git a/src/detail/crypto-helper.hpp b/src/detail/crypto-helper.hpp
index 8463eb6..ecf9327 100644
--- a/src/detail/crypto-helper.hpp
+++ b/src/detail/crypto-helper.hpp
@@ -43,7 +43,7 @@
uint8_t m_sharedSecret[256];
size_t m_sharedSecretLen;
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
uint8_t*
deriveSecret(const uint8_t* peerkey, size_t peerKeySize);
diff --git a/src/detail/ndncert-common.hpp b/src/detail/ndncert-common.hpp
index 1773bf9..003b31f 100644
--- a/src/detail/ndncert-common.hpp
+++ b/src/detail/ndncert-common.hpp
@@ -23,16 +23,16 @@
#include "ndncert-config.hpp"
-#ifdef HAVE_TESTS
-#define VIRTUAL_WITH_TESTS virtual
-#define PUBLIC_WITH_TESTS_ELSE_PROTECTED public
-#define PUBLIC_WITH_TESTS_ELSE_PRIVATE public
-#define PROTECTED_WITH_TESTS_ELSE_PRIVATE protected
+#ifdef NDNCERT_HAVE_TESTS
+#define NDNCERT_VIRTUAL_WITH_TESTS virtual
+#define NDNCERT_PUBLIC_WITH_TESTS_ELSE_PROTECTED public
+#define NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE public
+#define NDNCERT_PROTECTED_WITH_TESTS_ELSE_PRIVATE protected
#else
-#define VIRTUAL_WITH_TESTS
-#define PUBLIC_WITH_TESTS_ELSE_PROTECTED protected
-#define PUBLIC_WITH_TESTS_ELSE_PRIVATE private
-#define PROTECTED_WITH_TESTS_ELSE_PRIVATE private
+#define NDNCERT_VIRTUAL_WITH_TESTS
+#define NDNCERT_PUBLIC_WITH_TESTS_ELSE_PROTECTED protected
+#define NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE private
+#define NDNCERT_PROTECTED_WITH_TESTS_ELSE_PRIVATE private
#endif
#include <cstddef>
diff --git a/src/identity-challenge/challenge-credential.hpp b/src/identity-challenge/challenge-credential.hpp
index 0a80a17..38a7e1a 100644
--- a/src/identity-challenge/challenge-credential.hpp
+++ b/src/identity-challenge/challenge-credential.hpp
@@ -71,11 +71,11 @@
static const std::string PARAMETER_KEY_CREDENTIAL_CERT;
static const std::string PARAMETER_KEY_PROOF_OF_PRIVATE_KEY;
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
void
parseConfigFile();
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
std::list<security::Certificate> m_trustAnchors;
std::string m_configFile;
};
diff --git a/src/identity-challenge/challenge-email.hpp b/src/identity-challenge/challenge-email.hpp
index 79c3db3..8fc6af5 100644
--- a/src/identity-challenge/challenge-email.hpp
+++ b/src/identity-challenge/challenge-email.hpp
@@ -75,7 +75,7 @@
static const std::string PARAMETER_KEY_EMAIL;
static const std::string PARAMETER_KEY_CODE;
-PUBLIC_WITH_TESTS_ELSE_PRIVATE:
+NDNCERT_PUBLIC_WITH_TESTS_ELSE_PRIVATE:
static bool
isValidEmailAddress(const std::string& emailAddress);
diff --git a/wscript b/wscript
index 4204721..c5df199 100644
--- a/wscript
+++ b/wscript
@@ -52,7 +52,7 @@
# system has a different version of the ndncert library installed.
conf.env.prepend_value('STLIBPATH', ['.'])
- conf.define_cond('HAVE_TESTS', conf.env.WITH_TESTS)
+ conf.define_cond('NDNCERT_HAVE_TESTS', conf.env.WITH_TESTS)
conf.define('SYSCONFDIR', conf.env.SYSCONFDIR)
# The config header will contain all defines that were added using conf.define()
# or conf.define_cond(). Everything that was added directly to conf.env.DEFINES