[Openvpn-devel] options.c: fix version reported in --cipher warning message

Message ID 20211229172714.6424-1-a@unstable.cc
State Accepted
Headers show
Series
  • [Openvpn-devel] options.c: fix version reported in --cipher warning message
Related show

Commit Message

Antonio Quartulli Dec. 29, 2021, 5:27 p.m.
BF-CBC is the default value for the --cipher option in OpenVPN <2.5
and not <2.6. However, the warning printed to screen talks about
"OpenVPN before 2.6", which is wrong and needs to be fixed.

Fix message by saying ".. before 2.5"

Cc: Arne Schwabe <arne@rfc2549.org>
Signed-off-by: Antonio Quartulli <a@unstable.cc>
---
 src/openvpn/options.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Arne Schwabe Dec. 29, 2021, 6:23 p.m. | #1
Am 29.12.21 um 18:27 schrieb Antonio Quartulli:
> BF-CBC is the default value for the --cipher option in OpenVPN <2.5
> and not <2.6. However, the warning printed to screen talks about
> "OpenVPN before 2.6", which is wrong and needs to be fixed.
> 
> Fix message by saying ".. before 2.5"

Technically it is still the default value but not added to data-ciphers 
anymore but that doesn't matter for the message :)

Acked-By: Arne Schwabe <arne@rfc2549.org>
Gert Doering Dec. 29, 2021, 7:48 p.m. | #2
Your patch has been applied to the master branch.

commit 7747e0bcdb92f0a3f0f7b27ca7d97194fb8efa97
Author: Antonio Quartulli
Date:   Wed Dec 29 18:27:14 2021 +0100

     options.c: fix version reported in --cipher warning message

     Signed-off-by: Antonio Quartulli <a@unstable.cc>
     Acked-by: Arne Schwabe <arne@rfc2549.org>
     Message-Id: <20211229172714.6424-1-a@unstable.cc>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg23477.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index b840b767..6fdcf764 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -3120,7 +3120,7 @@  options_postprocess_cipher(struct options *o)
          * parts of OpenVPN assert that the ciphername is set */
         o->ciphername = "BF-CBC";
 
-        msg(M_INFO, "Note: --cipher is not set. OpenVPN versions before 2.6 "
+        msg(M_INFO, "Note: --cipher is not set. OpenVPN versions before 2.5 "
                     "defaulted to BF-CBC as fallback when cipher negotiation "
                     "failed in this case. If you need this fallback please add "
                     "'--data-ciphers-fallback 'BF-CBC' to your configuration "