package/dropbear: bump version to 2019.77
PATCH 1/1 package/dropbear: bump version to 2019.77
Drop patches as they are now upstream. Add a hash for the license file.
Verified that runtime test still works:
./support/testing/run-tests -o tests.package.test_dropbear
20:42:44 TestDropbear Starting 20:42:45 TestDropbear Building 20:44:18 TestDropbear Building done 20:44:24 TestDropbear Cleaning up
.
----------------------------------------------------------------------
Ran 1 test in 100.727s
OK
Signed-off-by Peter Korsgaard <[email protected]>
--- ...se-single-server-ecdsa-key-when-R-is-used.patch | 113 ---------- .../0002-Wait-to-fail-invalid-usernames.patch | 236 --------------------- package/dropbear/dropbear.hash | 5 +- package/dropbear/dropbear.mk | 2 +- 4 files changed, 5 insertions(+), 351 deletions(-) delete mode 100644 package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch delete mode 100644 package/dropbear/0002-Wait-to-fail-invalid-usernames.patch
package/dropbear/0001-only-advertise-single-server-ecdsa-key-when-R-is-used.patch deleted +0 -113
@@ -1,113 +0,0 @@ -# HG changeset patch -# User Matt Johnston <[email protected]> -# Date 1520519133 -28800 -# Node ID 0dc3103a5900971d1d06d9101e062ddbd1112436 -# Parent 0f149d63068d90705db7fb52c8dea15ff32eedd7 -Only advertise a single server ecdsa key when -R (generate as required) is -specified. Fixes -R now that default ecdsa key size has changed. - -Upstream-URL: https://secure.ucc.asn.au/hg/dropbear/rev/0dc3103a5900 -Signed-off-by: Peter Korsgaard <[email protected]> -diff -r 0f149d63068d -r 0dc3103a5900 svr-runopts.c ---- a/svr-runopts.c Thu Mar 08 22:22:11 2018 +0800 -+++ b/svr-runopts.c Thu Mar 08 22:25:33 2018 +0800 -@@ -526,8 +526,10 @@ - - void load_all_hostkeys() { - int i; -- int disable_unset_keys = 1; - int any_keys = 0; -+#ifdef DROPBEAR_ECDSA -+ int loaded_any_ecdsa = 0; -+#endif - - svr_opts.hostkey = new_sign_key(); - -@@ -552,14 +554,8 @@ - #endif - } - --#if DROPBEAR_DELAY_HOSTKEY -- if (svr_opts.delay_hostkey) { -- disable_unset_keys = 0; -- } --#endif -- - #if DROPBEAR_RSA -- if (disable_unset_keys && !svr_opts.hostkey->rsakey) { -+ if (!svr_opts.delay_hostkey && !svr_opts.hostkey->rsakey) { - disablekey(DROPBEAR_SIGNKEY_RSA); - } else { - any_keys = 1; -@@ -567,39 +563,54 @@ - #endif - - #if DROPBEAR_DSS -- if (disable_unset_keys && !svr_opts.hostkey->dsskey) { -+ if (!svr_opts.delay_hostkey && !svr_opts.hostkey->dsskey) { - disablekey(DROPBEAR_SIGNKEY_DSS); - } else { - any_keys = 1; - } - #endif - -+#if DROPBEAR_ECDSA -+ /* We want to advertise a single ecdsa algorithm size. -+ - If there is a ecdsa hostkey at startup we choose that that size. -+ - If we generate at runtime we choose the default ecdsa size. -+ - Otherwise no ecdsa keys will be advertised */ - --#if DROPBEAR_ECDSA -+ /* check if any keys were loaded at startup */ -+ loaded_any_ecdsa = -+ 0 - #if DROPBEAR_ECC_256 -- if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 256) -- && !svr_opts.hostkey->ecckey256) { -+ || svr_opts.hostkey->ecckey256 -+#endif -+#if DROPBEAR_ECC_384 -+ || svr_opts.hostkey->ecckey384 -+#endif -+#if DROPBEAR_ECC_521 -+ || svr_opts.hostkey->ecckey521 -+#endif -+ ; -+ any_keys |= loaded_any_ecdsa; -+ -+ /* Or an ecdsa key could be generated at runtime */ -+ any_keys |= svr_opts.delay_hostkey; -+ -+ /* At most one ecdsa key size will be left enabled */ -+#if DROPBEAR_ECC_256 -+ if (!svr_opts.hostkey->ecckey256 -+ && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 256 )) { - disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP256); -- } else { -- any_keys = 1; - } - #endif -- - #if DROPBEAR_ECC_384 -- if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 384) -- && !svr_opts.hostkey->ecckey384) { -+ if (!svr_opts.hostkey->ecckey384 -+ && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 384 )) { - disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP384); -- } else { -- any_keys = 1; - } - #endif -- - #if DROPBEAR_ECC_521 -- if ((disable_unset_keys || ECDSA_DEFAULT_SIZE != 521) -- && !svr_opts.hostkey->ecckey521) { -+ if (!svr_opts.hostkey->ecckey521 -+ && (!svr_opts.delay_hostkey || loaded_any_ecdsa || ECDSA_DEFAULT_SIZE != 521 )) { - disablekey(DROPBEAR_SIGNKEY_ECDSA_NISTP521); -- } else { -- any_keys = 1; - } - #endif - #endif /* DROPBEAR_ECDSA */ -
package/dropbear/0002-Wait-to-fail-invalid-usernames.patch deleted +0 -236
236 lines not on this page · raw message
package/dropbear/dropbear.hash +4 -1
@@ -1,2 +1,5 @@ # From https://matt.ucc.asn.au/dropbear/releases/SHA256SUM.asc -sha256 f2fb9167eca8cf93456a5fc1d4faf709902a3ab70dd44e352f3acbc3ffdaea65 dropbear-2018.76.tar.bz2 +sha256 d91f78ebe633be1d071fd1b7e5535b9693794048b019e9f4bea257e1992b458d dropbear-2019.77.tar.bz2 + +# License file, locally computed +sha256 cfa32d49e9022265375e533a4a5ef9e37d4aaa604119d612c46816aa1e59fe52 LICENSE
package/dropbear/dropbear.mk +1 -1
@@ -4,7 +4,7 @@ # ################################################################################ -DROPBEAR_VERSION = 2018.76 +DROPBEAR_VERSION = 2019.77 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
Signature · 1 line
2.11.0
PATCH 1/1 package/dropbear: bump version to 2019.77
Quoted 10 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"Peter" == Peter Korsgaard <[email protected]> writes:
Drop patches as they are now upstream. Add a hash for the license file. Verified that runtime test still works:
./support/testing/run-tests -o tests.package.test_dropbear
20:42:44 TestDropbear Starting 20:42:45 TestDropbear Building 20:44:18 TestDropbear Building done 20:44:24 TestDropbear Cleaning up
Quoted 7 lines
.
----------------------------------------------------------------------
Ran 1 test in 100.727sOK
Signed-off-by Peter Korsgaard <[email protected]>
Committed, thanks.
Signature · 1 line
Bye, Peter Korsgaard