Re: [Openvpn-devel] [PATCH] Fix tls-auth/crypt in connection blocks with --persist-key

2019-01-22 Thread Arne Schwabe
Am 19.01.19 um 11:30 schrieb Steffan Karger:
> 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.

Acked-By: Arne Schabe 
This also changes the logic to be similar with the other logic used in
the function.

Arne



signature.asc
Description: OpenPGP digital signature
___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel


[Openvpn-devel] [PATCH] Fix tls-auth/crypt in connection blocks with --persist-key

2019-01-19 Thread Steffan Karger
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.

Signed-off-by: Steffan Karger 
---
 src/openvpn/options.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/openvpn/options.c b/src/openvpn/options.c
index 0cf8db767..3d4da38d9 100644
--- a/src/openvpn/options.c
+++ b/src/openvpn/options.c
@@ -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, >gc);
+struct buffer in = buffer_read_from_file(ce->tls_auth_file, 
>gc);
 if (!buf_valid())
 {
 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;
-- 
2.17.1



___
Openvpn-devel mailing list
Openvpn-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openvpn-devel