aboutsummaryrefslogtreecommitdiff
path: root/secure/lib/libssh
Commit message (Collapse)AuthorAgeFilesLines
* Replace literal uses of /usr/local in C sources with _PATH_LOCALBASEStefan Eßer2020-10-271-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Literal references to /usr/local exist in a large number of files in the FreeBSD base system. Many are in contributed software, in configuration files, or in the documentation, but 19 uses have been identified in C source files or headers outside the contrib and sys/contrib directories. This commit makes it possible to set _PATH_LOCALBASE in paths.h to use a different prefix for locally installed software. In order to avoid changes to openssh source files, LOCALBASE is passed to the build via Makefiles under src/secure. While _PATH_LOCALBASE could have been used here, there is precedent in the construction of the path used to a xauth program which depends on the LOCALBASE value passed on the compiler command line to select a non-default directory. This could be changed in a later commit to make the openssh build consistently use _PATH_LOCALBASE. It is considered out-of-scope for this commit. Reviewed by: imp MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D26942 Notes: svn path=/head/; revision=367075
* Update Makefile.depend filesSimon J. Gerraty2019-12-111-2/+0
| | | | | | | | | | | | | Update a bunch of Makefile.depend files as a result of adding Makefile.depend.options files Reviewed by: bdrewery MFC after: 1 week Sponsored by: Juniper Networks Differential Revision: https://reviews.freebsd.org/D22494 Notes: svn path=/head/; revision=355617
* openssh: cherry-pick OpenSSL 1.1.1 compatibilityEd Maste2018-10-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | Compatibility with existing OpenSSL versions is maintained. Upstream commits: 482d23bcac upstream: hold our collective noses and use the openssl-1.1.x 48f54b9d12 adapt -portable to OpenSSL 1.1x API 86e0a9f3d2 upstream: use only openssl-1.1.x API here too a3fd8074e2 upstream: missed a bit of openssl-1.0.x API in this unittest cce8cbe0ed Fix openssl-1.1 fallout for --without-openssl. Trivial conflicts in sshkey.c and test_sshkey.c were resolved. Connect libressl-api-compat.c to the build, and regenerate config.h Reviewed by: des Approved by: re (rgrimes) MFC after: 2 seeks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D17444 Notes: svn path=/head/; revision=339213
* Upgrade to OpenSSH 7.8p1.Dag-Erling Smørgrav2018-09-101-2/+2
| | | | | | | Approved by: re (kib@) Notes: svn path=/head/; revision=338561
* Upgrade to OpenSSH 7.7p1.Dag-Erling Smørgrav2018-05-111-4/+4
| | | | Notes: svn path=/head/; revision=333490
* Upgrade to OpenSSH 7.6p1. This will be followed shortly by 7.7p1.Dag-Erling Smørgrav2018-05-081-7/+7
| | | | | | | | | This completely removes client-side support for the SSH 1 protocol, which was already disabled in 12 but is still enabled in 11. For that reason, we will not be able to merge 7.6p1 or newer back to 11. Notes: svn path=/head/; revision=333389
* DIRDEPS_BUILD: Update dependencies.Bryan Drewery2017-10-311-1/+0
| | | | | | | Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=325188
* Fix invalid .o SRCS from r314527.Bryan Drewery2017-05-091-2/+2
| | | | | | | | MFC after: 1 week Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=317998
* Upgrade to OpenSSH 7.4p1.Dag-Erling Smørgrav2017-03-061-1/+1
| | | | Notes: svn path=/head/; revision=314720
* crypto: normalize paths using SRCTOP-relative paths or :H when possibleEnji Cooper2017-03-041-1/+1
| | | | | | | | | | This simplifies make logic/output MFC after: 1 month Sponsored by: Dell EMC Isilon Notes: svn path=/head/; revision=314658
* Upgrade to OpenSSH 7.3p1.Dag-Erling Smørgrav2017-03-021-2/+2
| | | | Notes: svn path=/head/; revision=314527
* Only bake krb5_config.h support in to ssh(3), etc if both MK_GSSAPI andEnji Cooper2017-01-021-1/+1
| | | | | | | | | | | | | | | MK_KERBEROS_SUPPORT != no This fixes the odd case where someone specified MK_GSSAPI=no and MK_KERBEROS_SUPPORT=yes (which admittedly, probably doesn't make sense, but the build system doesn't prevent this case today, and it didn't when I filed the bug back in 2011 either). MFC after: 2 weeks PR: 159745 Notes: svn path=/head/; revision=311140
* MFHGlen Barber2016-03-141-1/+2
|\ | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=296869
| * Upgrade to OpenSSH 7.2p2.Dag-Erling Smørgrav2016-03-111-1/+2
| | | | | | | | Notes: svn path=/head/; revision=296633
* | MFHGlen Barber2016-02-181-0/+1
|\| | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=295734
| * DIRDEPS_BUILD: Update dependencies.Bryan Drewery2016-02-161-0/+1
| | | | | | | | | | | | | | Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=295650
* | MFHGlen Barber2016-01-251-2/+2
|\| | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=294728
| * Upgrade to OpenSSH 7.0p1.Dag-Erling Smørgrav2016-01-201-2/+2
| | | | | | | | Notes: svn path=/head/; revision=294464
* | MFHGlen Barber2016-01-201-10/+14
|\| | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=294408
| * List source files (foo.c) instead of object files in SRCS.John Baldwin2016-01-201-1/+1
| | | | | | | | | | | | | | Reviewed by: bdrewery Notes: svn path=/head/; revision=294365
| * Upgrade to OpenSSH 6.8p1.Dag-Erling Smørgrav2016-01-191-12/+14
| | | | | | | | Notes: svn path=/head/; revision=294332
| * Upgrade to OpenSSH 6.7p1, retaining libwrap support (which has been removedDag-Erling Smørgrav2016-01-191-1/+3
| | | | | | | | | | | | | | | | | | upstream) and a number of security fixes which we had already backported. MFC after: 1 week Notes: svn path=/head/; revision=294328
* | MFH r289384-r293170Glen Barber2016-01-042-10/+2
|\| | | | | | | | | | | | | Sponsored by: The FreeBSD Foundation Notes: svn path=/projects/release-pkg/; revision=293172
| * Replace unneeded manual dependency on header by adding it to SRCS.Bryan Drewery2015-12-071-5/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | bsd.lib.mk and bsd.prog.mk already depend all objs on headers in SRCS if there is not yet a depend file. The headers in SRCS are never built or installed. After 'make depend' the header was already added as a proper dependency on the objects where needed. MFC after: 2 weeks Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=291941
| * META MODE: Prefer INSTALL=tools/install.sh to lessen the need for xinstall.host.Bryan Drewery2015-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | This both avoids some dependencies on xinstall.host and allows bootstrapping on older releases to work due to lack of at least 'install -l' support. Sponsored by: EMC / Isilon Storage Division Notes: svn path=/head/; revision=291307
| * Retire the NONE cipher option.Dag-Erling Smørgrav2015-11-231-4/+0
| | | | | | | | Notes: svn path=/head/; revision=291198
* | Merge from head @274131Baptiste Daroussin2015-06-201-0/+1
|\| | | | | | | Notes: svn path=/projects/release-pkg/; revision=284621
| * new dependsSimon J. Gerraty2015-06-161-0/+1
| | | | | | | | Notes: svn path=/head/; revision=284481
* | Merge from headBaptiste Daroussin2015-06-151-0/+26
|\| | | | | | | Notes: svn path=/projects/release-pkg/; revision=284410
| * Add META_MODE support.Simon J. Gerraty2015-06-131-0/+26
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Off by default, build behaves normally. WITH_META_MODE we get auto objdir creation, the ability to start build from anywhere in the tree. Still need to add real targets under targets/ to build packages. Differential Revision: D2796 Reviewed by: brooks imp Notes: svn path=/head/; revision=284345
| | * dirdeps.mk now sets DEP_RELDIRSimon J. Gerraty2015-06-081-2/+0
| | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=284172
| | * Merge sync of headSimon J. Gerraty2015-05-272-14/+2
| | |\ | | |/ | |/| | | | Notes: svn path=/projects/bmake/; revision=283595
| | * Merge from head@274682Simon J. Gerraty2014-11-191-1/+1
| | |\ | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=274683
| | * | Updated dependenciesSimon J. Gerraty2014-05-161-0/+2
| | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=266219
| | * | Merge from headSimon J. Gerraty2014-05-081-1/+1
| | |\ \ | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=265720
| | * \ \ Merge headSimon J. Gerraty2014-04-281-5/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=265044
| | * \ \ \ Merge head@256284Simon J. Gerraty2013-10-131-1/+4
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=256424
| | * | | | | Updated dependenciesSimon J. Gerraty2013-10-131-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=256419
| | * | | | | Merge headSimon J. Gerraty2013-09-111-7/+13
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=255477
| | * \ \ \ \ \ sync from headSimon J. Gerraty2013-04-121-4/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=249429
| | * | | | | | | Updated dependenciesSimon J. Gerraty2013-03-111-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=248169
| | * | | | | | | Updated dependenciesSimon J. Gerraty2013-02-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=246868
| | * | | | | | | Sync with HEAD.David E. O'Brien2013-02-081-0/+4
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=246555
| | * | | | | | | | Updated/new Makefile.dependSimon J. Gerraty2012-11-081-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=242788
| | * | | | | | | | Sync from headSimon J. Gerraty2012-11-041-2/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: svn path=/projects/bmake/; revision=242545
| | * | | | | | | | | Sync FreeBSD's bmake branch with Juniper's internal bmake branch.Marcel Moolenaar2012-08-221-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Requested by: Simon Gerraty <sjg@juniper.net> Notes: svn path=/projects/bmake/; revision=239572
* | | | | | | | | | | Move ssh into a dedicated packageBaptiste Daroussin2015-03-051-0/+1
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Flag config files as "to be merged on upgrade" Notes: svn path=/projects/release-pkg/; revision=279674
* | | | | | | | | | Reduce overlinkingBaptiste Daroussin2014-11-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The framework now ensure by itself that pthread is added to the link chain as the last component if linked to kerberos hence avoid with out any explicit addition prevent issue like CVE-2014-8475 Notes: svn path=/head/; revision=275083
* | | | | | | | | | Convert to LIBADDBaptiste Daroussin2014-11-251-7/+3
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduce overlinking Notes: svn path=/head/; revision=275077
* | | | | | | | | Rework privatelib/internallibBaptiste Daroussin2014-08-061-1/+1
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure everything linking to a privatelib and/or an internallib does it directly from the OBJDIR rather than DESTDIR. Add src.libnames.mk so bsd.libnames.mk is not polluted by libraries not existsing in final installation Introduce the LD* variable which is what ld(1) is expecting (via LDADD) to link to internal/privatelib Directly link to the .so in case of private library to avoid having to complexify LDFLAGS. Phabric: https://phabric.freebsd.org/D553 Reviewed by: imp, emaste Notes: svn path=/head/; revision=269648
generated by cgit v1.3 (git 2.53.0) at 2026-03-13 12:32:50 +0000