Remove auth_user_pass.wait_for_push variable
PATCH 1/1 Remove auth_user_pass.wait_for_push variable
This variable was first introduce in earlier attempt to fix the auth-token problems with auth-nocache before user_password and auth_token were split into two variables. The idea of the variable it is being set if --pull is in use. However the variable was not always set correctly, especially if username/password are queried after an expired auth-token. Instead using that variable use session->opt->pull directly.
Signed-off-by Arne Schwabe <[email protected]...>
--- src/openvpn/manage.c | 1 - src/openvpn/misc.h | 1 - src/openvpn/ssl.c | 7 +++---- 3 files changed, 3 insertions(+), 6 deletions(-)
src/openvpn/manage.c +0 -1
@@ -3579,7 +3579,6 @@ management_query_user_pass(struct management *man, {/* preserve caller's settings */ man->connection.up_query.nocache = up->nocache; - man->connection.up_query.wait_for_push = up->wait_for_push; *up = man->connection.up_query; }secure_memzero (&man->connection.up_query,sizeof (man->connection.up_query));
src/openvpn/misc.h +0 -1
@@ -64,7 +64,6 @@ struct user_pass {bool defined;bool nocache; -bool wait_for_push;/* true if this object is waiting for a push-reply */ /* max length of username/password */ #ifdef ENABLE_PKCS11
src/openvpn/ssl.c +3 -4
@@ -434,8 +434,6 @@ ssl_set_auth_nocache(void) { passbuf.nocache = true; auth_user_pass.nocache = true; -/* wait for push-reply, because auth-token may still need the username */ - auth_user_pass.wait_for_push = true; }/*
@@ -2414,14 +2412,15 @@ key_method_2_write(struct buffer *buf, struct tls_session *session) }/* if auth-nocache was specified, the auth_user_pass object reaches * a "complete" state only after having received the push-reply -* message. +* message. The push message might contain an auth-token that needs +* the username of auth_user_pass. * * For this reason, skip the purge operation here if no push-reply * message has been received yet. * * This normally happens upon first negotiation only. */ -if (!auth_user_pass.wait_for_push) +if (!session->opt->pull) {purge_user_pass (&auth_user_pass, false); }
Signature · 1 line
2.26.2