Commit Graph

64 Commits

Author SHA1 Message Date
Sibren Vasse 1a773dd20e openssh: update to 8.8p1
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
2021-09-27 11:06:52 -07:00
Sibren Vasse 89ab4ebcdb
openssh: update to 8.7p1
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
2021-08-25 15:24:38 +02:00
Sibren Vasse cb1d8bd8ed openssh: update to 8.6p1
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
2021-04-20 12:28:30 +02:00
Sibren Vasse 16e41bcd33
openssh: update to 8.5p1
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
2021-03-03 11:38:32 +01:00
Linos Giannopoulos 855db864b0 openssh: Add FIDO2 hardware token support
Version 8.2[0] added support for two new key types: "ecdsa-sk" and
"ed25519-sk". These two type enable the usage of hardware tokens that
implement the FIDO (or FIDO2) standard, as an authentication method for
SSH.

Since we're already on version 8.4 all we need to do is to explicitly enable
the support for hardware keys when compiling OpenSSH and add all the
missing dependencies OpenSSH requires.

OpenSSH depends on libfido2[1], to communicate with the FIDO devices
over USB. In turn, libfido2 depends on libcbor, a C implementation of
the CBOR protocol[2] and OpenSSL.

[0]: https://lwn.net/Articles/812537/
[1]: https://github.com/Yubico/libfido2
[2]: tools.ietf.org/html/rfc7049

Signed-off-by: Linos Giannopoulos <linosgian00@gmail.com>
2021-01-07 00:53:05 +02:00
Huangbin Zhan 75c4617bcf treewide: move binary of alternatives to libexec, rename as suggested
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
2020-10-08 20:22:51 +08:00
Kyle Copperfield 45863b94ca openssh: add openwrt failsafe support
Adds failsafe support to the openssh package.
Roughly based on an earlier patch.

Ref: https://github.com/openwrt/openwrt/pull/865
Signed-off-by: Jeff Kletsky <git-commits@allycomm.com>
Signed-off-by: Kyle Copperfield <kmcopper@danwin1210.me>
2020-12-15 10:19:32 +00:00
Yuan Tao 27e8c832d6 openssh: update to 8.4p1
Signed-off-by: Yuan Tao <ty@wevs.org>
2020-10-05 15:20:26 +08:00
Huangbin Zhan 704e733e51 treewide: fix broken conffiles
Signed-off-by: Huangbin Zhan <zhanhb88@gmail.com>
2020-07-07 18:29:13 +08:00
Rosen Penev 8e77b50954
openssh: update to 8.3p1
Removed outdated options.

Small bashism fix in the init script.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-06-25 17:38:55 -07:00
Rosen Penev 69c297971c
openssh: always enable stackprotect option
b933f9cf0cb254e368027cad6d5799e45b237df5 in base made several changes
to OpenWrt's libssp support. It seems this workaround is no longer
needed.

Simplified the configure script slightly.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2020-06-20 00:17:37 -07:00
Philip Prindeville 73fa0c963d openssh-server: deprecate the ecdsa HostKey
The init.d script for sshd never generates an ecdsa HostKey as seen
here:

	for type in rsa ed25519
	do
		# check for keys
		key=/etc/ssh/ssh_host_${type}_key
		[ ! -f $key ] && {
			# generate missing keys
			[ -x /usr/bin/ssh-keygen ] && {
				/usr/bin/ssh-keygen -N '' -t $type -f $key 2>&- >&-
			}
		}
	done

so we'll never succeed at loading one.  Get rid of the resultant
error message in logging:

May  5 17:13:59 OpenWrt sshd[20070]: error: Unable to load host key: /etc/ssh/ssh_host_ecdsa_key

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
2020-05-05 18:03:56 -06:00
Peter Wagner 45c0fde75d openssh: don't create ECDSA keys
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2020-04-06 10:18:50 +02:00
Sibren Vasse 19a5edd35f openssh: update to 8.2p1
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
2020-04-05 14:05:11 +02:00
Sibren Vasse 0c2554222f openssh: update to 8.1p1
Signed-off-by: Sibren Vasse <github@sibrenvasse.nl>
2019-11-09 15:17:35 +01:00
Jeffery To 53e1692ae9 treewide: Use default PKG_BUILD_DIR when possible
This removes lines that set PKG_BUILD_DIR when the set value is no
different from the default value.

Specifically, the line is removed if the assigned value is:

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

  The default PKG_BUILD_DIR was updated[1] to incorporate BUILD_VARIANT
  if it is set, so now this is identical to the default value.

* $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_SOURCE_SUBDIR)

  if PKG_SOURCE_SUBDIR is set to $(PKG_NAME)-$(PKG_VERSION), making it
  the same as the previous case

* $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

  This is the same as the default PKG_BUILD_DIR when there is no
  BUILD_VARIANT.

* $(BUILD_DIR)/[name]-$(PKG_VERSION)

  where [name] is a string that is identical to PKG_NAME

[1]: https://git.openwrt.org/?p=openwrt/openwrt.git;a=commit;h=e545fac8d968864a965edb9e50c6f90940b0a6c9

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
2019-10-13 02:01:34 +08:00
Jan Pavlinec 299e5b0a9b
treewide: add PKG_CPE_ID for better cvescanner coverage
Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-09-17 12:40:26 +02:00
Rosen Penev 5a3e520f45 openssh: Fix compilation with -Wimplicit-function
Upstream backport.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2019-07-21 12:31:31 +02:00
Peter Wagner 626a4315a9 openssh: update to 8.0p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-04-20 18:09:21 +02:00
Eneas U de Queiroz 06e1764afa
openssh: adjust engine support to openssl 1.1.1
Openssl 1.1.1 package in openwrt enabled more than just the devcrypto
engine, so the engine support in openssh should be enabled when general
engine support is enabled in openssl.

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2019-04-02 16:48:08 -03:00
Peter Wagner 594a884c2d openssh: use quotes
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-03-22 20:29:52 +01:00
Peter Wagner ba72d8d139 openssh: handle multiple ports and simplify init script
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-03-21 19:31:29 +01:00
Peter Wagner d92d34db5a openssh: add upstream patches, including CVE-2019-6111
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-03-03 12:20:18 +01:00
Jan Pavlinec 4729c3fddf openssh: patch scp security issues
Fixes
CVE-2019-6109
CVE-2019-6111

Signed-off-by: Jan Pavlinec <jan.pavlinec@nic.cz>
2019-02-10 16:22:41 +01:00
Peter Wagner d82cc22019 openssh: backport patch for CVE-2018-20685
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2019-01-15 20:34:03 +01:00
Peter Wagner 08c5f7cfab openssh: fixes issues with some openssl options
This adds a couple of patches when setting some openssl options:
* ECDSA code in openssh-compat.h and libressl-api-compat.c needs to be
  be guarded by OPENSSL_HAS_ECC; otherwise, it will not build with
  openssl compiled without ECC support.

* Fix openssl version number in openbsd-compat/openssl-compat.c which
  failed to compile --with-ssl-engine; this option is used when
  CONFIG_OPENSSL_ENGINE_CRYPTO=y

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-10-20 14:06:20 +02:00
Peter Wagner 2759048914 openssh: update to 7.9p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-10-19 18:11:54 +02:00
Eneas U de Queiroz 9f76fe1445 openssh: add openssl 1.1.0 compatibility
Five commits from upstream were applied to v. 7.8-p1:

482d23bc upstream: hold our collective noses and use the openssl-1.1.x
         API in
48f54b9d adapt -portable to OpenSSL 1.1x API
86e0a9f3 upstream: use only openssl-1.1.x API here too
a3fd8074 upstream: missed a bit of openssl-1.0.x API in this unittest
d64e7852 add compat header

Signed-off-by: Eneas U de Queiroz <cote2004-github@yahoo.com>
2018-09-30 18:59:04 +02:00
Peter Wagner eacb9464e9 openssh: update to 7.8p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-08-27 21:30:14 +02:00
Yousong Zhou 1e07e684a8 openssh: let opkg manage openssh symlinks of ssh, scp
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
2018-06-25 14:09:25 +08:00
Peter Wagner 739c65e569 openssh: update to 7.7p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-04-08 19:13:59 +02:00
Matthias Schiffer 00fce347a5
treewide: fix incorrect *_BUILD_DEPENDS
Build depends refer to source package names, not binary package names.

In many cases, PKG_BUILD_DEPENDS simply duplicated runtime dependencies of
a source package's binary packages; as the corresponding source packages
are implicitly added as bulid dependencies, PKG_BUILD_DEPENDS can simply be
dropped in these cases. In the other cases, *_BUILD_DEPENDS is fixed to
refer to the correct source package name.

Dependency of mysql-server is adjusted from libncursesw to libncurses
(as libncursesw is a virtual package provided by libncurses), so the build
dependency on ncurses is emitted unconditionally.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
2018-01-09 16:36:02 +01:00
Peter Wagner 09bfebc7da openssh: update to 7.6p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2017-10-05 19:50:30 +02:00
Rosen Penev 6cb6666c97 ssh: Add umdns entry to the init script.
This is usefull for hosts to discover the ssh server, especially
on macOS.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
2017-08-15 21:44:15 -07:00
Peter Wagner a8b55048c0 openssh: add ssh_host keys to openssh-server/conffiles
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2017-07-15 21:04:31 +02:00
Philip Prindeville 9fdba25e04 openssh: if we don't generate a dsa key we shouldn't look for it
The earlier commit ea119211b2 removed 'dsa' as one of the ssh_host_*_key
types that got generated.  Problem was that it didn't remove that key
as one of the paths that the server looks for by default.  As a
consequence, your log file might fill up with messages like:

    2017-06-01T15:43:07-06:00 openwrt sshd[31929]: error: Could not load host key: /etc/ssh/ssh_host_dsa_key

The patch is forunately trivial.  Don't set the path for the dsa
key file in the server configuration.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-06-05 18:22:04 +02:00
Daniel Golle d96c092a00 Revert "The earlier commit ea119211b2 removed 'dsa' as one of the ssh_host_*_key"
The author (@pprindeville) of the original commit noted that the wrong
commit was picked, see
325b7d2cd2 (commitcomment-22387528)
"Err... looks like the wrong fix got committed. I was hoping that this
commit d902e5d would have gone in instead."

This reverts commit 325b7d2cd2.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
2017-06-05 18:22:03 +02:00
Peter Wagner 325b7d2cd2 The earlier commit ea119211b2 removed 'dsa' as one of the ssh_host_*_key
types that got generated.  Problem was that it didn't remove that key
as one of the paths that the server looks for by default.  As a
consequence, your log file might fill up with messages like:

    2017-06-01T15:43:07-06:00 openwrt sshd[31929]: error: Could not load host key: /etc/ssh/ssh_host_dsa_key

The patch is forunately trivial.  Don't set the path for the dsa
key file in the server configuration.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2017-06-03 01:04:27 +02:00
Peter Wagner 9be7653a3a openssh: update to 7.5p1, remove unneeded patches
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2017-03-21 23:30:54 +01:00
Martin Schiller 32012c6274 openssh: Fix ssl-engine support
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
2017-02-27 09:05:30 +01:00
Peter Wagner 9e269e39c3 net/openssh: Offload main site
Add a few mirrors in-front of main site for offloading

Signed-off-by: Daniel Engberg <daniel.engberg.lists@pyret.net>
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2017-01-11 00:58:26 +01:00
Peter Wagner 89b8be4135 openssh: update to 7.4p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-12-22 00:48:51 +01:00
Peter Wagner afb706d146 openssh: Unregister the KEXINIT handler after message has been
received. Otherwise an unauthenticated peer can repeat the KEXINIT and cause
allocation of up to 128MB -- until the connection is closed. Reported by
shilei-c at 360.cn

ec165c392c

Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-10-17 21:26:26 +02:00
Peter Wagner c67b05b269 openssh: move inbound NEWKEYS handling to kex layer; otherwise early NEWKEYS causes NULL deref
see: https://anongit.mindrot.org/openssh.git/commit/?id=28652bca29046f62c7045e933e6b931de1d16737

Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-10-03 21:38:15 +02:00
Peter Wagner 7ad9eb6703 openssh: update to 7.3p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-08-09 18:58:22 +02:00
Peter Wagner 1c729d723d openssh: update to 7.2p2
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-03-11 16:52:04 +01:00
Peter Wagner 0cc876bc65 openssh: v7.2p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-03-06 22:42:27 +01:00
Peter Wagner fab13041b3 openssh: update to 7.1p2
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2016-01-15 21:23:18 +01:00
Mangix ea119211b2 openssh: remove dsa and add ecdsa + ed25519 to initial keygen.
Signed-off by: Rosen Penev <rosenp@gmail.com>
2015-11-27 20:03:47 -08:00
Peter Wagner d199f2c038 openssh: update to 7.1p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2015-08-26 18:58:14 +02:00