Skip to contentSkip to conversation

Fix tls-auth/crypt in connection blocks with --persist-key

PATCH Superseded Steffan Karger 3 participants 5 messages Jan 19, 2019 – Jan 22, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Fix tls-auth/crypt in connection blocks with --persist-key

If --persist-key was used, we would always try to pre-load the 'global' tls-auth/crypt file. That would result in using the wrong key (leading to a failed connection) or en error is there was to 'global' key:

Sat Jan 19 11:09:01 2019 Cannot pre-load tls-auth keyfile ((null)) Sat Jan 19 11:09:01 2019 Exiting due to fatal error

Fix that by loading loading the key from the current connection entry.

---
 src/openvpn/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
src/openvpn/options.c +2 -2
index 0cf8db767..3d4da38d9 100644
@@ -2863,11 +2863,11 @@ options_postprocess_mutate_ce(struct options *o, struct connection_entry *ce)
     {
         if (ce->tls_auth_file && !ce->tls_auth_file_inline)
         {
-            struct buffer in = buffer_read_from_file(o->tls_auth_file, &o->gc);
+            struct buffer in = buffer_read_from_file(ce->tls_auth_file, &o->gc);
             if (!buf_valid(&in))
             {
                 msg(M_FATAL, "Cannot pre-load tls-auth keyfile (%s)",
-                    o->tls_auth_file);
+                    ce->tls_auth_file);
             }
 
             ce->tls_auth_file = INLINE_FILE_TAG;
Signature · 1 line
2.17.1
#1 lore raw

PATCH v2 1/1 Fix tls-auth/crypt in connection blocks with --persist-key

If --persist-key was used, we would always try to pre-load the 'global' tls-auth/crypt file. That would result in using the wrong key (leading to a failed connection) or en error is there was to 'global' key:

Sat Jan 19 11:09:01 2019 Cannot pre-load tls-auth keyfile ((null)) Sat Jan 19 11:09:01 2019 Exiting due to fatal error

Fix that by loading loading the key from the current connection entry.

---
v2: Also fix tls-crypt, not just tls-auth.

 src/openvpn/options.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
src/openvpn/options.c +4 -4
index 0cf8db767..bebd30059 100644
@@ -2863,11 +2863,11 @@ options_postprocess_mutate_ce(struct options *o, struct connection_entry *ce)
     {
         if (ce->tls_auth_file && !ce->tls_auth_file_inline)
         {
-            struct buffer in = buffer_read_from_file(o->tls_auth_file, &o->gc);
+            struct buffer in = buffer_read_from_file(ce->tls_auth_file, &o->gc);
             if (!buf_valid(&in))
             {
                 msg(M_FATAL, "Cannot pre-load tls-auth keyfile (%s)",
-                    o->tls_auth_file);
+                    ce->tls_auth_file);
             }
 
             ce->tls_auth_file = INLINE_FILE_TAG;
@@ -2876,11 +2876,11 @@ options_postprocess_mutate_ce(struct options *o, struct connection_entry *ce)
 
         if (ce->tls_crypt_file && !ce->tls_crypt_inline)
         {
-            struct buffer in = buffer_read_from_file(o->tls_crypt_file, &o->gc);
+            struct buffer in = buffer_read_from_file(ce->tls_crypt_file, &o->gc);
             if (!buf_valid(&in))
             {
                 msg(M_FATAL, "Cannot pre-load tls-crypt keyfile (%s)",
-                    o->tls_auth_file);
+                    ce->tls_crypt_file);
             }
 
             ce->tls_crypt_file = INLINE_FILE_TAG;
Signature · 1 line
2.17.1
Acked-by on v1 1/1
#4 lore raw
In reply to Steffan Karger

Am 19.01.19 um 11:30 schrieb Steffan Karger:

Quoted 8 lines

If --persist-key was used, we would always try to pre-load the 'global' tls-auth/crypt file. That would result in using the wrong key (leading to a failed connection) or en error is there was to 'global' key:

Sat Jan 19 11:09:01 2019 Cannot pre-load tls-auth keyfile ((null)) Sat Jan 19 11:09:01 2019 Exiting due to fatal error

Fix that by loading loading the key from the current connection entry.

This also changes the logic to be similar with the other logic used in the function.

Arne

Acked-by on v2 1/1
#2 lore raw
In reply to Steffan Karger

Am 19.01.19 um 11:34 schrieb Steffan Karger:

Quoted 9 lines

If --persist-key was used, we would always try to pre-load the 'global' tls-auth/crypt file. That would result in using the wrong key (leading to a failed connection) or en error is there was to 'global' key:

Sat Jan 19 11:09:01 2019 Cannot pre-load tls-auth keyfile ((null)) Sat Jan 19 11:09:01 2019 Exiting due to fatal error

Fix that by loading loading the key from the current connection entry.

This also changes the logic to be similar with the other logic used in the function. The bug is pretty obvious by just looking at the code.

Arne

#3 lore raw
In reply to Steffan Karger

Your patch has been applied to the master branch.

(I had a look at the patch as well, and second the ACK :) )

commit dcfc51457789d8a62ff8bd266dd3a3bf0a0c9763

Author: Steffan Karger
Date:   Sat Jan 19 11:34:00 2019 +0100
     Fix tls-auth/crypt in connection blocks with --persist-key

     Signed-off-by: Steffan Karger <[email protected]...>
     Acked-by: Arne Schwabe <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg18123.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering