Re: [ptxdist] [APPLIED] dropbear: Make Chacha20-Poly1305 encryption optional

[Michael Olbrich <m.olbrich@pengutronix.de>]

Thanks, applied as cd3102b2cf895b8958855e93330417cc92b64454.

Michael

[sent from post-receive hook]

On Fri, 29 Jul 2022 08:23:32 +0200, Alexander Dahl <ada@thorsis.com> wrote:
> Making this optional was basically for testing purposes, but might be
> interesting for users who want to squeeze out the last few bytes.
> The option is enabled by dropbear by default, so now it's possible to
> disable it in ptxdist.
> 
> Signed-off-by: Alexander Dahl <ada@thorsis.com>
> Message-Id: <20220704121831.23787-5-ada@thorsis.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
> 
> diff --git a/rules/dropbear.in b/rules/dropbear.in
> index 129e94cae4c8..25b92839b64e 100644
> --- a/rules/dropbear.in
> +++ b/rules/dropbear.in
> @@ -170,6 +170,16 @@ config DROPBEAR_AES256
>  	  algorithm that may be used by U.S. Government organizations
>  	  (and others) to protect sensitive information.
>  
> +config DROPBEAR_CHACHA20POLY1305
> +	bool
> +	prompt "Chacha20-Poly1305"
> +	default y
> +	help
> +	  Enable Chacha20-Poly1305 authenticated encryption mode.
> +	  This is generally faster than AES256 on CPU w/o dedicated AES
> +	  instructions, having the same key size.
> +	  Recommended.
> +
>  config DROPBEAR_CBC_CIPHERS
>  	bool
>  	prompt "CBC mode ciphers"
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index a5ff02c9e0a0..7653cf3e57cc 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -127,6 +127,14 @@ else
>  	@echo "#define DROPBEAR_AES256 0" >> $(DROPBEAR_LOCALOPTIONS)
>  endif
>  
> +ifdef PTXCONF_DROPBEAR_CHACHA20POLY1305
> +	@echo "ptxdist: enabling chacha20-poly1305"
> +	@echo "#define DROPBEAR_CHACHA20POLY1305 1" >> $(DROPBEAR_LOCALOPTIONS)
> +else
> +	@echo "ptxdist: disabling chacha20-poly1305"
> +	@echo "#define DROPBEAR_CHACHA20POLY1305 0" >> $(DROPBEAR_LOCALOPTIONS)
> +endif
> +
>  # ciphers
>  ifdef PTXCONF_DROPBEAR_CBC_CIPHERS
>  	@echo "ptxdist: enabling cbc ciphers"