[Buildroot] [V3 1/2] dropbear: bump to version 2018.76

[Buildroot] [V3 1/2] dropbear: bump to version 2018.76

[Francois Perrad]

with this new version:
  - "configure --enable-static" should now be used instead of
    "make STATIC=1"
  - any customised options should be put in localoptions.h

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/dropbear/dropbear.hash |  2 +-
 package/dropbear/dropbear.mk   | 27 ++++++++-------------------
 2 files changed, 9 insertions(+), 20 deletions(-)

diff --git a/package/dropbear/dropbear.hash b/package/dropbear/dropbear.hash
index 98776e717..ef2011d90 100644
--- a/package/dropbear/dropbear.hash
+++ b/package/dropbear/dropbear.hash
@@ -1,2 +1,2 @@
 # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc
-sha256 6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c dropbear-2017.75.tar.bz2
+sha256 f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 dropbear-2018.76.tar.bz2
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 01a1a07b7..634396dc0 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-DROPBEAR_VERSION = 2017.75
+DROPBEAR_VERSION = 2018.76
 DROPBEAR_SITE = https://matt.ucc.asn.au/dropbear/releases
 DROPBEAR_SOURCE = dropbear-$(DROPBEAR_VERSION).tar.bz2
 DROPBEAR_LICENSE = MIT, BSD-2-Clause-like, BSD-2-Clause
@@ -23,32 +23,22 @@ DROPBEAR_MAKE = \
 	PROGRAMS="$(DROPBEAR_PROGRAMS)"
 
 ifeq ($(BR2_STATIC_LIBS),y)
-DROPBEAR_MAKE += STATIC=1
+DROPBEAR_CONF_OPTS += --enable-static
 endif
 
-define DROPBEAR_FIX_XAUTH
-	$(SED) 's,^#define XAUTH_COMMAND.*/xauth,#define XAUTH_COMMAND "/usr/bin/xauth,g' $(@D)/options.h
-endef
-
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_FIX_XAUTH
-
 define DROPBEAR_ENABLE_REVERSE_DNS
-	$(SED) 's:.*\(#define DO_HOST_LOOKUP\).*:\1:' $(@D)/options.h
-endef
-
-define DROPBEAR_BUILD_SMALL
-	$(SED) 's:.*\(#define NO_FAST_EXPTMOD\).*:\1:' $(@D)/options.h
+	echo '#define DO_HOST_LOOKUP 1'         >> $(@D)/localoptions.h
 endef
 
 define DROPBEAR_BUILD_FEATURED
-	$(SED) 's:^#define DROPBEAR_SMALL_CODE::' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_BLOWFISH\).*:\1:' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_TWOFISH128\).*:\1:' $(@D)/options.h
-	$(SED) 's:.*\(#define DROPBEAR_TWOFISH256\).*:\1:' $(@D)/options.h
+	echo '#define DROPBEAR_SMALL_CODE 0'    >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_BLOWFISH 1'      >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_TWOFISH128 1'    >> $(@D)/localoptions.h
+	echo '#define DROPBEAR_TWOFISH256 1'    >> $(@D)/localoptions.h
 endef
 
 define DROPBEAR_DISABLE_STANDALONE
-	$(SED) 's:\(#define NON_INETD_MODE\):/*\1 */:' $(@D)/options.h
+	echo '#define NON_INETD_MODE 0'         >> $(@D)/localoptions.h
 endef
 
 define DROPBEAR_INSTALL_INIT_SYSTEMD
@@ -73,7 +63,6 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
 endif
 
 ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
-DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_SMALL
 DROPBEAR_CONF_OPTS += --disable-zlib
 else
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
-- 
2.11.0

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Francois Perrad]

DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt

Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
---
 package/dropbear/Config.in   | 1 +
 package/dropbear/dropbear.mk | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
index 670077816..5d6b83b6d 100644
--- a/package/dropbear/Config.in
+++ b/package/dropbear/Config.in
@@ -1,6 +1,7 @@
 config BR2_PACKAGE_DROPBEAR
 	bool "dropbear"
 	select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
+	select BR2_PACKAGE_LIBTOMCRYPT if !BR2_PACKAGE_DROPBEAR_SMALL
 	help
 	  A small SSH 2 server designed for small memory environments.
 
diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
index 634396dc0..e32bdc758 100644
--- a/package/dropbear/dropbear.mk
+++ b/package/dropbear/dropbear.mk
@@ -63,10 +63,11 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
 endif
 
 ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
-DROPBEAR_CONF_OPTS += --disable-zlib
+DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
 else
 DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
-DROPBEAR_DEPENDENCIES += zlib
+DROPBEAR_DEPENDENCIES += zlib libtomcrypt
+DROPBEAR_CONF_OPTS += --disable-bundled-libtom
 endif
 
 ifneq ($(BR2_PACKAGE_DROPBEAR_WTMP),y)
-- 
2.11.0

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Baruch Siach]

Hi Francois,

On Wed, Mar 21, 2018 at 05:03:29PM +0100, Francois Perrad wrote:
> DROPBEAR_SMALL_CODE could be only honored with bundled libtomcrypt
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
> ---
>  package/dropbear/Config.in   | 1 +
>  package/dropbear/dropbear.mk | 5 +++--
>  2 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/package/dropbear/Config.in b/package/dropbear/Config.in
> index 670077816..5d6b83b6d 100644
> --- a/package/dropbear/Config.in
> +++ b/package/dropbear/Config.in
> @@ -1,6 +1,7 @@
>  config BR2_PACKAGE_DROPBEAR
>  	bool "dropbear"
>  	select BR2_PACKAGE_ZLIB if !BR2_PACKAGE_DROPBEAR_SMALL
> +	select BR2_PACKAGE_LIBTOMCRYPT if !BR2_PACKAGE_DROPBEAR_SMALL
>  	help
>  	  A small SSH 2 server designed for small memory environments.
>  
> diff --git a/package/dropbear/dropbear.mk b/package/dropbear/dropbear.mk
> index 634396dc0..e32bdc758 100644
> --- a/package/dropbear/dropbear.mk
> +++ b/package/dropbear/dropbear.mk
> @@ -63,10 +63,11 @@ DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_ENABLE_REVERSE_DNS
>  endif
>  
>  ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
> -DROPBEAR_CONF_OPTS += --disable-zlib
> +DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
>  else
>  DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
> -DROPBEAR_DEPENDENCIES += zlib
> +DROPBEAR_DEPENDENCIES += zlib libtomcrypt
> +DROPBEAR_CONF_OPTS += --disable-bundled-libtom

As I said on v2[1] I think that unbundling static libraries is not worth it.

[1] http://patchwork.ozlabs.org/comment/1879448/

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Thomas Petazzoni]

Hello,

On Wed, 21 Mar 2018 19:04:13 +0200, Baruch Siach wrote:

> >  ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
> > -DROPBEAR_CONF_OPTS += --disable-zlib
> > +DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
> >  else
> >  DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
> > -DROPBEAR_DEPENDENCIES += zlib
> > +DROPBEAR_DEPENDENCIES += zlib libtomcrypt
> > +DROPBEAR_CONF_OPTS += --disable-bundled-libtom  
> 
> As I said on v2[1] I think that unbundling static libraries is not worth it.
> 
> [1] http://patchwork.ozlabs.org/comment/1879448/

I am not sure why you say that. In general, I think unbundling is good.
Why should we make an exception here ?

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Baruch Siach]

Hi Thomas,

On Wed, Mar 21, 2018 at 09:13:10PM +0100, Thomas Petazzoni wrote:
> On Wed, 21 Mar 2018 19:04:13 +0200, Baruch Siach wrote:
> > >  ifeq ($(BR2_PACKAGE_DROPBEAR_SMALL),y)
> > > -DROPBEAR_CONF_OPTS += --disable-zlib
> > > +DROPBEAR_CONF_OPTS += --disable-zlib --enable-bundled-libtom
> > >  else
> > >  DROPBEAR_POST_EXTRACT_HOOKS += DROPBEAR_BUILD_FEATURED
> > > -DROPBEAR_DEPENDENCIES += zlib
> > > +DROPBEAR_DEPENDENCIES += zlib libtomcrypt
> > > +DROPBEAR_CONF_OPTS += --disable-bundled-libtom  
> > 
> > As I said on v2[1] I think that unbundling static libraries is not worth it.
> > 
> > [1] http://patchwork.ozlabs.org/comment/1879448/
> 
> I am not sure why you say that. In general, I think unbundling is good.
> Why should we make an exception here ?

Here is my full commit on v2:

Since both libraries are static only, this does not reduce the binary size. On
the other hand, bundled libraries are more likely to work correctly with any
give version of dropbear. The only benefit of using external libraries is when
there is a security update to the libraries. But unless there is a known issue
now, I'm not sure it's worth it.

Do you see other reasons to prefer unbundling?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Thomas Petazzoni]

Hello,

On Wed, 21 Mar 2018 22:16:08 +0200, Baruch Siach wrote:

> Here is my full commit on v2:
> 
> Since both libraries are static only, this does not reduce the binary size. On
> the other hand, bundled libraries are more likely to work correctly with any
> give version of dropbear. The only benefit of using external libraries is when
> there is a security update to the libraries. But unless there is a known issue
> now, I'm not sure it's worth it.
> 
> Do you see other reasons to prefer unbundling?

Well, exactly the one you mention: security issues.

In fact, I think you're putting the problem in the wrong direction. I
would rather say: "Unless there is a good reason to not use external
libraries, we should use external libraries rather than bundled ones".

Best regards,

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Baruch Siach]

Hi Thomas,

On Wed, Mar 21, 2018 at 09:22:55PM +0100, Thomas Petazzoni wrote:
> On Wed, 21 Mar 2018 22:16:08 +0200, Baruch Siach wrote:
> > Here is my full commit on v2:
> > 
> > Since both libraries are static only, this does not reduce the binary size. On
> > the other hand, bundled libraries are more likely to work correctly with any
> > give version of dropbear. The only benefit of using external libraries is when
> > there is a security update to the libraries. But unless there is a known issue
> > now, I'm not sure it's worth it.
> > 
> > Do you see other reasons to prefer unbundling?
> 
> Well, exactly the one you mention: security issues.
> 
> In fact, I think you're putting the problem in the wrong direction. I
> would rather say: "Unless there is a good reason to not use external
> libraries, we should use external libraries rather than bundled ones".

I think we should be more careful in this case. Crypto primitives are 
"hazmat"[1]. dropbear is an actively maintained project. I think we can trust 
dropbear to react immediately when there is a known issue with the crypto 
libraries that affects the dropbear use case. In my opinion, the danger of 
crypto libraries version mismatch resulting from untested crypto library 
update, outweighs the danger of known vulnerability window in a dropbear 
bundled crypto library.

[1] https://cryptography.io/en/latest/hazmat/primitives/

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[François Perrad]

2018-03-22 6:36 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:

> Hi Thomas,
>
> On Wed, Mar 21, 2018 at 09:22:55PM +0100, Thomas Petazzoni wrote:
> > On Wed, 21 Mar 2018 22:16:08 +0200, Baruch Siach wrote:
> > > Here is my full commit on v2:
> > >
> > > Since both libraries are static only, this does not reduce the binary
> size. On
> > > the other hand, bundled libraries are more likely to work correctly
> with any
> > > give version of dropbear. The only benefit of using external libraries
> is when
> > > there is a security update to the libraries. But unless there is a
> known issue
> > > now, I'm not sure it's worth it.
> > >
> > > Do you see other reasons to prefer unbundling?
> >
> > Well, exactly the one you mention: security issues.
> >
> > In fact, I think you're putting the problem in the wrong direction. I
> > would rather say: "Unless there is a good reason to not use external
> > libraries, we should use external libraries rather than bundled ones".
>
>
By default, dropbear prefers unbundled libtom, see
https://github.com/mkj/dropbear/blob/master/configure.ac#L507-L509

Fran?ois



> I think we should be more careful in this case. Crypto primitives are
> "hazmat"[1]. dropbear is an actively maintained project. I think we can
> trust
> dropbear to react immediately when there is a known issue with the crypto
> libraries that affects the dropbear use case. In my opinion, the danger of
> crypto libraries version mismatch resulting from untested crypto library
> update, outweighs the danger of known vulnerability window in a dropbear
> bundled crypto library.
>
> [1] https://cryptography.io/en/latest/hazmat/primitives/
>
> baruch
>
> --
>      http://baruch.siach.name/blog/                  ~. .~   Tk Open
> Systems
> =}------------------------------------------------ooO--U--
> Ooo------------{=
>    - baruch at tkos.co.il - tel: +972.2.679.5364, http://www.tkos.co.il -
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180323/b079cba3/attachment.html>

[Buildroot] [V3 2/2] dropbear: unbundle libtomath & libtomcrypt

[Baruch Siach]

Hi Fran?ois,

On Fri, Mar 23, 2018 at 05:15:43AM +0100, Fran?ois Perrad wrote:
> 2018-03-22 6:36 GMT+01:00 Baruch Siach <baruch@tkos.co.il>:
> > On Wed, Mar 21, 2018 at 09:22:55PM +0100, Thomas Petazzoni wrote:
> > > On Wed, 21 Mar 2018 22:16:08 +0200, Baruch Siach wrote:
> > > > Here is my full commit on v2:
> > > >
> > > > Since both libraries are static only, this does not reduce the binary
> > size. On
> > > > the other hand, bundled libraries are more likely to work correctly
> > with any
> > > > give version of dropbear. The only benefit of using external libraries
> > is when
> > > > there is a security update to the libraries. But unless there is a
> > known issue
> > > > now, I'm not sure it's worth it.
> > > >
> > > > Do you see other reasons to prefer unbundling?
> > >
> > > Well, exactly the one you mention: security issues.
> > >
> > > In fact, I think you're putting the problem in the wrong direction. I
> > > would rather say: "Unless there is a good reason to not use external
> > > libraries, we should use external libraries rather than bundled ones".
>
> By default, dropbear prefers unbundled libtom, see
> https://github.com/mkj/dropbear/blob/master/configure.ac#L507-L509

Right. So if that's upstream choice I'm fine with that.

Reviewed-by: Baruch Siach <baruch@tkos.co.il>

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch at tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -

[Buildroot] [V3 1/2] dropbear: bump to version 2018.76

[Thomas Petazzoni]

Hello,

On Wed, 21 Mar 2018 17:03:28 +0100, Francois Perrad wrote:
> with this new version:
>   - "configure --enable-static" should now be used instead of
>     "make STATIC=1"
>   - any customised options should be put in localoptions.h
> 
> Signed-off-by: Francois Perrad <francois.perrad@gadz.org>

With this patch applied, the following defconfig:

BR2_arm=y
BR2_TOOLCHAIN_EXTERNAL=y
BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/toolchains/tarballs/br-arm-full-2017.11-rc1.tar.bz2"
BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
# BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
BR2_TOOLCHAIN_EXTERNAL_CXX=y
BR2_INIT_NONE=y
BR2_SYSTEM_BIN_SH_NONE=y
# BR2_PACKAGE_BUSYBOX is not set
BR2_PACKAGE_DROPBEAR=y
# BR2_TARGET_ROOTFS_TAR is not set

fails to build with:

>>> dropbear 2018.76 Building
PATH="/home/thomas/projets/buildroot/output/host/bin:/home/thomas/projets/buildroot/output/host/sbin:/usr/local/bin:/usr/bin:/bin:/home/thomas/.rvm/bin:/usr/local/sbin:/usr/sbin:/home/thomas/.rvm/bin:/home/thomas/sys/bin:/home/thomas/.gem/ruby/2.1.0/bin:/home/thomas/.rvm/bin"  /usr/bin/make -j5 MULTI=1 SCPPROGRESS=1 PROGRAMS="dropbear dropbearkey dropbearconvert scp dbclient ssh dbclient"  -C /home/thomas/projets/buildroot/output/build/dropbear-2018.76/
Creating default_options_guard.h
/home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 dbmulti.c -o dbmulti.o
/home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 atomicio.c -o atomicio.o
/home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 bignum.c -o bignum.o
/home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 buffer.c -o buffer.o
/home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I. -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 circbuffer.c -o circbuffer.o
In file included from options.h:23:0,
                 from includes.h:29,
                 from bignum.c:27:
sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
  #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
   ^
In file included from options.h:23:0,
                 from includes.h:29,
                 from buffer.c:27:
sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
  #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
   ^
In file included from options.h:23:0,
                 from includes.h:29,
                 from dbmulti.c:25:
sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
  #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
   ^
In file included from options.h:23:0,
                 from includes.h:29,
                 from circbuffer.c:25:
sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
  #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
   ^
In file included from options.h:23:0,
                 from includes.h:29,
                 from atomicio.c:30:
sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
  #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
   ^
In file included from includes.h:119:0,
                 from buffer.c:27:
compat.h:43:7: error: conflicting types for ?__xpg_basename?
 char *basename(const char* path);
       ^
/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note: previous declaration of ?__xpg_basename? was here
 extern char *__xpg_basename (char *__path) __THROW;
              ^
make[2]: *** [Makefile:128: buffer.o] Error 1
make[2]: *** Waiting for unfinished jobs....
In file included from includes.h:119:0,
                 from circbuffer.c:25:
compat.h:43:7: error: conflicting types for ?__xpg_basename?
 char *basename(const char* path);
       ^
/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note: previous declaration of ?__xpg_basename? was here
 extern char *__xpg_basename (char *__path) __THROW;
              ^
make[2]: *** [Makefile:128: circbuffer.o] Error 1
In file included from includes.h:119:0,
                 from bignum.c:27:
compat.h:43:7: error: conflicting types for ?__xpg_basename?
 char *basename(const char* path);
       ^
/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note: previous declaration of ?__xpg_basename? was here
 extern char *__xpg_basename (char *__path) __THROW;
              ^
In file included from includes.h:119:0,
                 from dbmulti.c:25:
compat.h:43:7: error: conflicting types for ?__xpg_basename?
 char *basename(const char* path);
       ^
/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note: previous declaration of ?__xpg_basename? was here
 extern char *__xpg_basename (char *__path) __THROW;
              ^
make[2]: *** [Makefile:128: bignum.o] Error 1
make[2]: *** [Makefile:128: dbmulti.o] Error 1
In file included from includes.h:119:0,
                 from atomicio.c:30:
compat.h:43:7: error: conflicting types for ?__xpg_basename?
 char *basename(const char* path);
       ^
/home/thomas/projets/buildroot/output/host/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note: previous declaration of ?__xpg_basename? was here
 extern char *__xpg_basename (char *__path) __THROW;
              ^
make[2]: *** [Makefile:128: atomicio.o] Error 1
make[1]: *** [package/pkg-generic.mk:224: /home/thomas/projets/buildroot/output/build/dropbear-2018.76/.stamp_built] Error 2
make: *** [Makefile:79: _all] Error 2

Could you have a look ?

Thanks!

Thomas Petazzoni
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [V3 1/2] dropbear: bump to version 2018.76

[François Perrad]

2018-03-26 22:18 GMT+02:00 Thomas Petazzoni <thomas.petazzoni@bootlin.com>:

> Hello,
>
> On Wed, 21 Mar 2018 17:03:28 +0100, Francois Perrad wrote:
> > with this new version:
> >   - "configure --enable-static" should now be used instead of
> >     "make STATIC=1"
> >   - any customised options should be put in localoptions.h
> >
> > Signed-off-by: Francois Perrad <francois.perrad@gadz.org>
>
> With this patch applied, the following defconfig:
>
> BR2_arm=y
> BR2_TOOLCHAIN_EXTERNAL=y
> BR2_TOOLCHAIN_EXTERNAL_CUSTOM=y
> BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y
> BR2_TOOLCHAIN_EXTERNAL_URL="http://autobuild.buildroot.org/
> toolchains/tarballs/br-arm-full-2017.11-rc1.tar.bz2"
> BR2_TOOLCHAIN_EXTERNAL_GCC_4_9=y
> BR2_TOOLCHAIN_EXTERNAL_HEADERS_3_10=y
> BR2_TOOLCHAIN_EXTERNAL_LOCALE=y
> # BR2_TOOLCHAIN_EXTERNAL_HAS_THREADS_DEBUG is not set
> BR2_TOOLCHAIN_EXTERNAL_CXX=y
> BR2_INIT_NONE=y
> BR2_SYSTEM_BIN_SH_NONE=y
> # BR2_PACKAGE_BUSYBOX is not set
> BR2_PACKAGE_DROPBEAR=y
> # BR2_TARGET_ROOTFS_TAR is not set
>
> fails to build with:
>
> >>> dropbear 2018.76 Building
> PATH="/home/thomas/projets/buildroot/output/host/bin:/
> home/thomas/projets/buildroot/output/host/sbin:/usr/local/
> bin:/usr/bin:/bin:/home/thomas/.rvm/bin:/usr/local/
> sbin:/usr/sbin:/home/thomas/.rvm/bin:/home/thomas/sys/bin:/
> home/thomas/.gem/ruby/2.1.0/bin:/home/thomas/.rvm/bin"  /usr/bin/make -j5
> MULTI=1 SCPPROGRESS=1 PROGRAMS="dropbear dropbearkey dropbearconvert scp
> dbclient ssh dbclient"  -C /home/thomas/projets/buildroot/output/build/
> dropbear-2018.76/
> Creating default_options_guard.h
> /home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c
> -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I.
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W
> -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong
> -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER
> -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert
> -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient
> -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 dbmulti.c -o dbmulti.o
> /home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c
> -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I.
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W
> -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong
> -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER
> -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert
> -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient
> -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 atomicio.c -o atomicio.o
> /home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c
> -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I.
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W
> -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong
> -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER
> -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert
> -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient
> -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 bignum.c -o bignum.o
> /home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c
> -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I.
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W
> -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong
> -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER
> -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert
> -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient
> -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 buffer.c -o buffer.o
> /home/thomas/projets/buildroot/output/host/bin/arm-linux-gcc -c
> -I./libtomcrypt/src/headers/ -DLOCALOPTIONS_H_EXISTS -I. -I.
> -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -W
> -Wall -Wno-pointer-sign -fno-strict-overflow -fPIE -fstack-protector-strong
> -D_FORTIFY_SOURCE=2 -DDROPBEAR_SERVER -DDROPBEAR_CLIENT -DPROGRESS_METER
> -DDBMULTI_dropbear -DDBMULTI_dropbearkey -DDBMULTI_dropbearconvert
> -DDBMULTI_scp -DDBMULTI_dbclient -DDBMULTI_ssh -DDBMULTI_dbclient
> -DDROPBEAR_MULTI -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
> -D_FILE_OFFSET_BITS=64 circbuffer.c -o circbuffer.o
> In file included from options.h:23:0,
>                  from includes.h:29,
>                  from bignum.c:27:
> sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires
> `crypt()'."
>   #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
>    ^
> In file included from options.h:23:0,
>                  from includes.h:29,
>                  from buffer.c:27:
> sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires
> `crypt()'."
>   #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
>    ^
> In file included from options.h:23:0,
>                  from includes.h:29,
>                  from dbmulti.c:25:
> sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires
> `crypt()'."
>   #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
>    ^
> In file included from options.h:23:0,
>                  from includes.h:29,
>                  from circbuffer.c:25:
> sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires
> `crypt()'."
>   #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
>    ^
> In file included from options.h:23:0,
>                  from includes.h:29,
>                  from atomicio.c:30:
> sysoptions.h:237:3: error: #error "DROPBEAR_SVR_PASSWORD_AUTH requires
> `crypt()'."
>   #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
>    ^
> In file included from includes.h:119:0,
>                  from buffer.c:27:
> compat.h:43:7: error: conflicting types for ?__xpg_basename?
>  char *basename(const char* path);
>        ^
> /home/thomas/projets/buildroot/output/host/arm-
> buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note:
> previous declaration of ?__xpg_basename? was here
>  extern char *__xpg_basename (char *__path) __THROW;
>               ^
> make[2]: *** [Makefile:128: buffer.o] Error 1
> make[2]: *** Waiting for unfinished jobs....
> In file included from includes.h:119:0,
>                  from circbuffer.c:25:
> compat.h:43:7: error: conflicting types for ?__xpg_basename?
>  char *basename(const char* path);
>        ^
> /home/thomas/projets/buildroot/output/host/arm-
> buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note:
> previous declaration of ?__xpg_basename? was here
>  extern char *__xpg_basename (char *__path) __THROW;
>               ^
> make[2]: *** [Makefile:128: circbuffer.o] Error 1
> In file included from includes.h:119:0,
>                  from bignum.c:27:
> compat.h:43:7: error: conflicting types for ?__xpg_basename?
>  char *basename(const char* path);
>        ^
> /home/thomas/projets/buildroot/output/host/arm-
> buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note:
> previous declaration of ?__xpg_basename? was here
>  extern char *__xpg_basename (char *__path) __THROW;
>               ^
> In file included from includes.h:119:0,
>                  from dbmulti.c:25:
> compat.h:43:7: error: conflicting types for ?__xpg_basename?
>  char *basename(const char* path);
>        ^
> /home/thomas/projets/buildroot/output/host/arm-
> buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note:
> previous declaration of ?__xpg_basename? was here
>  extern char *__xpg_basename (char *__path) __THROW;
>               ^
> make[2]: *** [Makefile:128: bignum.o] Error 1
> make[2]: *** [Makefile:128: dbmulti.o] Error 1
> In file included from includes.h:119:0,
>                  from atomicio.c:30:
> compat.h:43:7: error: conflicting types for ?__xpg_basename?
>  char *basename(const char* path);
>        ^
> /home/thomas/projets/buildroot/output/host/arm-
> buildroot-linux-uclibcgnueabi/sysroot/usr/include/libgen.h:34:14: note:
> previous declaration of ?__xpg_basename? was here
>  extern char *__xpg_basename (char *__path) __THROW;
>               ^
> make[2]: *** [Makefile:128: atomicio.o] Error 1
> make[1]: *** [package/pkg-generic.mk:224: /home/thomas/projets/
> buildroot/output/build/dropbear-2018.76/.stamp_built] Error 2
> make: *** [Makefile:79: _all] Error 2
>
> Could you have a look ?
>
>

The presence of crypt() is detected by the configure script.

in dropbear-2017-75/options.h, the logic was :
    /* This requires crypt() */
    #ifdef HAVE_CRYPT
    #define ENABLE_SVR_PASSWORD_AUTH
    #endif

in dropbear-2018-76/sysoptions.h, the logic is now :
    #if DROPBEAR_SVR_PASSWORD_AUTH && !HAVE_CRYPT
        #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
    #endif

So, without something like BR2_TOOLCHAIN_HAS_CRYPT,
we must always disable the option DROPBEAR_SVR_PASSWORD_AUTH in
localoptions.h.

Fran?ois


> Thanks!
>
> Thomas Petazzoni
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180328/fc34dbe1/attachment.html>

[Buildroot] [V3 1/2] dropbear: bump to version 2018.76

[Thomas Petazzoni]

Hello,

On Wed, 28 Mar 2018 09:57:57 +0200, Fran?ois Perrad wrote:

> > Could you have a look ?
> 
> The presence of crypt() is detected by the configure script.

So, if it's detected by the configure script, there should be no
problem, no ?

> in dropbear-2017-75/options.h, the logic was :
>     /* This requires crypt() */
>     #ifdef HAVE_CRYPT
>     #define ENABLE_SVR_PASSWORD_AUTH
>     #endif
> 
> in dropbear-2018-76/sysoptions.h, the logic is now :
>     #if DROPBEAR_SVR_PASSWORD_AUTH && !HAVE_CRYPT
>         #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
>     #endif
> 
> So, without something like BR2_TOOLCHAIN_HAS_CRYPT,
> we must always disable the option DROPBEAR_SVR_PASSWORD_AUTH in
> localoptions.h.

I don't understand. On one hand, you say that the presence of crypt()
is detected by the configure script, and on the other hand, you say
that we must tell Dropbear explicitly whether crypt() is available or
not.

Could you clarify ?

Thanks!

Thomas
-- 
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

[Buildroot] [V3 1/2] dropbear: bump to version 2018.76

[François Perrad]

2018-03-28 10:01 GMT+02:00 Thomas Petazzoni <thomas.petazzoni@bootlin.com>:

> Hello,
>
> On Wed, 28 Mar 2018 09:57:57 +0200, Fran?ois Perrad wrote:
>
> > > Could you have a look ?
> >
> > The presence of crypt() is detected by the configure script.
>
> So, if it's detected by the configure script, there should be no
> problem, no ?
>
> > in dropbear-2017-75/options.h, the logic was :
> >     /* This requires crypt() */
> >     #ifdef HAVE_CRYPT
> >     #define ENABLE_SVR_PASSWORD_AUTH
> >     #endif
> >
> > in dropbear-2018-76/sysoptions.h, the logic is now :
> >     #if DROPBEAR_SVR_PASSWORD_AUTH && !HAVE_CRYPT
> >         #error "DROPBEAR_SVR_PASSWORD_AUTH requires `crypt()'."
> >     #endif
> >
> > So, without something like BR2_TOOLCHAIN_HAS_CRYPT,
> > we must always disable the option DROPBEAR_SVR_PASSWORD_AUTH in
> > localoptions.h.
>
> I don't understand. On one hand, you say that the presence of crypt()
> is detected by the configure script, and on the other hand, you say
> that we must tell Dropbear explicitly whether crypt() is available or
> not.
>
> Could you clarify ?
>
>
I solve the issue by writing :
    #if !HAVE_CRYPT
    #define DROPBEAR_SVR_PASSWORD_AUTH 0
    #endif
in the localoptions.h file.

Fran?ois



> Thanks!
>
> Thomas
> --
> Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> https://bootlin.com
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.busybox.net/pipermail/buildroot/attachments/20180328/61266504/attachment.html>