Get rid of cryptopp dependency
Plus various code cleanups:
* More 'auto' usage
* Use 'nullptr' instead of 0
* Rename NewApp class to ChronoChatApp
* Print exception info with boost::diagnostic_information()
* Disable -Wdeprecated-copy and -Wredundant-tags, they trigger
too many warnings in Qt headers with gcc 9 and later
Change-Id: I2ea16c19be634f957b59280c704a956f083891f0
diff --git a/test/contact-storage.t.cpp b/test/contact-storage.t.cpp
index a9265e6..c554a58 100644
--- a/test/contact-storage.t.cpp
+++ b/test/contact-storage.t.cpp
@@ -6,7 +6,6 @@
*/
#include "contact-storage.hpp"
-#include "cryptopp.hpp"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
@@ -14,12 +13,11 @@
namespace chronochat {
namespace tests {
-using std::string;
namespace fs = boost::filesystem;
BOOST_AUTO_TEST_SUITE(TestContactStorage)
-const string dbName("chronos-20e9530008b27c661ad3429d1956fa1c509b652dce9273bfe81b7c91819c272c.db");
+const std::string dbName("chronos-20e9530008b27c661ad3429d1956fa1c509b652dce9273bfe81b7c91819c272c.db");
BOOST_AUTO_TEST_CASE(InitializeTable)
{
diff --git a/test/endorse-certificate.t.cpp b/test/endorse-certificate.t.cpp
index 6fef721..416972f 100644
--- a/test/endorse-certificate.t.cpp
+++ b/test/endorse-certificate.t.cpp
@@ -6,13 +6,15 @@
*/
#include "endorse-certificate.hpp"
-#include "cryptopp.hpp"
#include <boost/test/unit_test.hpp>
#include <boost/filesystem.hpp>
-#include <ndn-cxx/security/key-chain.hpp>
#include <ndn-cxx/encoding/buffer-stream.hpp>
+#include <ndn-cxx/security/key-chain.hpp>
+#include <ndn-cxx/security/transform/base64-decode.hpp>
+#include <ndn-cxx/security/transform/buffer-source.hpp>
+#include <ndn-cxx/security/transform/stream-sink.hpp>
#include <ndn-cxx/util/time.hpp>
#include <ndn-cxx/util/io.hpp>
@@ -27,8 +29,9 @@
BOOST_AUTO_TEST_SUITE(TestEndorseCertificate)
-std::string
-getTestFile(std::string path) {
+static std::string
+getTestFile(std::string path)
+{
std::ifstream t(path);
std::stringstream buffer;
buffer << t.rdbuf();
@@ -83,8 +86,8 @@
const std::string testIdKey = getTestFile("test/cert/testid.key");
ndn::OBufferStream keyOs;
{
- using namespace CryptoPP;
- StringSource(testIdKey, true, new Base64Decoder(new FileSink(keyOs)));
+ using namespace ndn::security::transform;
+ bufferSource(testIdKey) >> base64Decode() >> streamSink(keyOs);
}
BOOST_CHECK(idCert->getPublicKey() == *keyOs.buf());
}