commit 03115ce0c138b21007a52fb41878692c8c1929ac
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Jan 27 01:17:55 2017 -0500
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jan 30 09:35:27 2017 -0800
tree b0de3d1cce52f08b5e1bcda0901a6092fc62b174
parent 7e693be4c22ea365b44d02f1643769596b4d40e3

util: rewrite fromHex using security::transform instead of cryptopp

Change-Id: I487255d3c0944679d18de8c44978f9525db5e5bd
Refs: #3006

src/util/string-helper.cpp

diff --git a/src/util/string-helper.cpp b/src/util/string-helper.cpp
index 0f54e14..ed3c961 100644
--- a/src/util/string-helper.cpp
+++ b/src/util/string-helper.cpp
@@ -1,6 +1,6 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
 /**
- * Copyright (c) 2013-2016 Regents of the University of California.
+ * Copyright (c) 2013-2017 Regents of the University of California.
  *
  * This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
  *
@@ -21,13 +21,15 @@
 
 #include "string-helper.hpp"
 #include "../encoding/buffer-stream.hpp"
-#include "../security/v1/cryptopp.hpp"
+#include "../security/transform/buffer-source.hpp"
+#include "../security/transform/hex-decode.hpp"
+#include "../security/transform/stream-sink.hpp"
+
+#include <boost/algorithm/string/trim.hpp>
 
 #include <sstream>
 #include <iomanip>
 
-#include <boost/algorithm/string/trim.hpp>
-
 namespace ndn {
 
 void
@@ -73,7 +75,7 @@
 }
 
 int
-fromHexChar(uint8_t c)
+fromHexChar(char c)
 {
   if (c >= '0' && c <= '9')
     return c - '0';
@@ -85,25 +87,20 @@
     return -1;
 }
 
-shared_ptr<const Buffer>
+shared_ptr<Buffer>
 fromHex(const std::string& hexString)
 {
-  if (hexString.size() % 2 != 0) {
-    BOOST_THROW_EXCEPTION(StringHelperError("Invalid number of characters in the supplied hex "
-                                            "string"));
-  }
-
-  using namespace CryptoPP;
+  namespace tr = security::transform;
 
   OBufferStream os;
-  StringSource(hexString, true, new HexDecoder(new FileSink(os)));
-  shared_ptr<const Buffer> buffer = os.buf();
-
-  if (buffer->size() * 2 != hexString.size()) {
-    BOOST_THROW_EXCEPTION(StringHelperError("The supplied hex string contains non-hex characters"));
+  try {
+    tr::bufferSource(hexString) >> tr::hexDecode() >> tr::streamSink(os);
+  }
+  catch (const tr::Error& e) {
+    BOOST_THROW_EXCEPTION(StringHelperError(std::string("Conversion from hex failed: ") + e.what()));
   }
 
-  return buffer;
+  return os.buf();
 }
 
 void