tls: removed newline character from cipher message string

bareos · Jan 4, 2019 · e66646a · e66646a
1 parent d3a2a44
commit e66646a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/core/src/dird/fd_cmds.cc b/core/src/dird/fd_cmds.cc
@@ -183,6 +183,7 @@ static void SendInfoChosenCipher(JobControlRecord *jcr, UaContext *ua)
 {
    std::string str;
    jcr->file_bsock->GetCipherMessageString(str);
+   str += '\n';
    if (jcr->JobId != 0) {
       Jmsg(jcr, M_INFO, 0, str.c_str());
    }

diff --git a/core/src/lib/bsock.cc b/core/src/lib/bsock.cc
@@ -623,17 +623,17 @@ void BareosSocket::GetCipherMessageString(std::string &str) const
      std::string m;
      m = " Encryption: ";
      m += tls_conn->TlsCipherGetName();
-     m += "\n";
      str = m;
    } else {
-     str = " Encryption: None\n";
+     str = " Encryption: None";
    }
 }
 
 void BareosSocket::OutputCipherMessageString(std::function<void(const char *)> output_cb)
 {
    std::string str;
    GetCipherMessageString(str);
+   str += '\n';
    output_cb(str.c_str());
 }
 

diff --git a/core/src/tests/bsock_test_connection_setup.cc b/core/src/tests/bsock_test_connection_setup.cc
@@ -145,6 +145,7 @@ static void CheckEncryption(const BareosSocket *UA_sock,
      EXPECT_TRUE(UA_sock->tls_conn.get());
      std::string cipher;
      UA_sock->GetCipherMessageString(cipher);
+     cipher += '\n';
      std::cout << cipher;
    }
 }