Merge remote-tracking branch 'origin/new_aead'

Author: goatpig

cppForSwig/AsyncClient.cpp

@@ -73,12 +73,12 @@ void BlockDataViewer::addPublicKey(const SecureBinaryData& pubkey)
 ///////////////////////////////////////////////////////////////////////////////
 shared_ptr<BlockDataViewer> BlockDataViewer::getNewBDV(const string& addr,
    const string& port, const string& datadir, const PassphraseLambda& passLbd,
-   const bool& ephemeralPeers,
+   const bool& ephemeralPeers, bool oneWayAuth,
    shared_ptr<RemoteCallback> callbackPtr)
 {
    //create socket object
    auto sockptr = make_shared<WebSocketClient>(addr, port, datadir, passLbd,
-      ephemeralPeers, callbackPtr);
+      ephemeralPeers, oneWayAuth, callbackPtr);
 
    //instantiate bdv object
    BlockDataViewer* bdvPtr = new BlockDataViewer(sockptr);

cppForSwig/AsyncClient.h

@@ -427,7 +427,7 @@ namespace AsyncClient
       static std::shared_ptr<BlockDataViewer> getNewBDV(
          const std::string& addr, const std::string& port,
          const std::string& datadir, const PassphraseLambda&,
-         const bool& ephemeralPeers,
+         const bool& ephemeralPeers, bool oneWayAuth,
          std::shared_ptr<RemoteCallback> callbackPtr);
 
       void registerWithDB(BinaryData magic_word);