Merge branch 'cleanup-cli' of git.rwth-aachen.de:tobias.wach/ccats into cleanup-cli

cli/src/base64.cpp

@@ -18,9 +18,10 @@ std::vector<char> base64::decodeVector(const std::string &val) {
   using namespace boost::archive::iterators;
   using It =
       transform_width<binary_from_base64<std::string::const_iterator>, 8, 6>;
-  return boost::algorithm::trim_right_copy_if(
-      std::vector<char>(It(std::begin(val)), It(std::end(val))),
-      [](char c) { return c == '\0'; });
+  std::vector<char> ret =
+      std::vector<char>(It(std::begin(val)), It(std::end(val)));
+  ret.pop_back();
+  return ret;
 }
 
 std::string base64::encode(const std::string &val) {

daemon/src/base64.cpp

@@ -18,9 +18,10 @@ std::vector<char> base64::decodeVector(const std::string &val) {
   using namespace boost::archive::iterators;
   using It =
       transform_width<binary_from_base64<std::string::const_iterator>, 8, 6>;
-  return boost::algorithm::trim_right_copy_if(
-      std::vector<char>(It(std::begin(val)), It(std::end(val))),
-      [](char c) { return c == '\0'; });
+  std::vector<char> ret =
+      std::vector<char>(It(std::begin(val)), It(std::end(val)));
+  ret.pop_back();
+  return ret;
 }
 
 std::string base64::encode(const std::string &val) {