References: <20200711093655.23686-1-arne@...1227...> From: tincanteksup Message-ID: <2ef4d637-8b73-dd83-5f1b-be4a6b82d8cb@...277...> Date: Mon, 13 Jul 2020 13:30:11 +0100 MIME-Version: 1.0 In-Reply-To: <20200711093655.23686-1-arne@...1227...> Content-Language: en-GB Subject: Re: [Openvpn-devel] [PATCH v5 01/14] Allow changing fallback cipher from ccd files/client-connect 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: openvpn-devel@lists.sourceforge.net grammar: On 11/07/2020 10:36, Arne Schwabe wrote: > This allows to control the fallback cipher that is used when the > client/server do have any common cipher on a per client basis. client/server do not have any common cipher > > The patch is similar to Steffan's > [PATCH v4] Allow changing cipher from a ccd file. > > Steffan's old patch also moves the cipher negotiation to > multi_established_connection() which I independently discovered and > implemented in implemented in: (otherwise it looks like you forgot "in what" - That is if my interpretation is correct) > > Extract process_incoming_push_reply from process_incoming_push_msg > (#FIXME add commitsh when commited to master) > > Signed-off-by: Arne Schwabe > --- > src/openvpn/options.c | 2 +- > src/openvpn/options.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/src/openvpn/options.c b/src/openvpn/options.c > index b93fd4fe..bf2760e1 100644 > --- a/src/openvpn/options.c > +++ b/src/openvpn/options.c > @@ -7892,7 +7892,7 @@ add_option(struct options *options, > } > else if (streq(p[0], "cipher") && p[1] && !p[2]) > { > - VERIFY_PERMISSION(OPT_P_NCP); > + VERIFY_PERMISSION(OPT_P_NCP|OPT_P_INSTANCE); > options->ciphername = p[1]; > } > else if (streq(p[0], "ncp-ciphers") && p[1] && !p[2]) > diff --git a/src/openvpn/options.h b/src/openvpn/options.h > index c83a46aa..c37006d3 100644 > --- a/src/openvpn/options.h > +++ b/src/openvpn/options.h > @@ -677,7 +677,7 @@ struct options > #define OPT_P_MTU (1<<14) /* TODO */ > #define OPT_P_NICE (1<<15) > #define OPT_P_PUSH (1<<16) > -#define OPT_P_INSTANCE (1<<17) > +#define OPT_P_INSTANCE (1<<17) /**< allowed in ccd, client-connect etc*/ > #define OPT_P_CONFIG (1<<18) > #define OPT_P_EXPLICIT_NOTIFY (1<<19) > #define OPT_P_ECHO (1<<20) >