commit 4ce0bcf3f653c2727ca5608bf804dcd5fe4ea506
author Junxiao Shi <git@mail1.yoursunny.com> Sat Sep 03 07:09:03 2016 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sat Sep 03 07:09:03 2016 +0000
tree 272a9a2e0197a562997d8a9fe0c4d622a3c38b07
parent 5a67310e89e02f1f5290901b57637e86b7d00104

util: io::load accepts base64 encoding without newlines

This commit also renames io::BASE_64 to io::BASE64.

refs #3741

Change-Id: I46286c72d12e685902a72ce8dab4a1385dc0fceb

tests/unit-tests/security/dummy-keychain.cpp

diff --git a/tests/unit-tests/security/dummy-keychain.cpp b/tests/unit-tests/security/dummy-keychain.cpp
index 947bebf..c173117 100644
--- a/tests/unit-tests/security/dummy-keychain.cpp
+++ b/tests/unit-tests/security/dummy-keychain.cpp
@@ -114,9 +114,8 @@
 {
   static shared_ptr<v1::PublicKey> publicKey = nullptr;
   if (publicKey == nullptr) {
-    typedef boost::iostreams::stream<boost::iostreams::array_source> arrayStream;
-    arrayStream
-    is(reinterpret_cast<const char*>(DUMMY_CERT), sizeof(DUMMY_CERT));
+    typedef boost::iostreams::stream<boost::iostreams::array_source> ArrayStream;
+    ArrayStream is(reinterpret_cast<const char*>(DUMMY_CERT), sizeof(DUMMY_CERT));
     auto cert = io::load<v1::IdentityCertificate>(is, io::NO_ENCODING);
     publicKey = make_shared<v1::PublicKey>(cert->getPublicKeyInfo());
   }
@@ -146,10 +145,9 @@
 {
   static shared_ptr<v1::IdentityCertificate> cert = nullptr;
   if (cert == nullptr) {
-    typedef boost::iostreams::stream<boost::iostreams::array_source> arrayStream;
-    arrayStream
-    is(reinterpret_cast<const char*>(DUMMY_CERT), sizeof(DUMMY_CERT));
-    cert = io::load<v1::IdentityCertificate>(is, io::BASE_64);
+    typedef boost::iostreams::stream<boost::iostreams::array_source> ArrayStream;
+    ArrayStream is(reinterpret_cast<const char*>(DUMMY_CERT), sizeof(DUMMY_CERT));
+    cert = io::load<v1::IdentityCertificate>(is);
   }
 
   return cert;