upstream/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2026-06-09 08:59:57 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Use key_state instead of multi for tls_send_payload parameter

Browse source 
Currently, this function and other parts of OpenVPN assume that
multi->session[TM_ACTIVE].key[KS_PRIMARY] is always the right session
to send control message.

This assumption was only achieve through complicated session moving and
shuffling in our state machine in the past. The old logic basically also
always assumed that control messages are always for fully authenticated
clients. This assumption was never really true (see AUTH_FAILED message)
but has been broken even more by auth-pending. Cleaning up the state machine
transitions in 7dcde87b7a broke this assumption even more.

This change now allows to specify the key_state/TLS session that is used to
send the control message.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20230301135353.2811069-1-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg26319.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 06af538eb7)
This commit is contained in:
Arne Schwabe 2023-03-01 14:53:52 +01:00 committed by Gert Doering
parent a05ec70edd
commit 31279f71ab
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/openvpn/forward.c
View file

@ -372,8 +372,11 @@ send_control_channel_string_dowork(struct tls_multi *multi,
struct gc_arena gc = gc_new();
bool stat;
ASSERT(multi);
struct key_state *ks = get_key_scan(multi, 0);
/* buffered cleartext write onto TLS control channel */
stat = tls_send_payload(multi, (uint8_t *) str, strlen(str) + 1);
stat = tls_send_payload(ks, (uint8_t *) str, strlen(str) + 1);
msg(msglevel, "SENT CONTROL [%s]: '%s' (status=%d)",
tls_common_name(multi, false),

7
src/openvpn/ssl.c
View file

@ -4007,18 +4007,15 @@ tls_post_encrypt(struct tls_multi *multi, struct buffer *buf)
*/
bool
tls_send_payload(struct tls_multi *multi,
tls_send_payload(struct key_state *ks,
const uint8_t *data,
int size)
{
struct key_state *ks;
bool ret = false;
tls_clear_error();
ASSERT(multi);
ks = get_key_scan(multi, 0);
ASSERT(ks);
if (ks->state >= S_ACTIVE)
{

2
src/openvpn/ssl.h
View file

@ -424,7 +424,7 @@ void ssl_put_auth_challenge(const char *cr_str);
/*
* Send a payload over the TLS control channel
*/
bool tls_send_payload(struct tls_multi *multi,
bool tls_send_payload(struct key_state *ks,
const uint8_t *data,
int size);