| Message ID | 20210520151148.2565578-9-arne@rfc2549.org |
|---|---|
| State | Superseded |
| Delegated to: | Antonio Quartulli |
| Headers | show |
| Series | [Openvpn-devel,v2,1/9] Move auth_token_state from multi to key_state | expand |
Hi, This patch does not apply on top of master + v6-cleanup + 8/9 Can you rebase it? or maybe you you can point me to some commit in your branch that I can pull for now? Cheers,
Am 20.07.21 um 02:00 schrieb Antonio Quartulli: > Hi, > > This patch does not apply on top of master + v6-cleanup + 8/9 > Can you rebase it? or maybe you you can point me to some commit in your > branch that I can pull for now? > > Cheers, > > Sure the dco branch on github.com/schwabe/openvpn is up to date. Arne
Hi, On 20/05/2021 17:11, Arne Schwabe wrote: > Currently P2P mode of OpenVPN is on of the few places that cannot negotiate > modern OpenVPN features. This becomes more and more problematic since P2P and > P2MP code diverge more and more and also the lack of switching to more > advanced features like Data v2 currently blocks P2P mode from working > together with the upcoming ovpn-dco support. > > This NCP support is a lot simpler and works in the following way: > > - P2P peer announce an extremely limited IV_ variable set > (IV_PROTO and IV_CIPHERS) > - Both peers check if the IV_PROTO_NCP_P2P bit is present in IV_PROTO > - if yes both sides deterministically determine according to > IV_PROTO and IV_CIPHER what options can be used and start using these > > There are no poor man's NCP or other compatibility workaround like in the > normal NCP, making this NCP leaner and more deterministic. > > Signed-off-by: Arne Schwabe <arne@rfc2549.org> > --- > src/openvpn/init.c | 100 ++++++++++++++++--- > src/openvpn/options.c | 8 +- > src/openvpn/ssl.c | 120 +++++++++++++++-------- > src/openvpn/ssl.h | 5 + > src/openvpn/ssl_backend.h | 1 + > src/openvpn/ssl_common.h | 10 ++ > src/openvpn/ssl_ncp.c | 145 ++++++++++++++++++++++++++++ > src/openvpn/ssl_ncp.h | 25 +++++ > tests/unit_tests/openvpn/test_ncp.c | 11 +++ > 9 files changed, 366 insertions(+), 59 deletions(-) > > diff --git a/src/openvpn/init.c b/src/openvpn/init.c > index 38abf9f3a..5d4852ae1 100644 > --- a/src/openvpn/init.c > +++ b/src/openvpn/init.c > @@ -68,6 +68,7 @@ static const char *saved_pid_file_name; /* GLOBAL */ > #define CF_INIT_TLS_AUTH_STANDALONE (1<<2) > > static void do_init_first_time(struct context *c); > +static bool do_deferred_p2p_ncp(struct context *c); > > void > context_clear(struct context *c) > @@ -2151,6 +2152,14 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found) > return false; > } > } > + else if (c->mode == MODE_POINT_TO_POINT) > + { > + if (!do_deferred_p2p_ncp(c)) > + { > + msg(D_TLS_ERRORS, "ERROR: Failed to apply P2P negotiated protocol options"); > + return false; > + } > + } > > /* if --up-delay specified, open tun, do ifconfig, and run up script now */ > if (c->options.up_delay || PULL_DEFINED(&c->options)) > @@ -2238,6 +2247,72 @@ pull_permission_mask(const struct context *c) > return flags; > } > > +static > +void adjust_mtu_peerid(struct context *c) > +{ > + frame_add_to_extra_frame(&c->c2.frame, +3); /* peer-id overhead */ any reason for the '+' before the '3'? I don't think we do that anywhere else :) > + if (!c->options.ce.link_mtu_defined) > + { > + frame_add_to_link_mtu(&c->c2.frame, +3); > + msg(D_PUSH, "OPTIONS IMPORT: adjusting link_mtu to %d", > + EXPANDED_SIZE(&c->c2.frame)); > + } > + else > + { > + msg(M_WARN, "OPTIONS IMPORT: WARNING: peer-id set, but link-mtu" > + " fixed by config - reducing tun-mtu to %d, expect" > + " MTU problems", TUN_MTU_SIZE(&c->c2.frame) ); there should be no space before the last ')' On top of that, this message seems too pessimistic? maybe the MTU was configured with a reasonably low value so everything will just work. Maybe the message can be rephrased as: "reducing tun-mtu to %d, the connection may experience issues if the configured value is not correct" > + } > +} > + > +static bool > +do_deferred_p2p_ncp(struct context *c) > +{ > + this empty line should go > + if (!c->c2.tls_multi) > + { > + return true; > + } > + > + if (c->c2.tls_multi->use_peer_id) > + { > + adjust_mtu_peerid(c); > + } > + > + struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; > + > + const char *ncp_cipher = get_p2p_ncp_cipher(session, c->c2.tls_multi->peer_info, > + &c->options.gc); > + > + if (ncp_cipher) > + { > + c->options.ciphername = ncp_cipher; > + } > + else if (!c->options.enable_ncp_fallback) > + { > + msg(D_TLS_ERRORS, "ERROR: failed to negotiate cipher with peer and " > + "--data-ciphers-fallback not enabled. No useable " useable -> usable > + "data channel cipher"); > + return false; > + } > + > + struct frame *frame_fragment = NULL; > +#ifdef ENABLE_FRAGMENT > + if (c->options.ce.fragment) > + { > + frame_fragment = &c->c2.frame_fragment; > + } > +#endif > + > + if (!tls_session_update_crypto_params(session, &c->options, &c->c2.frame, > + frame_fragment)) > + { > + msg(D_TLS_ERRORS, "ERROR: failed to set crypto cipher"); > + return false; > + } > + return true; > +} > + > /* > * Handle non-tun-related pulled options. > */ > @@ -2325,19 +2400,7 @@ do_deferred_options(struct context *c, const unsigned int found) > msg(D_PUSH, "OPTIONS IMPORT: peer-id set"); > c->c2.tls_multi->use_peer_id = true; > c->c2.tls_multi->peer_id = c->options.peer_id; > - frame_add_to_extra_frame(&c->c2.frame, +3); /* peer-id overhead */ > - if (!c->options.ce.link_mtu_defined) > - { > - frame_add_to_link_mtu(&c->c2.frame, +3); > - msg(D_PUSH, "OPTIONS IMPORT: adjusting link_mtu to %d", > - EXPANDED_SIZE(&c->c2.frame)); > - } > - else > - { > - msg(M_WARN, "OPTIONS IMPORT: WARNING: peer-id set, but link-mtu" > - " fixed by config - reducing tun-mtu to %d, expect" > - " MTU problems", TUN_MTU_SIZE(&c->c2.frame) ); > - } > + adjust_mtu_peerid(c); > } > > /* process (potentially pushed) crypto options */ > @@ -2856,16 +2919,21 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) > to.pull = options->pull; > if (options->push_peer_info) /* all there is */ > { > - to.push_peer_info_detail = 2; > + to.push_peer_info_detail = 3; > } > else if (options->pull) /* pull clients send some details */ > { > - to.push_peer_info_detail = 1; > + to.push_peer_info_detail = 2; > } > - else /* default: no peer-info at all */ > + else if (options->mode == MODE_SERVER) /* server: no peer info at all */ > { > to.push_peer_info_detail = 0; > } > + else /* default: minimal info to allow NCP in P2P mode */ > + { > + to.push_peer_info_detail = 1; > + } > + > > /* should we not xmit any packets until we get an initial > * response from client? */ > diff --git a/src/openvpn/options.c b/src/openvpn/options.c > index 2f4ccaa09..9cd88a36e 100644 > --- a/src/openvpn/options.c > +++ b/src/openvpn/options.c > @@ -3078,10 +3078,6 @@ options_postprocess_cipher(struct options *o) > { > if (!o->pull && !(o->mode == MODE_SERVER)) > { > - /* we are in the classic P2P mode */ > - msg( M_WARN, "Cipher negotiation is disabled since neither " > - "P2MP client nor server mode is enabled"); > - > /* If the cipher is not set, use the old default of BF-CBC. We will > * warn that this is deprecated on cipher initialisation, no need > * to warn here as well */ > @@ -3089,6 +3085,10 @@ options_postprocess_cipher(struct options *o) > { > o->ciphername = "BF-CBC"; > } > + else > + { > + o->enable_ncp_fallback = true; > + } > return; > } > > diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c > index dd6e462d0..8a02a2006 100644 > --- a/src/openvpn/ssl.c > +++ b/src/openvpn/ssl.c > @@ -1874,33 +1874,18 @@ cleanup: > return ret; > } > > + this empty line can go > bool > -tls_session_update_crypto_params(struct tls_session *session, > - struct options *options, struct frame *frame, > +tls_session_update_crypto_params_do_work(struct tls_session *session, > + struct options* options, struct frame *frame, > struct frame *frame_fragment) > { > if (session->key[KS_PRIMARY].crypto_options.key_ctx_bi.initialized) > { > /* keys already generated, nothing to do */ > return true; > - } > > - bool cipher_allowed_as_fallback = options->enable_ncp_fallback > - && streq(options->ciphername, session->opt->config_ciphername); > - > - if (!session->opt->server && !cipher_allowed_as_fallback > - && !tls_item_in_cipher_list(options->ciphername, options->ncp_ciphers)) > - { > - msg(D_TLS_ERRORS, "Error: pushed cipher not allowed - %s not in %s", > - options->ciphername, options->ncp_ciphers); > - /* undo cipher push, abort connection setup */ > - options->ciphername = session->opt->config_ciphername; > - return false; > } > - > - /* Import crypto settings that might be set by pull/push */ > - session->opt->crypto_flags |= options->data_channel_crypto_flags; > - > if (strcmp(options->ciphername, session->opt->config_ciphername)) > { > msg(D_HANDSHAKE, "Data Channel: using negotiated cipher '%s'", > @@ -1952,6 +1937,32 @@ tls_session_update_crypto_params(struct tls_session *session, > return tls_session_generate_data_channel_keys(session); > } > > +bool > +tls_session_update_crypto_params(struct tls_session *session, > + struct options *options, struct frame *frame, > + struct frame *frame_fragment) > +{ > + > + bool cipher_allowed_as_fallback = options->enable_ncp_fallback > + && streq(options->ciphername, session->opt->config_ciphername); > + > + if (!session->opt->server && !cipher_allowed_as_fallback > + && !tls_item_in_cipher_list(options->ciphername, options->ncp_ciphers)) > + { > + msg(D_TLS_ERRORS, "Error: negotiated cipher not allowed - %s not in %s", > + options->ciphername, options->ncp_ciphers); > + /* undo cipher push, abort connection setup */ > + options->ciphername = session->opt->config_ciphername; > + return false; > + } > + > + /* Import crypto settings that might be set by pull/push */ > + session->opt->crypto_flags |= options->data_channel_crypto_flags; > + > + return tls_session_update_crypto_params_do_work(session, options, frame, frame_fragment); > +} > + > + > static bool > random_bytes_to_buf(struct buffer *buf, > uint8_t *out, > @@ -2145,12 +2156,10 @@ push_peer_info(struct buffer *buf, struct tls_session *session) > { > struct gc_arena gc = gc_new(); > bool ret = false; > + struct buffer out = alloc_buf_gc(512 * 3, &gc); > > - if (session->opt->push_peer_info_detail > 0) > + if (session->opt->push_peer_info_detail > 1) > { > - struct env_set *es = session->opt->es; > - struct buffer out = alloc_buf_gc(512*3, &gc); > - > /* push version */ > buf_printf(&out, "IV_VER=%s\n", PACKAGE_VERSION); > > @@ -2172,7 +2181,11 @@ push_peer_info(struct buffer *buf, struct tls_session *session) > #elif defined(_WIN32) > buf_printf(&out, "IV_PLAT=win\n"); > #endif > + } > > + /* These are the IV variable that are sent to peers in p2p mode */ > + if (session->opt->push_peer_info_detail > 0) > + { > /* support for P_DATA_V2 */ > int iv_proto = IV_PROTO_DATA_V2; > > @@ -2195,19 +2208,28 @@ push_peer_info(struct buffer *buf, struct tls_session *session) > > buf_printf(&out, "IV_NCP=2\n"); > } > - buf_printf(&out, "IV_CIPHERS=%s\n", session->opt->config_ncp_ciphers); > + } > + else > + { > + /* We are not using pull or p2mp server, instead do P2P NCP */ > + iv_proto |= IV_PROTO_NCP_P2P; > + } > + > + buf_printf(&out, "IV_CIPHERS=%s\n", session->opt->config_ncp_ciphers); > > #ifdef HAVE_EXPORT_KEYING_MATERIAL > - iv_proto |= IV_PROTO_TLS_KEY_EXPORT; > + iv_proto |= IV_PROTO_TLS_KEY_EXPORT; > #endif > - } > > buf_printf(&out, "IV_PROTO=%d\n", iv_proto); > > - /* push compression status */ > + if (session->opt->push_peer_info_detail > 1) isn't this check the same as the one below: "if (session->opt->push_peer_info_detail >= 2)" I don't think there is any integer number between 1 and 2. > + { > + /* push compression status */ > #ifdef USE_COMP > - comp_generate_peer_info_string(&session->opt->comp_options, &out); > + comp_generate_peer_info_string(&session->opt->comp_options, &out); > #endif > + } > > if (session->opt->push_peer_info_detail >= 2) > { > @@ -2224,24 +2246,29 @@ push_peer_info(struct buffer *buf, struct tls_session *session) > #endif > } > > - /* push env vars that begin with UV_, IV_PLAT_VER and IV_GUI_VER */ > - for (struct env_item *e = es->list; e != NULL; e = e->next) > + if (session->opt->push_peer_info_detail > 1) > { > - if (e->string) > + struct env_set *es = session->opt->es; > + /* push env vars that begin with UV_, IV_PLAT_VER and IV_GUI_VER */ > + for (struct env_item *e = es->list; e != NULL; e = e->next) > { > - if ((((strncmp(e->string, "UV_", 3)==0 > - || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=")-1)==0) > - && session->opt->push_peer_info_detail >= 2) > - || (strncmp(e->string,"IV_GUI_VER=",sizeof("IV_GUI_VER=")-1)==0) > - || (strncmp(e->string,"IV_SSO=",sizeof("IV_SSO=")-1)==0) > - ) > - && buf_safe(&out, strlen(e->string)+1)) > + if (e->string) > { > - buf_printf(&out, "%s\n", e->string); > + if ((((strncmp(e->string, "UV_", 3) == 0 > + || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=") - 1) == 0) > + && session->opt->push_peer_info_detail >= 2) > + || (strncmp(e->string, "IV_GUI_VER=", sizeof("IV_GUI_VER=") - 1) == 0) > + || (strncmp(e->string, "IV_SSO=", sizeof("IV_SSO=") - 1) == 0) > + ) > + && buf_safe(&out, strlen(e->string) + 1)) > + { > + buf_printf(&out, "%s\n", e->string); > + } > } > } > } > > + this empty line should go > if (!write_string(buf, BSTR(&out), -1)) > { > goto error; > @@ -2380,6 +2407,14 @@ key_method_2_write(struct buffer *buf, struct tls_multi *multi, struct tls_sessi > goto error; > } > > + if (session->opt->server &&session->opt->mode != MODE_SERVER > + && ks->key_id == 0) > + { > + /* tls-server option set and not P2MP server, so we > + * are a P2P client running in tls-server mode */ > + p2p_mode_ncp(multi, session); > + } > + > return true; > > error: > @@ -2579,7 +2614,14 @@ key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio > > setenv_del(session->opt->es, "exported_keying_material"); > } > - > + > + if (!session->opt->server && !session->opt->pull && ks->key_id == 0) > + { > + /* We are a p2p tls-client without pull, enable common > + * protocol options */ > + p2p_mode_ncp(multi, session); > + } > + > gc_free(&gc); > return true; > > diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h > index baf3560d2..14fabcc26 100644 > --- a/src/openvpn/ssl.h > +++ b/src/openvpn/ssl.h > @@ -119,6 +119,11 @@ > /** Supports signaling keywords with AUTH_PENDING, e.g. timeout=xy */ > #define IV_PROTO_AUTH_PENDING_KW (1<<4) > > +/** Support doing NCP in P2P mode. This mode works by both peers looking at > + * each other's IV_ variables and deterministically deciding both on the same > + * result. */ > +#define IV_PROTO_NCP_P2P (1<<5) > + > /* Default field in X509 to be username */ > #define X509_USERNAME_FIELD_DEFAULT "CN" > > diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h > index c3d12e5be..d228c70d8 100644 > --- a/src/openvpn/ssl_backend.h > +++ b/src/openvpn/ssl_backend.h > @@ -390,6 +390,7 @@ void backend_tls_ctx_reload_crl(struct tls_root_ctx *ssl_ctx, > const char *crl_file, bool crl_inline); > > #define EXPORT_KEY_DATA_LABEL "EXPORTER-OpenVPN-datakeys" > +#define EXPORT_P2P_PEERID_LABEL "EXPORTER-OpenVPN-p2p-peerid" > /** > * Keying Material Exporters [RFC 5705] allows additional keying material to be > * derived from existing TLS channel. This exported keying material can then be > diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h > index 43af51ee9..bcb199176 100644 > --- a/src/openvpn/ssl_common.h > +++ b/src/openvpn/ssl_common.h > @@ -287,6 +287,16 @@ struct tls_options > bool disable_occ; > int mode; > bool pull; > + /** > + * The detail of info we push in peer info > + * > + * 0 - nothing at all, P2MP server only > + * 1 - only the most basic information to negotiate cipher and features > + * for P2P NCP > + * 2 - normal setting for clients > + * 3 - full information including "sensitive data" like IV_HWADDR > + * enabled by --push-peer-info > + */ > int push_peer_info_detail; > int transition_window; > int handshake_window; > diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c > index 722256b42..8850ba237 100644 > --- a/src/openvpn/ssl_ncp.c > +++ b/src/openvpn/ssl_ncp.c > @@ -324,3 +324,148 @@ check_pull_client_ncp(struct context *c, const int found) > return false; > } > } > + > +const char* > +get_p2p_ncp_cipher(struct tls_session *session, const char *peer_info, > + struct gc_arena *gc) > +{ > + /* we use a local gc arena to keep the temporary strings needed by strsep */ > + struct gc_arena gc_local = gc_new(); > + const char *peer_ciphers = extract_var_peer_info(peer_info, "IV_CIPHERS=", &gc_local); > + > + if (!peer_ciphers) > + { > + gc_free(&gc_local); > + return NULL; > + } > + > + const char* server_ciphers; > + const char* client_ciphers; > + > + if (session->opt->server) > + { > + server_ciphers = session->opt->config_ncp_ciphers; > + client_ciphers = peer_ciphers; > + } > + else > + { > + client_ciphers = session->opt->config_ncp_ciphers; > + server_ciphers = peer_ciphers; > + } > + > + /* Find the first common cipher from TLS server and TLS client. We > + * use the preference of the server here to make it deterministic */ > + char *tmp_ciphers = string_alloc(server_ciphers, &gc_local); > + > + const char *token; > + while ((token = strsep(&tmp_ciphers, ":"))) > + { > + if (tls_item_in_cipher_list(token, client_ciphers)) > + { > + break; > + } > + } > + From here > + const char *ret = NULL; > + if (token != NULL) > + { > + const char *chosen_cipher = string_alloc(token, gc); > + ret = chosen_cipher; > + } > + gc_free(&gc_local); > + > + return ret; to here could just be simplified as: gc_free(&gc_local); return string_alloc(token, gc); no need for 'ret' or any if-block (the same condition is already inside string_alloc()). > +} > + > +static void > +p2p_ncp_set_options(struct tls_multi *multi, struct tls_session *session) > +{ > + /* will return 0 if peer_info is null */ > + const unsigned int iv_proto_peer = extract_iv_proto(multi->peer_info); > + > + /* The other peer does not support P2P NCP */ > + if (!(iv_proto_peer & IV_PROTO_NCP_P2P)) > + { > + return; > + } > + > + if (iv_proto_peer & IV_PROTO_DATA_V2) is it really possible to have NCP_P2P set and no DATA_V2? I think NCP_P2P should automatically imply DATA_V2. Or maybe we just don't wanna make such assumption to avoid anything breaking in the future? (it'd make sense to me) > + { > + multi->use_peer_id = true; > + multi->peer_id = 0x76706e; // 'v' 'p' 'n' > + empty line should go > + } > + > +#if defined(HAVE_EXPORT_KEYING_MATERIAL) > + if (iv_proto_peer & IV_PROTO_TLS_KEY_EXPORT) > + { > + session->opt->crypto_flags |= CO_USE_TLS_KEY_MATERIAL_EXPORT; > + > + if (multi->use_peer_id) > + { > + /* Using a non hardcoded peer-id makes a tiny bit harder to > + * fingerprint packets and also gives each connection a unique > + * peer-id that can be useful for NAT tracking etc. */ > + > + uint8_t peerid[3]; > + if (!key_state_export_keying_material(session, EXPORT_P2P_PEERID_LABEL, > + strlen(EXPORT_P2P_PEERID_LABEL), > + &peerid, 3)) nice idea! :) > + { > + /* Non DCO setup might still work but also this should never > + * happen or very likely the TLS encryption key exporter will > + * also fail */ > + msg(M_NONFATAL, "TLS key export for P2P peer id failed. " > + "Continuing anyway, expect problems"); > + } > + else > + { > + multi->peer_id = (peerid[0] << 16) + (peerid[1] << 8) + peerid[2]; > + } > + > + } > + } > +#endif > +} > + > +void > +p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session) > +{ > + /* Set the common options */ > + p2p_ncp_set_options(multi, session); > + > + struct gc_arena gc = gc_new(); > + > + /* Query the common cipher here to log it as part of our message. > + * We postpone switching the cipher to do_up */ > + const char* common_cipher = get_p2p_ncp_cipher(session, multi->peer_info, &gc); why re-extracting the cipher again instead of reading it (somehow) from c->options.ciphername ? Maybe reading it from that field is not correct, but isn't there a way to avoid doing the string parsing twice? (it was performed in do_deferred_p2p_ncp() already) > + > + if (!common_cipher) > + { > + struct buffer out = alloc_buf_gc(128, &gc); > + struct key_state *ks = get_key_scan(multi, KS_PRIMARY); > + > + const cipher_ctx_t *ctx = ks->crypto_options.key_ctx_bi.encrypt.cipher; > + const cipher_kt_t *cipher = cipher_ctx_get_cipher_kt(ctx); > + const char *fallback_name = cipher_kt_name(cipher); > + > + if (!cipher) > + { > + /* at this point we do not really know if our fallback is > + * not enabled or if we use 'none' cipher as fallback, so > + * keep this ambiguity here and print fallback-cipher: none > + */ > + fallback_name = "none"; > + } > + > + buf_printf(&out, "(not negotiated, fallback-cipher: %s)", fallback_name); > + common_cipher = BSTR(&out); > + } > + > + msg(D_TLS_DEBUG_LOW, "P2P mode NCP negotiation result: " > + "TLS_export=%d, DATA_v2=%d, peer-id %d, cipher=%s", > + (bool)(session->opt->crypto_flags & CO_USE_TLS_KEY_MATERIAL_EXPORT), > + multi->use_peer_id, multi->peer_id, common_cipher); > + > + gc_free(&gc); > +} > \ No newline at end of file > diff --git a/src/openvpn/ssl_ncp.h b/src/openvpn/ssl_ncp.h > index 39158a568..c02be6939 100644 > --- a/src/openvpn/ssl_ncp.h > +++ b/src/openvpn/ssl_ncp.h > @@ -32,6 +32,7 @@ > > #include "buffer.h" > #include "options.h" > +#include "ssl_common.h" > > /** > * Returns whether the client supports NCP either by > @@ -115,4 +116,28 @@ bool tls_item_in_cipher_list(const char *item, const char *list); > */ > #define MAX_NCP_CIPHERS_LENGTH 127 > > +/** > + * Determines if there is common cipher of both peer by looking at the > + * IV_CIPHER peer info. In contrast of the server mode NCP that tries to > + * accomandate all kind of corner cases in P2P mode NCP only takes IV_CIPHER > + * into account and falls back to previous behaviour if this fails. > + */ > +void p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session); > + > +/** > + * Determines the best common cipher from both peers IV_CIPHER lists. The > + * first cipher from the tls-server that is also in the tls-client IV_CIPHER > + * list will be returned. If no common cipher can be found, both peer > + * will continue to use whatever cipher is their default and NULL will be > + * returned. > + * > + * @param session tls_session > + * @param peer_info peer info of the peer > + * @param gc gc arena that will be used to allocate the returned cipher > + * @return common cipher if one exist. > + */ > +const char * > +get_p2p_ncp_cipher(struct tls_session *session, const char *peer_info, > + struct gc_arena *gc); > + > #endif /* ifndef OPENVPN_SSL_NCP_H */ > diff --git a/tests/unit_tests/openvpn/test_ncp.c b/tests/unit_tests/openvpn/test_ncp.c > index 4077be5e8..9dcd6f0a7 100644 > --- a/tests/unit_tests/openvpn/test_ncp.c > +++ b/tests/unit_tests/openvpn/test_ncp.c > @@ -44,6 +44,17 @@ > const char *bf_chacha = "BF-CBC:CHACHA20-POLY1305"; > const char *aes_ciphers = "AES-256-GCM:AES-128-GCM"; > > + > +/* Define this function here as dummy since including the ssl_*.c files > + * leads to having to include even more unrelated code */ > +bool > +key_state_export_keying_material(struct tls_session *session, > + const char* label, size_t label_size, > + void *ekm, size_t ekm_size) > +{ > + ASSERT(0); > +} > + > static void > test_check_ncp_ciphers_list(void **state) > { > I am so willing to restyle push_peer_info() now .... maybe in another patch :-) Apart from the questions and comments above, the patch looks reasonable. It tries to re-use as much logic as possible for any common part we have with the P2MP code path. At the same time it adds code that is basically confined to P2P mode only and it is pretty simple. Basic tests that passed: * p2p-ncp vs p2p-ncp -> OK * p2p-ncp vs p2p-ncp with different IV_CIPHERS advertised (still one cipher in common) -> OK * p2p-ncp vs p2p (2.5) -> OK * server vs client -> OK My GitLab CI was also happy. I also like the output as it clarifies the result of the "negotiation". Cheers,
> > nice idea! :) Thanks! >> + >> +void >> +p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session) >> +{ >> + /* Set the common options */ >> + p2p_ncp_set_options(multi, session); >> + >> + struct gc_arena gc = gc_new(); >> + >> + /* Query the common cipher here to log it as part of our message. >> + * We postpone switching the cipher to do_up */ >> + const char* common_cipher = get_p2p_ncp_cipher(session, multi->peer_info, &gc); > > why re-extracting the cipher again instead of reading it (somehow) from > c->options.ciphername ? > > Maybe reading it from that field is not correct, but isn't there a way > to avoid doing the string parsing twice? (it was performed in > do_deferred_p2p_ncp() already) It will be performed in do_deferred_p2p_ncp as part of do_up much later. The call here to get_p2p_ncp_cipher is basically "only" for creating the P2P mode NCP negotiation result message. The problem here is that setting cipher from the context that p2p_mode_NCP has (multi and session) not possible, so we would need to move options->cipher into multi or session struct and that would be quite disruptive. So I opted here to do get_p2p_ncp_cipher just to be able to print a nice message. Arne
diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 38abf9f3a..5d4852ae1 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -68,6 +68,7 @@ static const char *saved_pid_file_name; /* GLOBAL */ #define CF_INIT_TLS_AUTH_STANDALONE (1<<2) static void do_init_first_time(struct context *c); +static bool do_deferred_p2p_ncp(struct context *c); void context_clear(struct context *c) @@ -2151,6 +2152,14 @@ do_up(struct context *c, bool pulled_options, unsigned int option_types_found) return false; } } + else if (c->mode == MODE_POINT_TO_POINT) + { + if (!do_deferred_p2p_ncp(c)) + { + msg(D_TLS_ERRORS, "ERROR: Failed to apply P2P negotiated protocol options"); + return false; + } + } /* if --up-delay specified, open tun, do ifconfig, and run up script now */ if (c->options.up_delay || PULL_DEFINED(&c->options)) @@ -2238,6 +2247,72 @@ pull_permission_mask(const struct context *c) return flags; } +static +void adjust_mtu_peerid(struct context *c) +{ + frame_add_to_extra_frame(&c->c2.frame, +3); /* peer-id overhead */ + if (!c->options.ce.link_mtu_defined) + { + frame_add_to_link_mtu(&c->c2.frame, +3); + msg(D_PUSH, "OPTIONS IMPORT: adjusting link_mtu to %d", + EXPANDED_SIZE(&c->c2.frame)); + } + else + { + msg(M_WARN, "OPTIONS IMPORT: WARNING: peer-id set, but link-mtu" + " fixed by config - reducing tun-mtu to %d, expect" + " MTU problems", TUN_MTU_SIZE(&c->c2.frame) ); + } +} + +static bool +do_deferred_p2p_ncp(struct context *c) +{ + + if (!c->c2.tls_multi) + { + return true; + } + + if (c->c2.tls_multi->use_peer_id) + { + adjust_mtu_peerid(c); + } + + struct tls_session *session = &c->c2.tls_multi->session[TM_ACTIVE]; + + const char *ncp_cipher = get_p2p_ncp_cipher(session, c->c2.tls_multi->peer_info, + &c->options.gc); + + if (ncp_cipher) + { + c->options.ciphername = ncp_cipher; + } + else if (!c->options.enable_ncp_fallback) + { + msg(D_TLS_ERRORS, "ERROR: failed to negotiate cipher with peer and " + "--data-ciphers-fallback not enabled. No useable " + "data channel cipher"); + return false; + } + + struct frame *frame_fragment = NULL; +#ifdef ENABLE_FRAGMENT + if (c->options.ce.fragment) + { + frame_fragment = &c->c2.frame_fragment; + } +#endif + + if (!tls_session_update_crypto_params(session, &c->options, &c->c2.frame, + frame_fragment)) + { + msg(D_TLS_ERRORS, "ERROR: failed to set crypto cipher"); + return false; + } + return true; +} + /* * Handle non-tun-related pulled options. */ @@ -2325,19 +2400,7 @@ do_deferred_options(struct context *c, const unsigned int found) msg(D_PUSH, "OPTIONS IMPORT: peer-id set"); c->c2.tls_multi->use_peer_id = true; c->c2.tls_multi->peer_id = c->options.peer_id; - frame_add_to_extra_frame(&c->c2.frame, +3); /* peer-id overhead */ - if (!c->options.ce.link_mtu_defined) - { - frame_add_to_link_mtu(&c->c2.frame, +3); - msg(D_PUSH, "OPTIONS IMPORT: adjusting link_mtu to %d", - EXPANDED_SIZE(&c->c2.frame)); - } - else - { - msg(M_WARN, "OPTIONS IMPORT: WARNING: peer-id set, but link-mtu" - " fixed by config - reducing tun-mtu to %d, expect" - " MTU problems", TUN_MTU_SIZE(&c->c2.frame) ); - } + adjust_mtu_peerid(c); } /* process (potentially pushed) crypto options */ @@ -2856,16 +2919,21 @@ do_init_crypto_tls(struct context *c, const unsigned int flags) to.pull = options->pull; if (options->push_peer_info) /* all there is */ { - to.push_peer_info_detail = 2; + to.push_peer_info_detail = 3; } else if (options->pull) /* pull clients send some details */ { - to.push_peer_info_detail = 1; + to.push_peer_info_detail = 2; } - else /* default: no peer-info at all */ + else if (options->mode == MODE_SERVER) /* server: no peer info at all */ { to.push_peer_info_detail = 0; } + else /* default: minimal info to allow NCP in P2P mode */ + { + to.push_peer_info_detail = 1; + } + /* should we not xmit any packets until we get an initial * response from client? */ diff --git a/src/openvpn/options.c b/src/openvpn/options.c index 2f4ccaa09..9cd88a36e 100644 --- a/src/openvpn/options.c +++ b/src/openvpn/options.c @@ -3078,10 +3078,6 @@ options_postprocess_cipher(struct options *o) { if (!o->pull && !(o->mode == MODE_SERVER)) { - /* we are in the classic P2P mode */ - msg( M_WARN, "Cipher negotiation is disabled since neither " - "P2MP client nor server mode is enabled"); - /* If the cipher is not set, use the old default of BF-CBC. We will * warn that this is deprecated on cipher initialisation, no need * to warn here as well */ @@ -3089,6 +3085,10 @@ options_postprocess_cipher(struct options *o) { o->ciphername = "BF-CBC"; } + else + { + o->enable_ncp_fallback = true; + } return; } diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c index dd6e462d0..8a02a2006 100644 --- a/src/openvpn/ssl.c +++ b/src/openvpn/ssl.c @@ -1874,33 +1874,18 @@ cleanup: return ret; } + bool -tls_session_update_crypto_params(struct tls_session *session, - struct options *options, struct frame *frame, +tls_session_update_crypto_params_do_work(struct tls_session *session, + struct options* options, struct frame *frame, struct frame *frame_fragment) { if (session->key[KS_PRIMARY].crypto_options.key_ctx_bi.initialized) { /* keys already generated, nothing to do */ return true; - } - bool cipher_allowed_as_fallback = options->enable_ncp_fallback - && streq(options->ciphername, session->opt->config_ciphername); - - if (!session->opt->server && !cipher_allowed_as_fallback - && !tls_item_in_cipher_list(options->ciphername, options->ncp_ciphers)) - { - msg(D_TLS_ERRORS, "Error: pushed cipher not allowed - %s not in %s", - options->ciphername, options->ncp_ciphers); - /* undo cipher push, abort connection setup */ - options->ciphername = session->opt->config_ciphername; - return false; } - - /* Import crypto settings that might be set by pull/push */ - session->opt->crypto_flags |= options->data_channel_crypto_flags; - if (strcmp(options->ciphername, session->opt->config_ciphername)) { msg(D_HANDSHAKE, "Data Channel: using negotiated cipher '%s'", @@ -1952,6 +1937,32 @@ tls_session_update_crypto_params(struct tls_session *session, return tls_session_generate_data_channel_keys(session); } +bool +tls_session_update_crypto_params(struct tls_session *session, + struct options *options, struct frame *frame, + struct frame *frame_fragment) +{ + + bool cipher_allowed_as_fallback = options->enable_ncp_fallback + && streq(options->ciphername, session->opt->config_ciphername); + + if (!session->opt->server && !cipher_allowed_as_fallback + && !tls_item_in_cipher_list(options->ciphername, options->ncp_ciphers)) + { + msg(D_TLS_ERRORS, "Error: negotiated cipher not allowed - %s not in %s", + options->ciphername, options->ncp_ciphers); + /* undo cipher push, abort connection setup */ + options->ciphername = session->opt->config_ciphername; + return false; + } + + /* Import crypto settings that might be set by pull/push */ + session->opt->crypto_flags |= options->data_channel_crypto_flags; + + return tls_session_update_crypto_params_do_work(session, options, frame, frame_fragment); +} + + static bool random_bytes_to_buf(struct buffer *buf, uint8_t *out, @@ -2145,12 +2156,10 @@ push_peer_info(struct buffer *buf, struct tls_session *session) { struct gc_arena gc = gc_new(); bool ret = false; + struct buffer out = alloc_buf_gc(512 * 3, &gc); - if (session->opt->push_peer_info_detail > 0) + if (session->opt->push_peer_info_detail > 1) { - struct env_set *es = session->opt->es; - struct buffer out = alloc_buf_gc(512*3, &gc); - /* push version */ buf_printf(&out, "IV_VER=%s\n", PACKAGE_VERSION); @@ -2172,7 +2181,11 @@ push_peer_info(struct buffer *buf, struct tls_session *session) #elif defined(_WIN32) buf_printf(&out, "IV_PLAT=win\n"); #endif + } + /* These are the IV variable that are sent to peers in p2p mode */ + if (session->opt->push_peer_info_detail > 0) + { /* support for P_DATA_V2 */ int iv_proto = IV_PROTO_DATA_V2; @@ -2195,19 +2208,28 @@ push_peer_info(struct buffer *buf, struct tls_session *session) buf_printf(&out, "IV_NCP=2\n"); } - buf_printf(&out, "IV_CIPHERS=%s\n", session->opt->config_ncp_ciphers); + } + else + { + /* We are not using pull or p2mp server, instead do P2P NCP */ + iv_proto |= IV_PROTO_NCP_P2P; + } + + buf_printf(&out, "IV_CIPHERS=%s\n", session->opt->config_ncp_ciphers); #ifdef HAVE_EXPORT_KEYING_MATERIAL - iv_proto |= IV_PROTO_TLS_KEY_EXPORT; + iv_proto |= IV_PROTO_TLS_KEY_EXPORT; #endif - } buf_printf(&out, "IV_PROTO=%d\n", iv_proto); - /* push compression status */ + if (session->opt->push_peer_info_detail > 1) + { + /* push compression status */ #ifdef USE_COMP - comp_generate_peer_info_string(&session->opt->comp_options, &out); + comp_generate_peer_info_string(&session->opt->comp_options, &out); #endif + } if (session->opt->push_peer_info_detail >= 2) { @@ -2224,24 +2246,29 @@ push_peer_info(struct buffer *buf, struct tls_session *session) #endif } - /* push env vars that begin with UV_, IV_PLAT_VER and IV_GUI_VER */ - for (struct env_item *e = es->list; e != NULL; e = e->next) + if (session->opt->push_peer_info_detail > 1) { - if (e->string) + struct env_set *es = session->opt->es; + /* push env vars that begin with UV_, IV_PLAT_VER and IV_GUI_VER */ + for (struct env_item *e = es->list; e != NULL; e = e->next) { - if ((((strncmp(e->string, "UV_", 3)==0 - || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=")-1)==0) - && session->opt->push_peer_info_detail >= 2) - || (strncmp(e->string,"IV_GUI_VER=",sizeof("IV_GUI_VER=")-1)==0) - || (strncmp(e->string,"IV_SSO=",sizeof("IV_SSO=")-1)==0) - ) - && buf_safe(&out, strlen(e->string)+1)) + if (e->string) { - buf_printf(&out, "%s\n", e->string); + if ((((strncmp(e->string, "UV_", 3) == 0 + || strncmp(e->string, "IV_PLAT_VER=", sizeof("IV_PLAT_VER=") - 1) == 0) + && session->opt->push_peer_info_detail >= 2) + || (strncmp(e->string, "IV_GUI_VER=", sizeof("IV_GUI_VER=") - 1) == 0) + || (strncmp(e->string, "IV_SSO=", sizeof("IV_SSO=") - 1) == 0) + ) + && buf_safe(&out, strlen(e->string) + 1)) + { + buf_printf(&out, "%s\n", e->string); + } } } } + if (!write_string(buf, BSTR(&out), -1)) { goto error; @@ -2380,6 +2407,14 @@ key_method_2_write(struct buffer *buf, struct tls_multi *multi, struct tls_sessi goto error; } + if (session->opt->server &&session->opt->mode != MODE_SERVER + && ks->key_id == 0) + { + /* tls-server option set and not P2MP server, so we + * are a P2P client running in tls-server mode */ + p2p_mode_ncp(multi, session); + } + return true; error: @@ -2579,7 +2614,14 @@ key_method_2_read(struct buffer *buf, struct tls_multi *multi, struct tls_sessio setenv_del(session->opt->es, "exported_keying_material"); } - + + if (!session->opt->server && !session->opt->pull && ks->key_id == 0) + { + /* We are a p2p tls-client without pull, enable common + * protocol options */ + p2p_mode_ncp(multi, session); + } + gc_free(&gc); return true; diff --git a/src/openvpn/ssl.h b/src/openvpn/ssl.h index baf3560d2..14fabcc26 100644 --- a/src/openvpn/ssl.h +++ b/src/openvpn/ssl.h @@ -119,6 +119,11 @@ /** Supports signaling keywords with AUTH_PENDING, e.g. timeout=xy */ #define IV_PROTO_AUTH_PENDING_KW (1<<4) +/** Support doing NCP in P2P mode. This mode works by both peers looking at + * each other's IV_ variables and deterministically deciding both on the same + * result. */ +#define IV_PROTO_NCP_P2P (1<<5) + /* Default field in X509 to be username */ #define X509_USERNAME_FIELD_DEFAULT "CN" diff --git a/src/openvpn/ssl_backend.h b/src/openvpn/ssl_backend.h index c3d12e5be..d228c70d8 100644 --- a/src/openvpn/ssl_backend.h +++ b/src/openvpn/ssl_backend.h @@ -390,6 +390,7 @@ void backend_tls_ctx_reload_crl(struct tls_root_ctx *ssl_ctx, const char *crl_file, bool crl_inline); #define EXPORT_KEY_DATA_LABEL "EXPORTER-OpenVPN-datakeys" +#define EXPORT_P2P_PEERID_LABEL "EXPORTER-OpenVPN-p2p-peerid" /** * Keying Material Exporters [RFC 5705] allows additional keying material to be * derived from existing TLS channel. This exported keying material can then be diff --git a/src/openvpn/ssl_common.h b/src/openvpn/ssl_common.h index 43af51ee9..bcb199176 100644 --- a/src/openvpn/ssl_common.h +++ b/src/openvpn/ssl_common.h @@ -287,6 +287,16 @@ struct tls_options bool disable_occ; int mode; bool pull; + /** + * The detail of info we push in peer info + * + * 0 - nothing at all, P2MP server only + * 1 - only the most basic information to negotiate cipher and features + * for P2P NCP + * 2 - normal setting for clients + * 3 - full information including "sensitive data" like IV_HWADDR + * enabled by --push-peer-info + */ int push_peer_info_detail; int transition_window; int handshake_window; diff --git a/src/openvpn/ssl_ncp.c b/src/openvpn/ssl_ncp.c index 722256b42..8850ba237 100644 --- a/src/openvpn/ssl_ncp.c +++ b/src/openvpn/ssl_ncp.c @@ -324,3 +324,148 @@ check_pull_client_ncp(struct context *c, const int found) return false; } } + +const char* +get_p2p_ncp_cipher(struct tls_session *session, const char *peer_info, + struct gc_arena *gc) +{ + /* we use a local gc arena to keep the temporary strings needed by strsep */ + struct gc_arena gc_local = gc_new(); + const char *peer_ciphers = extract_var_peer_info(peer_info, "IV_CIPHERS=", &gc_local); + + if (!peer_ciphers) + { + gc_free(&gc_local); + return NULL; + } + + const char* server_ciphers; + const char* client_ciphers; + + if (session->opt->server) + { + server_ciphers = session->opt->config_ncp_ciphers; + client_ciphers = peer_ciphers; + } + else + { + client_ciphers = session->opt->config_ncp_ciphers; + server_ciphers = peer_ciphers; + } + + /* Find the first common cipher from TLS server and TLS client. We + * use the preference of the server here to make it deterministic */ + char *tmp_ciphers = string_alloc(server_ciphers, &gc_local); + + const char *token; + while ((token = strsep(&tmp_ciphers, ":"))) + { + if (tls_item_in_cipher_list(token, client_ciphers)) + { + break; + } + } + + const char *ret = NULL; + if (token != NULL) + { + const char *chosen_cipher = string_alloc(token, gc); + ret = chosen_cipher; + } + gc_free(&gc_local); + + return ret; +} + +static void +p2p_ncp_set_options(struct tls_multi *multi, struct tls_session *session) +{ + /* will return 0 if peer_info is null */ + const unsigned int iv_proto_peer = extract_iv_proto(multi->peer_info); + + /* The other peer does not support P2P NCP */ + if (!(iv_proto_peer & IV_PROTO_NCP_P2P)) + { + return; + } + + if (iv_proto_peer & IV_PROTO_DATA_V2) + { + multi->use_peer_id = true; + multi->peer_id = 0x76706e; // 'v' 'p' 'n' + + } + +#if defined(HAVE_EXPORT_KEYING_MATERIAL) + if (iv_proto_peer & IV_PROTO_TLS_KEY_EXPORT) + { + session->opt->crypto_flags |= CO_USE_TLS_KEY_MATERIAL_EXPORT; + + if (multi->use_peer_id) + { + /* Using a non hardcoded peer-id makes a tiny bit harder to + * fingerprint packets and also gives each connection a unique + * peer-id that can be useful for NAT tracking etc. */ + + uint8_t peerid[3]; + if (!key_state_export_keying_material(session, EXPORT_P2P_PEERID_LABEL, + strlen(EXPORT_P2P_PEERID_LABEL), + &peerid, 3)) + { + /* Non DCO setup might still work but also this should never + * happen or very likely the TLS encryption key exporter will + * also fail */ + msg(M_NONFATAL, "TLS key export for P2P peer id failed. " + "Continuing anyway, expect problems"); + } + else + { + multi->peer_id = (peerid[0] << 16) + (peerid[1] << 8) + peerid[2]; + } + + } + } +#endif +} + +void +p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session) +{ + /* Set the common options */ + p2p_ncp_set_options(multi, session); + + struct gc_arena gc = gc_new(); + + /* Query the common cipher here to log it as part of our message. + * We postpone switching the cipher to do_up */ + const char* common_cipher = get_p2p_ncp_cipher(session, multi->peer_info, &gc); + + if (!common_cipher) + { + struct buffer out = alloc_buf_gc(128, &gc); + struct key_state *ks = get_key_scan(multi, KS_PRIMARY); + + const cipher_ctx_t *ctx = ks->crypto_options.key_ctx_bi.encrypt.cipher; + const cipher_kt_t *cipher = cipher_ctx_get_cipher_kt(ctx); + const char *fallback_name = cipher_kt_name(cipher); + + if (!cipher) + { + /* at this point we do not really know if our fallback is + * not enabled or if we use 'none' cipher as fallback, so + * keep this ambiguity here and print fallback-cipher: none + */ + fallback_name = "none"; + } + + buf_printf(&out, "(not negotiated, fallback-cipher: %s)", fallback_name); + common_cipher = BSTR(&out); + } + + msg(D_TLS_DEBUG_LOW, "P2P mode NCP negotiation result: " + "TLS_export=%d, DATA_v2=%d, peer-id %d, cipher=%s", + (bool)(session->opt->crypto_flags & CO_USE_TLS_KEY_MATERIAL_EXPORT), + multi->use_peer_id, multi->peer_id, common_cipher); + + gc_free(&gc); +} \ No newline at end of file diff --git a/src/openvpn/ssl_ncp.h b/src/openvpn/ssl_ncp.h index 39158a568..c02be6939 100644 --- a/src/openvpn/ssl_ncp.h +++ b/src/openvpn/ssl_ncp.h @@ -32,6 +32,7 @@ #include "buffer.h" #include "options.h" +#include "ssl_common.h" /** * Returns whether the client supports NCP either by @@ -115,4 +116,28 @@ bool tls_item_in_cipher_list(const char *item, const char *list); */ #define MAX_NCP_CIPHERS_LENGTH 127 +/** + * Determines if there is common cipher of both peer by looking at the + * IV_CIPHER peer info. In contrast of the server mode NCP that tries to + * accomandate all kind of corner cases in P2P mode NCP only takes IV_CIPHER + * into account and falls back to previous behaviour if this fails. + */ +void p2p_mode_ncp(struct tls_multi *multi, struct tls_session *session); + +/** + * Determines the best common cipher from both peers IV_CIPHER lists. The + * first cipher from the tls-server that is also in the tls-client IV_CIPHER + * list will be returned. If no common cipher can be found, both peer + * will continue to use whatever cipher is their default and NULL will be + * returned. + * + * @param session tls_session + * @param peer_info peer info of the peer + * @param gc gc arena that will be used to allocate the returned cipher + * @return common cipher if one exist. + */ +const char * +get_p2p_ncp_cipher(struct tls_session *session, const char *peer_info, + struct gc_arena *gc); + #endif /* ifndef OPENVPN_SSL_NCP_H */ diff --git a/tests/unit_tests/openvpn/test_ncp.c b/tests/unit_tests/openvpn/test_ncp.c index 4077be5e8..9dcd6f0a7 100644 --- a/tests/unit_tests/openvpn/test_ncp.c +++ b/tests/unit_tests/openvpn/test_ncp.c @@ -44,6 +44,17 @@ const char *bf_chacha = "BF-CBC:CHACHA20-POLY1305"; const char *aes_ciphers = "AES-256-GCM:AES-128-GCM"; + +/* Define this function here as dummy since including the ssl_*.c files + * leads to having to include even more unrelated code */ +bool +key_state_export_keying_material(struct tls_session *session, + const char* label, size_t label_size, + void *ekm, size_t ekm_size) +{ + ASSERT(0); +} + static void test_check_ncp_ciphers_list(void **state) {
Currently P2P mode of OpenVPN is on of the few places that cannot negotiate modern OpenVPN features. This becomes more and more problematic since P2P and P2MP code diverge more and more and also the lack of switching to more advanced features like Data v2 currently blocks P2P mode from working together with the upcoming ovpn-dco support. This NCP support is a lot simpler and works in the following way: - P2P peer announce an extremely limited IV_ variable set (IV_PROTO and IV_CIPHERS) - Both peers check if the IV_PROTO_NCP_P2P bit is present in IV_PROTO - if yes both sides deterministically determine according to IV_PROTO and IV_CIPHER what options can be used and start using these There are no poor man's NCP or other compatibility workaround like in the normal NCP, making this NCP leaner and more deterministic. Signed-off-by: Arne Schwabe <arne@rfc2549.org> --- src/openvpn/init.c | 100 ++++++++++++++++--- src/openvpn/options.c | 8 +- src/openvpn/ssl.c | 120 +++++++++++++++-------- src/openvpn/ssl.h | 5 + src/openvpn/ssl_backend.h | 1 + src/openvpn/ssl_common.h | 10 ++ src/openvpn/ssl_ncp.c | 145 ++++++++++++++++++++++++++++ src/openvpn/ssl_ncp.h | 25 +++++ tests/unit_tests/openvpn/test_ncp.c | 11 +++ 9 files changed, 366 insertions(+), 59 deletions(-)