diff options
| author | Arne Schwabe | 2020-04-16 13:39:30 +0200 |
|---|---|---|
| committer | Gert Doering | 2020-04-19 12:33:38 +0200 |
| commit | 9cf7b4925a54d93fbea1cadcf3dc0e11f3ce358f (patch) | |
| tree | 6697aac029015cbc7e8b7f46412236ce0fa9fe62 /src/openvpn/ssl.c | |
| parent | cbde07f474ae9e92b329475767c4660dd35b4ee4 (diff) | |
| download | openvpn-9cf7b4925a54d93fbea1cadcf3dc0e11f3ce358f.zip openvpn-9cf7b4925a54d93fbea1cadcf3dc0e11f3ce358f.tar.gz | |
Another round of uncrustify code cleanup.
After the last big formatting patch a number of changes have been
commited that do not conform with our style/uncrustify config. This
has lead to the problem that running uncrustify on before sending
PR some of the changes made by uncrustify need to be backed out again.
To bring everything back to the agreed upon style, run uncrustify once
more. Uncrustify version used:
Uncrustify-0.70.1_f
I double checked the result by running uncrustify (Uncrustify-0.69.0_f)
from Ubuntu focal/20.04 which does not do any further changes and
uncrustify 0.66.1_f from Ubuntu bionic/18.04
Signed-off-by: Arne Schwabe <arne@rfc2549.org>
Acked-by: Gert Doering <gert@greenie.muc.de>
Message-Id: <20200416113930.15192-3-arne@rfc2549.org>
URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg19750.html
Signed-off-by: Gert Doering <gert@greenie.muc.de>
Diffstat (limited to 'src/openvpn/ssl.c')
| -rw-r--r-- | src/openvpn/ssl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 56d0576..80e0d5a 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -466,7 +466,7 @@ ssl_set_auth_token(const char *token) * Cleans an auth token and checks if it was active */ bool -ssl_clean_auth_token (void) +ssl_clean_auth_token(void) { bool wasdefined = auth_token.defined; purge_user_pass(&auth_token, true); @@ -2015,7 +2015,7 @@ tls_session_update_crypto_params(struct tls_session *session, { frame_remove_from_extra_frame(frame_fragment, crypto_max_overhead()); crypto_adjust_frame_parameters(frame_fragment, &session->opt->key_type, - options->replay, packet_id_long_form); + options->replay, packet_id_long_form); frame_set_mtu_dynamic(frame_fragment, options->ce.fragment, SET_MTU_UPPER_BOUND); frame_print(frame_fragment, D_MTU_INFO, "Fragmentation MTU parms"); } @@ -2411,7 +2411,9 @@ key_method_2_write(struct buffer *buf, struct tls_session *session) * username/password */ if (auth_token.defined) + { up = &auth_token; + } if (!write_string(buf, up->username, -1)) { |