From: Arne Schwabe Date: Thu, 22 Apr 2021 15:17:19 +0000 (+0200) Subject: Use functions to access key_state instead direct member access X-Git-Tag: v2.6_beta1~522 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a80bec331ec65efbbec1adb7892e242589c238ef;p=thirdparty%2Fopenvpn.git Use functions to access key_state instead direct member access This uses get_key_scan and get_primary key instead the directly accessing the members of the struct to improve readability of the code. Signed-off-by: Arne Schwabe Acked-by: Antonio Quartulli Message-Id: <20210422151724.2132573-2-arne@rfc2549.org> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg22200.html Signed-off-by: Gert Doering --- diff --git a/src/openvpn/multi.c b/src/openvpn/multi.c index cfa8f87d1..32e2821d3 100644 --- a/src/openvpn/multi.c +++ b/src/openvpn/multi.c @@ -1799,8 +1799,7 @@ multi_client_set_protocol_options(struct context *c) * cipher -> so log the fact and push the "what we have now" cipher * (so the client is always told what we expect it to use) */ - const struct tls_session *session = &tls_multi->session[TM_ACTIVE]; - if (session->key[KS_PRIMARY].crypto_options.key_ctx_bi.initialized) + if (get_primary_key(tls_multi)->crypto_options.key_ctx_bi.initialized) { msg(M_INFO, "PUSH: client wants to negotiate cipher (NCP), but " "server has already generated data channel keys, " diff --git a/src/openvpn/push.c b/src/openvpn/push.c index 2e92d8ee2..99aaa3e3e 100644 --- a/src/openvpn/push.c +++ b/src/openvpn/push.c @@ -222,7 +222,7 @@ receive_cr_response(struct context *c, const struct buffer *buffer) struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; struct man_def_auth_context *mda = session->opt->mda_context; struct env_set *es = session->opt->es; - int key_id = session->key[KS_PRIMARY].key_id; + int key_id = get_primary_key(c->c2.tls_multi)->key_id; management_notify_client_cr_response(key_id, mda, es, m); @@ -300,7 +300,7 @@ receive_auth_pending(struct context *c, const struct buffer *buffer) "to %us", c->options.handshake_window, min_uint(max_timeout, server_timeout)); - struct key_state *ks = &c->c2.tls_multi->session[TM_ACTIVE].key[KS_PRIMARY]; + const struct key_state *ks = get_primary_key(c->c2.tls_multi); c->c2.push_request_timeout = ks->established + min_uint(max_timeout, server_timeout); } @@ -365,7 +365,7 @@ bool send_auth_pending_messages(struct tls_multi *tls_multi, const char *extra, unsigned int timeout) { - struct key_state *ks = &tls_multi->session[TM_ACTIVE].key[KS_PRIMARY]; + struct key_state *ks = get_key_scan(tls_multi, 0); static const char info_pre[] = "INFO_PRE,"; @@ -472,8 +472,7 @@ cleanup: bool send_push_request(struct context *c) { - struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; - struct key_state *ks = &session->key[KS_PRIMARY]; + const struct key_state *ks = get_primary_key(c->c2.tls_multi); /* We timeout here under two conditions: * a) we reached the hard limit of push_request_timeout diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index 69d90e868..b16f6bcc5 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -3425,7 +3425,7 @@ tls_pre_decrypt(struct tls_multi *multi, if (i == TM_SIZE && is_hard_reset_method2(op)) { struct tls_session *session = &multi->session[TM_ACTIVE]; - struct key_state *ks = &session->key[KS_PRIMARY]; + const struct key_state *ks = get_primary_key(multi); /* * If we have no session currently in progress, the initial packet will @@ -3910,7 +3910,6 @@ tls_send_payload(struct tls_multi *multi, const uint8_t *data, int size) { - struct tls_session *session; struct key_state *ks; bool ret = false; @@ -3918,8 +3917,7 @@ tls_send_payload(struct tls_multi *multi, ASSERT(multi); - session = &multi->session[TM_ACTIVE]; - ks = &session->key[KS_PRIMARY]; + ks = get_key_scan(multi, 0); if (ks->state >= S_ACTIVE) { @@ -3948,16 +3946,13 @@ bool tls_rec_payload(struct tls_multi *multi, struct buffer *buf) { - struct tls_session *session; - struct key_state *ks; bool ret = false; tls_clear_error(); ASSERT(multi); - session = &multi->session[TM_ACTIVE]; - ks = &session->key[KS_PRIMARY]; + struct key_state *ks = get_key_scan(multi, 0); if (ks->state >= S_ACTIVE && BLEN(&ks->plaintext_read_buf)) { diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index ffd2679e8..769d885a3 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -545,7 +545,7 @@ tls_test_payload_len(const struct tls_multi *multi) { if (multi) { - const struct key_state *ks = &multi->session[TM_ACTIVE].key[KS_PRIMARY]; + const struct key_state *ks = get_primary_key(multi); if (ks->state >= S_ACTIVE) { return BLEN(&ks->plaintext_read_buf); diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 0b2b8c931..4ce6983c5 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -624,4 +624,13 @@ get_key_scan(struct tls_multi *multi, int index) } } +/** gets an item of \c key_state objects in the + * order they should be scanned by data + * channel modules. */ +static inline const struct key_state * +get_primary_key(const struct tls_multi *multi) +{ + return &multi->session[TM_ACTIVE].key[KS_PRIMARY]; +} + #endif /* SSL_COMMON_H_ */