* [ptxdist] [PATCH] dropbear: enable/disable sha1 include key exchange algorithms
@ 2020-04-03 17:30 Bruno Thomsen
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
0 siblings, 1 reply; 2+ messages in thread
From: Bruno Thomsen @ 2020-04-03 17:30 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen, bth
When enabling or disabling sha1 integrity also keep or remove
key exhange algorithms that rely on sha1.
group14_sha1 - 2048 bit, sha1
group1 - 1024 bit, sha1
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
---
rules/dropbear.make | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rules/dropbear.make b/rules/dropbear.make
index 8d80ed295..d52efa396 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -165,9 +165,13 @@ endif
ifdef PTXCONF_DROPBEAR_SHA1
@echo "ptxdist: enabling sha1"
@echo "#define DROPBEAR_SHA1_HMAC 1" >> $(DROPBEAR_LOCALOPTIONS)
+ @echo "#define DROPBEAR_DH_GROUP1 1" >> $(DROPBEAR_LOCALOPTIONS)
+ @echo "#define DROPBEAR_DH_GROUP14_SHA1 1" >> $(DROPBEAR_LOCALOPTIONS)
else
@echo "ptxdist: disabling sha1"
@echo "#define DROPBEAR_SHA1_HMAC 0" >> $(DROPBEAR_LOCALOPTIONS)
+ @echo "#define DROPBEAR_DH_GROUP1 0" >> $(DROPBEAR_LOCALOPTIONS)
+ @echo "#define DROPBEAR_DH_GROUP14_SHA1 0" >> $(DROPBEAR_LOCALOPTIONS)
endif
ifdef PTXCONF_DROPBEAR_SHA1_96
--
2.25.1
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [ptxdist] [APPLIED] fbgrab: remove from staging
2020-04-03 17:30 [ptxdist] [PATCH] dropbear: enable/disable sha1 include key exchange algorithms Bruno Thomsen
@ 2020-04-09 16:54 ` Michael Olbrich
0 siblings, 0 replies; 2+ messages in thread
From: Michael Olbrich @ 2020-04-09 16:54 UTC (permalink / raw)
To: ptxdist; +Cc: Bruno Thomsen
Thanks, applied as 78da45ab6edf82f218f5ab53d5e49e77f09ea407.
Michael
[sent from post-receive hook]
On Thu, 09 Apr 2020 18:54:20 +0200, Bruno Thomsen <bruno.thomsen@gmail.com> wrote:
> When enabling or disabling sha1 integrity also keep or remove
> key exhange algorithms that rely on sha1.
>
> group14_sha1 - 2048 bit, sha1
> group1 - 1024 bit, sha1
>
> Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
> Message-Id: <20200403173021.10414-1-bruno.thomsen@gmail.com>
> Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>
>
> diff --git a/rules/dropbear.make b/rules/dropbear.make
> index 8d80ed295c15..d52efa3968e2 100644
> --- a/rules/dropbear.make
> +++ b/rules/dropbear.make
> @@ -165,9 +165,13 @@ endif
> ifdef PTXCONF_DROPBEAR_SHA1
> @echo "ptxdist: enabling sha1"
> @echo "#define DROPBEAR_SHA1_HMAC 1" >> $(DROPBEAR_LOCALOPTIONS)
> + @echo "#define DROPBEAR_DH_GROUP1 1" >> $(DROPBEAR_LOCALOPTIONS)
> + @echo "#define DROPBEAR_DH_GROUP14_SHA1 1" >> $(DROPBEAR_LOCALOPTIONS)
> else
> @echo "ptxdist: disabling sha1"
> @echo "#define DROPBEAR_SHA1_HMAC 0" >> $(DROPBEAR_LOCALOPTIONS)
> + @echo "#define DROPBEAR_DH_GROUP1 0" >> $(DROPBEAR_LOCALOPTIONS)
> + @echo "#define DROPBEAR_DH_GROUP14_SHA1 0" >> $(DROPBEAR_LOCALOPTIONS)
> endif
>
> ifdef PTXCONF_DROPBEAR_SHA1_96
_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-04-09 16:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-03 17:30 [ptxdist] [PATCH] dropbear: enable/disable sha1 include key exchange algorithms Bruno Thomsen
2020-04-09 16:54 ` [ptxdist] [APPLIED] fbgrab: remove from staging Michael Olbrich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox