1001 Commits

Author SHA1 Message Date
Jung-uk Kim
c2ffa318e5 MFC: r328419
Add declaration of SSL_get_selected_srtp_profile() for OpenSSL.

Differential Revision:	https://reviews.freebsd.org/D10525
2018-01-29 18:12:59 +00:00
Jung-uk Kim
81a38a6383 MFC: r326662
Merge OpenSSL 1.0.2n.
2017-12-07 18:04:48 +00:00
Jung-uk Kim
1334b4b06d MFC: r325328
Merge OpenSSL 1.0.2m.
2017-11-02 18:30:41 +00:00
Jung-uk Kim
1bb10e1672 MFC: r318899
Merge OpenSSL 1.0.2l.
2017-11-02 18:22:53 +00:00
Jung-uk Kim
dfa5b43b8c MFC: r316607 (andrew)
Fix linking with lld by marking OPENSSL_armcap_P as hidden.

Linking with lld fails as it contains a relative address, however the data
this address is for may be relocated from the shared object to the main
executable.

Fix this by adding the hidden attribute. This stops moving this value to
the main executable. It seems this is implicit upstream as it uses a
version script.
2017-11-02 18:20:05 +00:00
Jung-uk Kim
e48ce1a8bd MFC: r307976
Build OpenSSL assembly sources for aarch64.
2017-11-02 18:16:01 +00:00
Dag-Erling Smørgrav
7c039ebc5c MFH (r322052): Upgrade OpenSSH to 7.5p1. 2017-09-02 23:39:51 +00:00
Dag-Erling Smørgrav
ede8014b82 MFH (r314306,r314720): Upgrade OpenSSH to 7.4p1. 2017-09-02 21:58:42 +00:00
Dag-Erling Smørgrav
4aaa10cab9 MFH (r314527,r314576,r314601,r317998): Upgrade OpenSSH to 7.3p1. 2017-09-02 14:25:20 +00:00
Xin LI
d4649e920a Apply upstream fix:
Skip passwords longer than 1k in length so clients can't
easily DoS sshd by sending very long passwords, causing it to spend CPU
hashing them. feedback djm@, ok markus@.

Brought to our attention by tomas.kuthan at oracle.com, shilei-c at
360.cn and coredump at autistici.org

Security:	CVE-2016-6515
Security:	FreeBSD-SA-17:06.openssh
2017-08-10 06:36:37 +00:00
Xin LI
f18a38a40c MFC r320906: MFV r320905: Import upstream fix for CVE-2017-11103.
In _krb5_extract_ticket() the KDC-REP service name must be obtained from
encrypted version stored in 'enc_part' instead of the unencrypted version
stored in 'ticket'.  Use of the unecrypted version provides an
opportunity for successful server impersonation and other attacks.

Submitted by:	hrs
Obtained from:	Heimdal
Security:	FreeBSD-SA-17:05.heimdal
Security:	CVE-2017-11103
2017-07-12 07:26:07 +00:00
Kurt Lidl
668f1559ef MFC r318242: Refine and update blacklist support in sshd
Adjust notification points slightly to catch all auth failures, rather
than just the ones caused by bad usernames.  Modify notification point
for bad usernames to send new type of BLACKLIST_BAD_USER.  (Support in
libblacklist will be forthcoming soon.)  Add guards to allow library
headers to expose the enum of action values.

Reviewed by:	des
Relnotes:	yes
Sponsored by:	The FreeBSD Foundation
2017-05-17 14:28:01 +00:00
Ed Maste
231cd628de MFC r304624: Remove duplicate symbol from libhx509 version-script.map
Upstream commit r21331 (7758a5d0) added semiprivate function
_hx509_request_to_pkcs10 twice. This change has been committed upstream
as 8ef0071d.

Sponsored by:	The FreeBSD Foundation
2017-04-03 19:57:05 +00:00
Ed Maste
f3df4493d4 MFC r303156: Remove duplicate symbols from libroken version-script.map
Upstream commit r24759 (efed563) prefixed some symbols with rk_, but
introduced 6 duplicate symbols in the version script (because the
rk_-prefixed versions of the symbols were already present).

Sponsored by:	The FreeBSD Foundation
2017-04-03 17:37:41 +00:00
Kurt Lidl
3346c1364d MFC r313965:
Only notify blacklistd for successful logins in auth.c

Before this change, every pass through auth.c resulted in a
call to blacklist_notify().

In a normal remote login, there would be a failed login flagged for
the printing of the "xxx login:" prompt, before the remote user
could enter a password.

If the user successfully entered a good password, then a good login
would be flagged, and everything would be OK.

If the user entered an incorrect password, there would be another
failed login flagged in auth1.c (or auth2.c) for the actual bad
password attempt.  Finally, when sshd got around to issuing the
second "xxx login:" prompt, there would be yet another failed login
notice sent to blacklistd.

So, if there was a 3 bad logins limit set (the default), the system
would actually block the address after the first bad password attempt.

Reported by:	Rick Adams
Reviewed by:	des
Sponsored by:	The FreeBSD Foundation
2017-02-22 04:15:39 +00:00
Enji Cooper
be4eea7d7b MFC r311585:
Conditionalize building libwrap support into sshd

Only build libwrap support into sshd if MK_TCP_WRAPPERS != no

This will unbreak the build if libwrap has been removed from the system

PR:		210141
2017-02-04 17:26:28 +00:00
Jung-uk Kim
14f9059e30 MFC: r312825
Merge OpenSSL 1.0.2k.
2017-01-26 19:14:14 +00:00
Xin LI
c08456c2b7 MFC r311914: MFV r311913:
Fix multiple OpenSSH vulnerabilities.

Submitted by:	des
Approved by:	so
2017-01-11 05:56:40 +00:00
Xin LI
b51484f949 MFC r308197: MFV r308196:
Fix OpenSSH remote Denial of Service vulnerability.

Security:	CVE-2016-8858
2016-11-02 06:56:35 +00:00
Jung-uk Kim
aacbc7b7e5 MFC: r306342
Merge OpenSSL 1.0.2j.
2016-09-26 14:30:19 +00:00
Jung-uk Kim
be7d58d788 MFC: r306193
Merge OpenSSL 1.0.2u.
2016-09-22 14:57:48 +00:00
Kurt Lidl
abdc647393 MFC r305065: Add refactored blacklist support to sshd
Change the calls to of blacklist_init() and blacklist_notify to be
macros defined in the blacklist_client.h file.  This avoids
the need for #ifdef USE_BLACKLIST / #endif except in the
blacklist.c file.

Remove redundent initialization attempts from within
blacklist_notify - everything always goes through
blacklistd_init().

Added UseBlacklist option to sshd, which defaults to off.
To enable the functionality, use '-o UseBlacklist=yes' on
the command line, or uncomment in the sshd_config file.

Approved by:	des
Sponsored by:	The FreeBSD Foundation
2016-09-06 14:52:14 +00:00
Jung-uk Kim
27279c93d1 MFC: r304636
Build OpenSSL assembly sources for arm.
2016-08-31 20:30:49 +00:00
Dag-Erling Smørgrav
64f44a7c96 MFH (r303832): check whether each key file exists before adding it
PR:		208254
Approved by:	re (kib)
2016-08-11 08:29:15 +00:00
Dag-Erling Smørgrav
44a8f55c90 MFH (r303716, r303719): drop SSH1 support, disable DSA by default
PR:		208254
Approved by:	re (gjb)
Relnotes:	yes
2016-08-05 15:32:35 +00:00
Glen Barber
faebc97a1c Revert r301551, which added blacklistd(8) to sshd(8).
This change has functional impact, and other concerns raised
by the OpenSSH maintainer.

Requested by:	des
PR:		210479 (related)
Approved by:	re (marius)
Sponsored by:	The FreeBSD Foundation
2016-06-24 23:22:42 +00:00
Kurt Lidl
c0cc364181 Add blacklist support to sshd
Reviewed by:	rpaulo
Approved by:	rpaulo (earlier version of changes)
Relnotes:	YES
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D5915
2016-06-07 16:18:09 +00:00
Andriy Gapon
056f620e09 openssl: change SHLIB_VERSION_NUMBER to reflect the reality
Some consumers actually use this definition.

We probably need some procedure to ensure that SHLIB_VERSION_NUMBER
is updated whenever we change the library version in
secure/lib/libssl/Makefile.
2016-06-03 14:09:38 +00:00
Conrad Meyer
f74fc68670 libkrb5: Fix potential double-free
If krb5_make_principal fails, tmp_creds.server may remain a pointer to freed
memory and then be double-freed.  After freeing it the first time, initialize
it to NULL, which causes subsequent krb5_free_principal calls to do the right
thing.

Reported by:	Coverity
CID:		1273430
Sponsored by:	EMC / Isilon Storage Division
2016-05-11 23:25:59 +00:00
Jung-uk Kim
b8721c1643 Merge OpenSSL 1.0.2h.
Relnotes:	yes
2016-05-03 18:50:10 +00:00
Jung-uk Kim
57f1256b1a Import OpenSSL 1.0.2h. 2016-05-03 18:00:27 +00:00
Dag-Erling Smørgrav
c3c6c935fc Re-add AES-CBC ciphers to the default cipher list on the server.
PR:		207679
2016-03-11 00:23:10 +00:00
Dag-Erling Smørgrav
acc1a9ef83 Upgrade to OpenSSH 7.2p2. 2016-03-11 00:15:29 +00:00
Jung-uk Kim
4c6a0400b9 Merge OpenSSL 1.0.2g.
Relnotes:	yes
2016-03-01 22:08:28 +00:00
Jung-uk Kim
9aeed18ad7 Import OpenSSL 1.0.2g. 2016-03-01 17:57:01 +00:00
Dag-Erling Smørgrav
b4245df0a8 Document our modified default value for PermitRootLogin. 2016-02-02 10:02:38 +00:00
Jung-uk Kim
8180e704ac Merge OpenSSL 1.0.2f.
Relnotes:	yes
2016-01-28 20:15:22 +00:00
Jung-uk Kim
c188d4cade Import OpenSSL 1.0.2f. 2016-01-28 18:41:59 +00:00
Dag-Erling Smørgrav
c4cd1fa410 Switch UseDNS back on 2016-01-27 13:40:44 +00:00
Dag-Erling Smørgrav
6362080245 r294563 was incomplete; re-add the client-side options as well. 2016-01-22 14:22:11 +00:00
Dag-Erling Smørgrav
6f3513465d Instead of removing the NoneEnabled option, mark it as unsupported.
(should have done this in r291198, but didn't think of it until now)
2016-01-22 13:13:46 +00:00
Dag-Erling Smørgrav
0591b689c2 Update the instructions and the list of major local modifications. 2016-01-21 12:42:31 +00:00
Dag-Erling Smørgrav
a067b78c9c Explain why we don't include VersionAddendum in the debug mode banner. 2016-01-21 12:41:02 +00:00
Dag-Erling Smørgrav
fc1ba28a5c Upgrade to OpenSSH 7.1p2. 2016-01-21 11:54:34 +00:00
Dag-Erling Smørgrav
acf8e75eb0 Enable DSA keys by default. They were disabled in OpenSSH 6.9p1.
Noticed by:	glebius
2016-01-21 11:10:14 +00:00
Dag-Erling Smørgrav
ca04c57ca9 Take care not to pick up the wrong version of OpenSSL when running in an
environment that has OpenSSL from ports in addition to the base version.
2016-01-21 10:57:45 +00:00
Dag-Erling Smørgrav
0b0dd5086b Remove RCS tags from files in which we no longer have any local
modifications, and add them to two files in which we do.
2016-01-20 23:23:08 +00:00
Dag-Erling Smørgrav
8688f98d23 Remove a number of generated files which are either out-of-date (because
they are never regenerated to reflect our changes) or in the way of
freebsd-configure.sh.
2016-01-20 23:08:57 +00:00
Dag-Erling Smørgrav
eccfee6ebc Upgrade to OpenSSH 7.0p1. 2016-01-20 22:57:10 +00:00
Dag-Erling Smørgrav
557f75e54a Upgrade to OpenSSH 6.9p1. 2016-01-19 18:55:44 +00:00