* [Buildroot] [PATCH] package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour
@ 2020-06-25 7:58 Francois Perrad
2020-06-25 10:38 ` Alexander Dahl
2020-06-25 21:13 ` Yann E. MORIN
0 siblings, 2 replies; 3+ messages in thread
From: Francois Perrad @ 2020-06-25 7:58 UTC (permalink / raw)
To: buildroot
now, BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO works like with version 2019.78
and as described in Config.in
Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
package/dropbear/dropbear.mk | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index b32f39d64..b7342cef5 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -56,7 +56,14 @@ endef
DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH
endif
-ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y)
+ifeq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y)
+define DROPBEAR_ENABLE_LEGACY_CRYPTO
+ echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h
+ echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h
+ echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h
+endef
+DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO
+else
define DROPBEAR_DISABLE_LEGACY_CRYPTO
echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h
echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h
--
2.25.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour
2020-06-25 7:58 [Buildroot] [PATCH] package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour Francois Perrad
@ 2020-06-25 10:38 ` Alexander Dahl
2020-06-25 21:13 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Alexander Dahl @ 2020-06-25 10:38 UTC (permalink / raw)
To: buildroot
Hei hei,
On Thu, Jun 25, 2020 at 09:58:41AM +0200, Francois Perrad wrote:
> now, BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO works like with version 2019.78
> and as described in Config.in
Thanks for your effort.
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
> package/dropbear/dropbear.mk | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> index b32f39d64..b7342cef5 100644
> --- a/package/dropbear/dropbear.mk
> +++ b/package/dropbear/dropbear.mk
> @@ -56,7 +56,14 @@ endef
> DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH
> endif
>
> -ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y)
> +ifeq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y)
> +define DROPBEAR_ENABLE_LEGACY_CRYPTO
> + echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h
> +endef
> +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO
> +else
> define DROPBEAR_DISABLE_LEGACY_CRYPTO
> echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h
> echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h
LGTM
Acked-by: Alexander Dahl <post@lespocky.de>
Greets
Alex
--
/"\ ASCII RIBBON | ?With the first link, the chain is forged. The first
\ / CAMPAIGN | speech censured, the first thought forbidden, the
X AGAINST | first freedom denied, chains us all irrevocably.?
/ \ HTML MAIL | (Jean-Luc Picard, quoting Judge Aaron Satie)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 833 bytes
Desc: not available
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20200625/1d81463a/attachment.asc>
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH] package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour
2020-06-25 7:58 [Buildroot] [PATCH] package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour Francois Perrad
2020-06-25 10:38 ` Alexander Dahl
@ 2020-06-25 21:13 ` Yann E. MORIN
1 sibling, 0 replies; 3+ messages in thread
From: Yann E. MORIN @ 2020-06-25 21:13 UTC (permalink / raw)
To: buildroot
Francois, All,
On 2020-06-25 09:58 +0200, Francois Perrad spake thusly:
> now, BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO works like with version 2019.78
> and as described in Config.in
>
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
Applied to master, thanks.
But see a nit, below...
> ---
> package/dropbear/dropbear.mk | 9 ++++++++-
> 1 file changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> index b32f39d64..b7342cef5 100644
> --- a/package/dropbear/dropbear.mk
> +++ b/package/dropbear/dropbear.mk
> @@ -56,7 +56,14 @@ endef
> DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH
> endif
>
> -ifneq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y)
> +ifeq ($(BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO),y)
> +define DROPBEAR_ENABLE_LEGACY_CRYPTO
> + echo '#define DROPBEAR_3DES 1' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_ENABLE_CBC_MODE 1' >> $(@D)/localoptions.h
> + echo '#define DROPBEAR_SHA1_96_HMAC 1' >> $(@D)/localoptions.h
> +endef
> +DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_LEGACY_CRYPTO
I know you followed the existing code, but semantically that is not
correct: it is not a post-=extract hook, but rather, it is a
pre=configure hook.
Indeed, post-extract hooks are there to "fixup" the extraction, while
pre-configure hooks are there to "prepare" the configure step.
Would you care to see if swithching all those to _PRE_CONFIGURE_HOOKS is
possible and has not side-effect, please?
Regards,
Yann E. MORIN.
> +else
> define DROPBEAR_DISABLE_LEGACY_CRYPTO
> echo '#define DROPBEAR_DSS 0' >> $(@D)/localoptions.h
> echo '#define DROPBEAR_DH_GROUP1 0' >> $(@D)/localoptions.h
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-06-25 21:13 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-25 7:58 [Buildroot] [PATCH] package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour Francois Perrad
2020-06-25 10:38 ` Alexander Dahl
2020-06-25 21:13 ` Yann E. MORIN
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox