Skip to contentSkip to conversation

package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour

PATCH New Francois Perrad 3 participants 3 messages Jun 25, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour

now, BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO works like with version 2019.78 and as described in Config.in

---
 package/dropbear/dropbear.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/dropbear/dropbear.mk +8 -1
index b32f39d64..b7342cef5 100644
@@ -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
Signature · 1 line
2.25.1
#1 lore raw

PATCH 1/1 package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour

Hei hei,

Quoted 2 lines · Francois Perrad

now, BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO works like with version 2019.78 and as described in Config.in

Thanks for your effort.

Quoted 15 lines
---
 package/dropbear/dropbear.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/dropbear/dropbear.mk +1 -1
index b32f39d64..b7342cef5 100644
@@ -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)

package/dropbear/dropbear.mk endef · line 69

Quoted 10 lines
package/dropbear/dropbear.mk +7 -0
+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

Greets
Alex

Signature · 11 lines
/"\ 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>
#2 lore raw

PATCH 1/1 package/dropbear: restore full BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO behaviour

In reply to Francois Perrad

Francois, All,

On 2020-06-25 09:58 +0200, Francois Perrad spake thusly:

Quoted 4 lines

now, BR2_PACKAGE_DROPBEAR_LEGACY_CRYPTO works like with version 2019.78 and as described in Config.in

Applied to master, thanks.

But see a nit, below...

Quoted 10 lines
---
 package/dropbear/dropbear.mk | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)
package/dropbear/dropbear.mk +0 -0
index b32f39d64..b7342cef5 100644
@@ -56,7 +56,14 @@ endef
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_SVR_PASSWORD_AUTH

package/dropbear/dropbear.mk endef · line 65

Quoted 10 lines
package/dropbear/dropbear.mk +7 -1
 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.

Quoted 11 lines
package/dropbear/dropbear.mk +1 -0
+else
 define DROPBEAR_DISABLE_LEGACY_CRYPTO
 	echo '#define DROPBEAR_DSS 0'                   >> $(@D)/localoptions.h
 	echo '#define DROPBEAR_DH_GROUP1 0'             >> $(@D)/localoptions.h
Signature · 6 lines
2.25.1

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  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.  |
'------------------------------^-------^------------------^--------------------'