Message-ID: Date: Fri, 29 Jul 2022 09:48:40 +0200 MIME-Version: 1.0 Content-Language: en-US References: <20220624083809.23487-11-a@...2181...> <20220728193542.14801-1-a@...2181...> From: Antonio Quartulli In-Reply-To: Subject: Re: [Openvpn-devel] [PATCH v2 10/25] dco: periodically check and possibly rotate/delete keys List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit To: Frank Lichtenheld , openvpn-devel@lists.sourceforge.net Hi, On 29/07/2022 09:41, Frank Lichtenheld wrote: > On Thu, Jul 28, 2022 at 09:35:42PM +0200, Antonio Quartulli wrote: >> Data channel keys are periodically regenarated and installed in >> ovpn-dco. >> However, there is a certain moment when keys are rotated in order >> to elect the new primary one. >> >> Check the key status in userspace so that kernelspace can be informed as >> well when rotations happen. > [...] > > Small musings about the code comments: > >> +void >> +dco_update_keys(dco_context_t *dco, struct tls_multi *multi) >> +{ >> + msg(D_DCO_DEBUG, "%s: peer_id=%d", __func__, multi->peer_id); >> + >> + /* this function checks if keys have to be swapped or erased, therefore it >> + * can't do much if we don't have any key installed >> + */ >> + if (multi->dco_keys_installed == 0) >> + { >> + return; >> + } >> + >> + struct key_state *primary = tls_select_encryption_key(multi); >> + /* either we have no primary key at all or, if we do, it must have been >> + * installed already (keys are installed upon generation in the TLS code) >> + */ >> + ASSERT(!primary || primary->dco_status != DCO_NOT_INSTALLED); >> + >> + /* no primary key available -> no usable key exists, therefore we should >> + * tell DCO to simply wipe all keys >> + */ >> + if (!primary) >> + { >> + msg(D_DCO, "No encryption key found. Purging data channel keys"); >> + >> + dco_del_key(dco, multi->peer_id, OVPN_KEY_SLOT_PRIMARY); >> + dco_del_key(dco, multi->peer_id, OVPN_KEY_SLOT_SECONDARY); >> + multi->dco_keys_installed = 0; >> + return; >> + } >> + >> + struct key_state *secondary = dco_get_secondary_key(multi, primary); >> + /* same reason as the primary key above */ >> + ASSERT(!secondary || secondary->dco_status != DCO_NOT_INSTALLED); >> + >> + /* the current primary key was installed as secondary in DCO, this means >> + * that userspace has promoted it and we should tell DCO to swap keys > > I found the use of "userspace" here a bit confusing. This code is part of userspace, > right? So wouldn't it be easier to say "we have promoted it"? Sure - whatever makes it easier to understand. > >> + */ >> + if (primary->dco_status == DCO_INSTALLED_SECONDARY) >> + { >> + msg(D_DCO_DEBUG, "Swapping primary and secondary keys, now: id1=%d id2=%d", >> + primary->key_id, secondary ? secondary->key_id : -1); >> + >> + dco_swap_keys(dco, multi->peer_id); >> + primary->dco_status = DCO_INSTALLED_PRIMARY; >> + if (secondary) >> + { >> + secondary->dco_status = DCO_INSTALLED_SECONDARY; >> + } >> + } >> + >> + /* if we have no secondary key anymore, inform DCO about it */ >> + if (!secondary && multi->dco_keys_installed == 2) >> + { >> + dco_del_key(dco, multi->peer_id, OVPN_KEY_SLOT_SECONDARY); >> + multi->dco_keys_installed = 1; >> + } >> + >> + /* all keys that are not installed are set to NOT installed */ >> + for (int i = 0; i < KEY_SCAN_SIZE; ++i) >> + { >> + struct key_state *ks = get_key_scan(multi, i); >> + if (ks != primary && ks != secondary) >> + { >> + ks->dco_status = DCO_NOT_INSTALLED; >> + } >> + } >> +} >> + >> static bool >> dco_check_option_conflict_platform(int msglevel, const struct options *o) >> { >> diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h >> index 1692f5c3..b926e236 100644 >> --- a/src/openvpn/dco.h >> +++ b/src/openvpn/dco.h >> @@ -132,6 +132,14 @@ int init_key_dco_bi(struct tls_multi *multi, struct key_state *ks, >> const struct key2 *key2, int key_direction, >> const char *ciphername, bool server); >> >> +/** >> + * Possibly swap or wipe keys from DCO > > I would actually prefer to be a bit more explicit here: > "Sync our key status to DCO, potentially swapping or wiping keys" Makes sense. Thanks > >> + * >> + * @param dco DCO device context >> + * @param multi TLS multi instance >> + */ >> +void dco_update_keys(dco_context_t *dco, struct tls_multi *multi); >> + >> #else /* if defined(ENABLE_DCO) */ >> >> typedef void *dco_context_t; > [...] > > > Regards, -- Antonio Quartulli