From: Steffan Karger <steffan.karger@fox-it.com>
Date: Mon, 15 May 2017 14:43:55 +0000 (+0200)
Subject: Log the negotiated (NCP) cipher
X-Git-Tag: v2.5_beta1~693
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4071dd1553ea5a70ab03659c623ff2ceeefaf9e;p=thirdparty%2Fopenvpn.git

Log the negotiated (NCP) cipher

To make it clear that NCP is in effect, print a log message (at --verb 2)
to show that we selected a cipher using NCP.

Signed-off-by: Steffan Karger <steffan.karger@fox-it.com>
Acked-by: Arne Schwabe <arne@rfc2549.org>
Message-Id: <1494859435-16379-1-git-send-email-steffan.karger@fox-it.com>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg14656.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
---

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 21c9d6f76..3d5e8241c 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1959,6 +1959,12 @@ tls_session_update_crypto_params(struct tls_session *session,
         return false;
     }
 
+    if (strcmp(options->ciphername, session->opt->config_ciphername))
+    {
+        msg(D_HANDSHAKE, "Data Channel: using negotiated cipher '%s'",
+            options->ciphername);
+    }
+
     init_key_type(&session->opt->key_type, options->ciphername,
                   options->authname, options->keysize, true, true);