OpenVPN/openvpn
1
0
Fork 0
mirror of https://github.com/OpenVPN/openvpn.git synced 2025-05-09 05:31:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

misc.c: remove unused code

Browse Source 
Commit

  3a4fb1 "Ensure --auth-nocache is handled during renegotiation"

has changed the behavior of set_auth_token(), but left unused parameter

  struct user_pass *up

Remove this parameter and amend comments accordingly. Also remove
unused function definition from misc.h.

Signed-off-by: Lev Stipakov <lev@openvpn.net>
Acked-by: Frank Lichtenheld <frank@lichtenheld.com>

Change-Id: Ic440f2c8d46dfcb5ff41ba2f33bf28bb7286eec4
Message-Id: <20240329103739.28254-1-gert@greenie.muc.de>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg28503.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
(cherry picked from commit 4c71e816031f564f834df695b3fa717ea22720d2)
This commit is contained in:
Lev Stipakov 2024-03-29 11:37:39 +01:00 committed by Gert Doering
parent ea0d9c70a4
commit f50c67707e
3 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/openvpn/misc.c
View File

@ -491,19 +491,15 @@ purge_user_pass(struct user_pass *up, const bool force)
}
void
set_auth_token(struct user_pass *up, struct user_pass *tk, const char *token)
set_auth_token(struct user_pass *tk, const char *token)
{
if (strlen(token))
{
strncpynt(tk->password, token, USER_PASS_LEN);
tk->token_defined = true;
/*
* --auth-token has no username, so it needs the username
* either already set or copied from up, or later set by
* --auth-token-user
* If already set, tk is fully defined.
* If username already set, tk is fully defined.
*/
if (strlen(tk->username))
{

12
src/openvpn/misc.h
View File

@ -135,26 +135,18 @@ get_user_pass(struct user_pass *up,
return get_user_pass_cr(up, auth_file, prefix, flags, NULL);
}
void fail_user_pass(const char *prefix,
const unsigned int flags,
const char *reason);
void purge_user_pass(struct user_pass *up, const bool force);
/**
* Sets the auth-token to token. If a username is available from
* either up or already present in tk that will be used as default
* username for the token. The method will also purge up if
* Sets the auth-token to token. The method will also purge up if
* the auth-nocache option is active.
*
* @param up (non Auth-token) Username/password
* @param tk auth-token userpass to set
* @param token token to use as password for the auth-token
*
* @note all parameters to this function must not be null.
*/
void set_auth_token(struct user_pass *up, struct user_pass *tk,
const char *token);
void set_auth_token(struct user_pass *tk, const char *token);
/**
* Sets the auth-token username by base64 decoding the passed

2
src/openvpn/ssl.c
View File

@ -504,7 +504,7 @@ ssl_set_auth_nocache(void)
void
ssl_set_auth_token(const char *token)
{
set_auth_token(&auth_user_pass, &auth_token, token);
set_auth_token(&auth_token, token);
}
void