Commit graph

15 commits

Author SHA1 Message Date
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
Peter Wagner
739c65e569 openssh: update to 7.7p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2018-04-08 19:13:59 +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
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
9322b6e80b openssh: update to 6.8p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2015-03-19 10:35:59 +01:00
Peter Wagner
30bdda47fb openssh: update to 6.7p1
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2014-10-19 04:45:16 +02:00
Peter Wagner
fe62d146fa openssh: import from packages
Signed-off-by: Peter Wagner <tripolar@gmx.at>
2014-06-16 11:45:34 +02:00