d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
192,669 Commits 4 Branches 49 Tags 2 GiB
38347b87b7
Commit Graph

879 Commits

Author SHA1 Message Date
des
d75fd1fec6 Don't define XAUTH_PATH here, we either pass it in on the compiler command 
line or rely on the built-in default.
 2006-10-06 14:27:26 +00:00
des
91390ee9f2 Go figure how an extra $Id$ line crept in... 2006-10-04 10:21:00 +00:00
des
178eb45ceb Merge vendor patch. 2006-10-04 10:15:53 +00:00
des
e6cc400c8f Apply vendor patch to fix detection of tap / tun headers and ENGINE support. 2006-10-04 10:14:30 +00:00
des
351bcb5c21 Tweak ifdefs for backward compatibility. 2006-10-03 11:33:25 +00:00
des
24e2cf96ac Dead files. 2006-10-02 13:29:41 +00:00
des
a74a69e336 Regenerate; no effect on the code as it doesn't actually use the handful of 
conditionals that changed in this revision.
 2006-10-02 12:45:27 +00:00
des
14ad83d6bf Update configure options and add some missing steps. 
The section about our local changes needs reviewing, and some of those
changes should probably be reconsidered (such as preferring DSA over RSA,
which made sense when RSA was encumbered but probably doesn't any more)
 2006-10-02 12:39:28 +00:00
simon
25dab5b4c1 Import from upstream OpenSSL 0.9.8 branch: 
Fix uninitialized free of ctx in compute_key() when the
OPENSSL_DH_MAX_MODULUS_BITS check is triggered.

This fixes the same issue as FreeBSD-SA-06:23.openssl v1.1.
 2006-10-01 08:09:46 +00:00
simon
ac7fb23be5 This commit was generated by cvs2svn to compensate for changes in r162916, 
which included commits to RCS files with non-trunk default branches.
 2006-10-01 08:09:46 +00:00
simon
de193995a6 Resolve conflicts after import of OpenSSL 0.9.8d. 2006-10-01 07:46:16 +00:00
simon
387e65d767 Vendor import of OpenSSL 0.9.8d. 2006-10-01 07:38:44 +00:00
simon
b2881e9eb1 This commit was generated by cvs2svn to compensate for changes in r162911, 
which included commits to RCS files with non-trunk default branches.
 2006-10-01 07:38:44 +00:00
des
0824f0c0e7 Regenerate. 
MFC after:	1 week
 2006-09-30 13:40:56 +00:00
des
ac038c1070 #include <errno.h>; this has the unfortunate side effect of taking the file 
off the vendor branch.

MFC after:	1 week
 2006-09-30 13:40:35 +00:00
des
0f481d7c8c Removed from vendor branch. 
MFC after:	1 week
 2006-09-30 13:39:35 +00:00
des
e16bfbb7bc Bump version addendum. 
MFC after:	1 week
 2006-09-30 13:39:07 +00:00
des
4ff234ef46 Merge conflicts. 
MFC after:	1 week
 2006-09-30 13:38:06 +00:00
des
2f35ce4773 Vendor import of OpenSSH 4.4p1. 2006-09-30 13:29:51 +00:00
des
abd7c8704b This commit was generated by cvs2svn to compensate for changes in r162852, 
which included commits to RCS files with non-trunk default branches.
 2006-09-30 13:29:51 +00:00
des
97a1b8f884 Merge vendor patch for BSM problem in protocol version 1. 
MFC after:	1 week
 2006-09-16 15:12:58 +00:00
des
03ef9d989b Vendor patch for a problem that prevented using protocol version 1 when 
BSM was enabled.
 2006-09-16 15:10:13 +00:00
simon
22f3e61de2 Correct incorrect PKCS#1 v1.5 padding validation in crypto(3). 
Obtained from:	OpenSSL project
Security:	FreeBSD-SA-06:19.openssl
 2006-09-10 20:16:43 +00:00
simon
76f00e0285 Resolve conflicts after import of OpenSSL 0.9.8b. 
This was missed the first time around since eng_padlock.c was not part
of OpenSSL 0.9.7e and therefor did not have the v0_9_7e CVS tag used
during original resolve of conflicts.

Noticed by:	Antoine Brodin <antoine.brodin@laposte.net>
 2006-07-30 14:17:54 +00:00
simon
870bdce538 Sync FREEBSD-Xlist with what was actually excluded from OpenSSL 0.9.8b 
import.
 2006-07-29 22:40:45 +00:00
simon
00e07ea415 Add some rough notes on how to import a new OpenSSL version into the 
FreeBSD base system.  Parts are inspired by the OpenSSH upgrade notes.
 2006-07-29 22:01:26 +00:00
simon
e07cc0214a Resolve conflicts after import of OpenSSL 0.9.8b. 2006-07-29 19:14:51 +00:00
simon
fb3c70eda8 Vendor import of OpenSSL 0.9.8b 2006-07-29 19:10:21 +00:00
simon
9159ca2b0e This commit was generated by cvs2svn to compensate for changes in r160814, 
which included commits to RCS files with non-trunk default branches.
 2006-07-29 19:10:21 +00:00
des
d9ba51b5fc Our glob(3) has all the required features. 
Submitted by:	ache
 2006-06-09 08:39:05 +00:00
des
a34ad0a5f7 Revert inadvertant commit of debugging code. 2006-06-09 07:23:14 +00:00
des
148092431d Introduce a namespace munging hack inspired by NetBSD to avoid polluting 
the namespace of applications which inadvertantly link in libssh (usually
through pam_ssh)

Suggested by:	lukem@netbsd.org
MFC after:	6 weeks
 2006-05-13 13:47:45 +00:00
des
9c68158992 Fix utmp. There is some clever logic in configure.ac which attempts to 
determine whether struct utmp contains the ut_host and ut_time fields.
Unfortunately, it reports a false negative for both on FreeBSD, and I
didn't check the resulting config.h closely enough to catch the error.

Noticed by:	ache
 2006-03-23 21:31:42 +00:00
des
eb091e1fc6 Regenerate. 2006-03-22 20:41:53 +00:00
des
7c07891caf Merge conflicts. 2006-03-22 20:41:37 +00:00
des
448503722a Vendor import of OpenSSH 4.3p1. 2006-03-22 19:46:12 +00:00
des
c2efe9a305 This commit was generated by cvs2svn to compensate for changes in r157016, 
which included commits to RCS files with non-trunk default branches.
 2006-03-22 19:46:12 +00:00
ru
388e590f95 Reimplementation of world/kernel build options. For details, see: 
http://lists.freebsd.org/pipermail/freebsd-current/2006-March/061725.html

The src.conf(5) manpage is to follow in a few days.

Brought to you by:	imp, jhb, kris, phk, ru (all bugs are mine)
 2006-03-17 18:54:44 +00:00
dfr
65ca66cee3 Fix the amd64 (and presumably ia64) lib32 build by ensuring that the 
heimdal GSS-API mechanism uses its own version of gssapi.h, including all
the implementation-dependant pollution contained therein.

This moves the file off the vendor branch, sadly.

Submitted by: bz
 2006-01-02 11:28:42 +00:00
dfr
d9cbcb50b5 Add a new extensible GSS-API layer which can support GSS-API plugins, 
similar the the Solaris implementation. Repackage the krb5 GSS mechanism
as a plugin library for the new implementation. This also includes a
comprehensive set of manpages for the GSS-API functions with text mostly
taken from the RFC.

Reviewed by: Love Hörnquist Åstrand <lha@it.su.se>, ru (build system), des (openssh parts)
 2005-12-29 14:40:22 +00:00
cperciva
45ad656456 Correct a man-in-the-middle SSL version rollback vulnerability. 
Security:	FreeBSD-SA-05:21.openssl
 2005-10-11 11:50:36 +00:00
des
fbfe6dd7e0 Regenerate 2005-09-03 07:08:51 +00:00
des
88c7c9558b Resolve conflicts. 2005-09-03 07:04:25 +00:00
des
755a16fa86 Vendor import of OpenSSH 4.2p1. 2005-09-03 06:59:33 +00:00
des
1ea3628aba This commit was generated by cvs2svn to compensate for changes in r149749, 
which included commits to RCS files with non-trunk default branches.
 2005-09-03 06:59:33 +00:00
des
f0dcade643 fine-tune. 2005-09-03 06:42:11 +00:00
kensmith
28b7f562fc This is sort of an MFS. Peter made these changes to the RELENG_* 
branches but missed HEAD.  This patch extends his a little bit,
setting it up via the Makefiles so that adding _FREEFALL_CONFIG
to /etc/make.conf is the only thing needed to cluster-ize things
(current setup also requires overriding CFLAGS).

From Peter's commit to the RELENG_* branches:
> Add the freebsd.org custer's source modifications under #ifdefs to aid
> keeping things in sync.  For ksu:
> * install suid-root by default
> * don't fall back to asking for a unix password (ie: be pure kerberos)
> * allow custom user instances for things like www and not just root

The Makefile tweaks will be MFC-ed, the rest is already done.

MFC after:      3 days
Approved by:    re (dwhite)
 2005-07-07 14:16:38 +00:00
des
af7fe6f7d6 Forgot to bump the version addendum. 2005-06-05 18:30:53 +00:00
des
ec61b1c40a Regenerate. 2005-06-05 15:46:27 +00:00
des
983ad11a1c Resolve conflicts. 2005-06-05 15:46:09 +00:00
des
3c5bc6b274 Update for 4.1p1. 2005-06-05 15:43:57 +00:00
des
c4dfc1ed3b Vendor import of OpenSSH 4.1p1. 2005-06-05 15:41:57 +00:00
des
35c298a910 This commit was generated by cvs2svn to compensate for changes in r147001, 
which included commits to RCS files with non-trunk default branches.
 2005-06-05 15:41:57 +00:00
des
11a09ab416 Vendor import of OpenSSH 4.0p1. 2005-06-05 15:40:50 +00:00
des
7688286f9d This commit was generated by cvs2svn to compensate for changes in r146998, 
which included commits to RCS files with non-trunk default branches.
 2005-06-05 15:40:50 +00:00
des
9230b25dd7 Rewrite some of the regexps so they don't match themselves. 2005-06-04 23:18:33 +00:00
nectar
21cef1ac2a File removed in update from OpenSSL 0.9.7d -> 0.9.7e. 2005-02-25 06:22:30 +00:00
nectar
3c8d7d9993 Remove files that are no longer part of OpenSSL from the vendor 
branch.  This time, these are mostly the `Makefile.ssl' files.
 2005-02-25 06:14:53 +00:00
nectar
0d4d2c2cec This commit was generated by cvs2svn to compensate for changes in r142430, 
which included commits to RCS files with non-trunk default branches.
 2005-02-25 06:14:53 +00:00
nectar
ced877b043 Resolve conflicts after import of OpenSSL 0.9.7e. 2005-02-25 05:49:44 +00:00
nectar
78a59572b3 Vendor import of OpenSSL 0.9.7e. 2005-02-25 05:39:05 +00:00
nectar
52bc459a40 This commit was generated by cvs2svn to compensate for changes in r142425, 
which included commits to RCS files with non-trunk default branches.
 2005-02-25 05:39:05 +00:00
nectar
a876e908ea Update list of files to remove prior to import of OpenSSL 0.9.7e. 2005-02-25 05:31:23 +00:00
nectar
a55ec1447a Clean up the OpenSSL vendor branch by removing files that are not 
part of recent releases.
 2005-02-25 05:25:37 +00:00
nectar
86364e2030 This commit was generated by cvs2svn to compensate for changes in r142421, 
which included commits to RCS files with non-trunk default branches.
 2005-02-25 05:25:37 +00:00
nectar
2565fa1348 Vendor import of Heimdal 0.6.3. 2005-02-24 22:22:53 +00:00
nectar
cf46be8ba9 This commit was generated by cvs2svn to compensate for changes in r142403, 
which included commits to RCS files with non-trunk default branches.
 2005-02-24 22:22:53 +00:00
nectar
3dc1e39cf7 Do not include lib/kdfs in future imports. 2005-02-24 22:17:13 +00:00
nectar
1473734316 Remove lib/kdfs from vendor branch: we do not build it, and it will not 
be included in future imports.
 2005-02-24 22:16:35 +00:00
nectar
412870c336 Clean up the Heimdal vendor branch by removing files not included in 
any import for several years.

If memory serves, this was
Suggested by:	ru
an awfully long time ago-- sorry for the delay!
 2005-02-24 22:14:04 +00:00
des
2ed082fd66 Better Xlist command line. 2004-10-28 16:13:28 +00:00
des
a744ec13ad Resolve conflicts 2004-10-28 16:11:31 +00:00
des
d5d493f03a Vendor import of OpenSSH 3.9p1. 2004-10-28 16:03:53 +00:00
des
b0cdf22191 This commit was generated by cvs2svn to compensate for changes in r137015, 
which included commits to RCS files with non-trunk default branches.
 2004-10-28 16:03:53 +00:00
des
0a4f1e0cd4 These are unnecessary and have been causing imp@ trouble. 2004-10-27 19:07:36 +00:00
markm
1659a5207b Add support for C3 Nehemiah ACE ("Padlock") AES crypto. This comes 
from OpenSSL 0.9.5 (yet to be released), and is pretty complete.
 2004-08-14 13:38:35 +00:00
markm
402a1009de Bring in support for VIA C3 Nehemiah Padlock crypto support (AES). 
This is from the upcoming OpenSSL 0.9.8 release.
 2004-08-13 19:37:23 +00:00
markm
d57fb14ce4 This commit was generated by cvs2svn to compensate for changes in r133665, 
which included commits to RCS files with non-trunk default branches.
 2004-08-13 19:37:23 +00:00
des
aaa4408d55 Regenerate. 2004-04-20 09:49:37 +00:00
des
6e7fa35a0a One more conflict. 2004-04-20 09:47:13 +00:00
des
e5d801b2d6 Resolve conflicts. 2004-04-20 09:46:41 +00:00
des
efa3572464 Adjust version number and addendum. 2004-04-20 09:37:29 +00:00
des
c69db9c5a2 Vendor import of OpenSSH 3.8.1p1. 2004-04-20 09:35:04 +00:00
des
13038249fe This commit was generated by cvs2svn to compensate for changes in r128456, 
which included commits to RCS files with non-trunk default branches.
 2004-04-20 09:35:04 +00:00
nectar
4f072b64b0 Repair a regression in OpenSSL 0.9.7d: processing an unsigned PKCS#7 
object could cause a null pointer dereference.

Obtained from:	OpenSSL CVS (change number 12080)
MFC After:	1 day
Reported by:	Daniel Lang <dl@leo.org>
 2004-04-05 19:01:57 +00:00
nectar
e0710a2e71 This commit was generated by cvs2svn to compensate for changes in r127904, 
which included commits to RCS files with non-trunk default branches.
 2004-04-05 19:01:57 +00:00
nectar
26e61e0326 Resolve conflicts after import of Heimdal 0.6.1. 2004-04-03 21:31:10 +00:00
nectar
bfc5316dea Vendor import of Heimdal 0.6.1. 2004-04-03 21:22:55 +00:00
nectar
0b7467aa1d This commit was generated by cvs2svn to compensate for changes in r127808, 
which included commits to RCS files with non-trunk default branches.
 2004-04-03 21:22:55 +00:00
nectar
2283471bb5 Resolve conflicts after import of OpenSSL 0.9.7d. 2004-03-17 17:44:39 +00:00
nectar
0f095e8a2a Vendor import of OpenSSL 0.9.7d. 2004-03-17 15:49:33 +00:00
nectar
15b921d648 This commit was generated by cvs2svn to compensate for changes in r127128, 
which included commits to RCS files with non-trunk default branches.
 2004-03-17 15:49:33 +00:00
nectar
e8232d78ab Correct a denial-of-service vulnerability in OpenSSL (CAN-2004-0079). 
Obtained from:	OpenSSL CVS (http://cvs.openssl.org/chngview?cn=12033)
 2004-03-17 12:11:08 +00:00
nectar
5899dbda42 This commit was generated by cvs2svn to compensate for changes in r127114, 
which included commits to RCS files with non-trunk default branches.
 2004-03-17 12:11:08 +00:00
des
2fe413a41a Correctly document the default value of UsePAM. 2004-03-15 18:38:29 +00:00
des
437b8c0fdd Update VersionAddendum in config files and man pages. 2004-02-26 11:54:03 +00:00
des
c05d4b9b43 Define HAVE_GSSAPI_H. 2004-02-26 11:06:29 +00:00
des
77d6d5a07e Regenerate. 2004-02-26 10:57:38 +00:00
des
c7ba229763 Document recently changed configuration defaults. 2004-02-26 10:57:28 +00:00
des
124c4a1415 Resolve conflicts. 2004-02-26 10:52:33 +00:00
des
7d1750f1d6 Vendor import of OpenSSH 3.8p1. 2004-02-26 10:38:49 +00:00
des
1754c77e5e This commit was generated by cvs2svn to compensate for changes in r126274, 
which included commits to RCS files with non-trunk default branches.
 2004-02-26 10:38:49 +00:00
des
b1ffd1f6ac Merge OpenSSH 3.8p1. 2004-02-26 10:38:38 +00:00
des
270e7d7140 Prepare for upcoming 3.8p1 import. 2004-02-26 10:37:34 +00:00
des
85717525b0 Pull asbesthos underpants on and disable protocol version 1 by default. 2004-02-26 10:24:07 +00:00
des
49dee586c1 Turn non-PAM password authentication off by default when USE_PAM is 
defined.  Too many users are getting bitten by it.
 2004-02-19 15:53:31 +00:00
des
84ff378ae4 Update the "overview of FreeBSD changes to OpenSSH-portable" to reflect 
reality.
 2004-01-25 13:09:56 +00:00
des
31d02c599b Work around removal of EAI_NODATA from netdb.h. 2004-01-18 22:31:30 +00:00
nectar
8c8a5a2b0b Re-add the FreeBSD RCS keyword for the benefit of mergemaster. 
PR:		conf/50040
Requested by:	Dimitry Andric <dim@xs4all.nl>
 2004-01-09 14:46:11 +00:00
des
5c8d98dfbd Don't output the terminating '\0' (already fixed in OpenSSH CVS) 2004-01-09 12:57:36 +00:00
des
c3b2098e8b This commit was generated by cvs2svn to compensate for changes in r124287, 
which included commits to RCS files with non-trunk default branches.
 2004-01-09 12:57:36 +00:00
des
f773ff17e4 Egg on my face: UsePAM was off by default. 
Pointed out by:	Sean McNeil <sean@mcneil.com>
 2004-01-09 08:07:12 +00:00
des
59fac3f07b Regenerate config.h; I don't know why this didn't hit CVS yesterday. 2004-01-08 09:42:35 +00:00
des
bd159d8b4f Remove obsolete files on the vendor branch. 2004-01-08 09:33:46 +00:00
des
ee97d7f67c Update to reflect changes since the last version. 2004-01-07 11:51:18 +00:00
des
7545fb1c7e Resolve conflicts and remove obsolete files. 
Sponsored by:	registrar.no
 2004-01-07 11:16:27 +00:00
des
b5d16e7138 Vendor import of OpenSSH 3.7.1p2. 2004-01-07 11:10:17 +00:00
des
b5f9e06a6d This commit was generated by cvs2svn to compensate for changes in r124208, 
which included commits to RCS files with non-trunk default branches.
 2004-01-07 11:10:17 +00:00
des
fd8a3b71eb Merge OpenSSH 3.7.1p2. 2004-01-07 11:10:02 +00:00
simon
b25ecb5dd4 Add a missing word. 
Submitted by:	Michel Lavondes <fox@vader.aacc.cc.md.us>
Reviewed by:	des
MFC after:	1 week
 2003-10-31 21:49:47 +00:00
des
365ce457b0 Plug a memory leak in the PAM child process. It is of no great consequence 
as the process is short-lived, and the leak occurs very rarely and always
shortly before the process terminates.

MFC after:	3 days
 2003-10-23 08:27:16 +00:00
nectar
084fdb0d6e Correct badly-formed code (missing quote) within `#if 0' section. 
Newer versions of GCC error in such situations.

Obtained from:	Heimdal CVS
 2003-10-09 19:52:14 +00:00
nectar
f4317945f5 This commit was generated by cvs2svn to compensate for changes in r120952, 
which included commits to RCS files with non-trunk default branches.
 2003-10-09 19:52:14 +00:00
nectar
22eeaf40f5 Resolve conflicts after import of Heimdal 0.6. 2003-10-09 19:42:07 +00:00
nectar
5c90662d44 Vendor import of Heimdal 0.6. 2003-10-09 19:36:20 +00:00
nectar
4b1830fcc6 This commit was generated by cvs2svn to compensate for changes in r120945, 
which included commits to RCS files with non-trunk default branches.
 2003-10-09 19:36:20 +00:00
nectar
39a0f43256 Add list of files to remove from the Heimdal distribution prior to 
each import.
 2003-10-09 19:35:38 +00:00
nectar
7f355f9a0e Remove files no longer included with OpenSSL as of version 0.9.7c. 2003-10-01 12:38:27 +00:00
nectar
367ddb50f9 Merge conflicts after import of OpenSSL 0.9.7c. 2003-10-01 12:37:51 +00:00
nectar
ee25ce74b3 Vendor import of OpenSSL 0.9.7c 2003-10-01 12:32:41 +00:00
nectar
d8e0ea4b40 This commit was generated by cvs2svn to compensate for changes in r120631, 
which included commits to RCS files with non-trunk default branches.
 2003-10-01 12:32:41 +00:00
nectar
33988c2cf4 Update list of files to remove prior to import of OpenSSL 0.9.7c. 2003-10-01 12:21:16 +00:00
joe
dc42ef0264 Additional corrections to OpenSSH buffer handling. 
Obtained from:  openssh.org
Originally committed to head by: nectar
 2003-09-26 19:15:53 +00:00
joe
62fcef3496 This commit was generated by cvs2svn to compensate for changes in r120489, 
which included commits to RCS files with non-trunk default branches.
 2003-09-26 19:15:53 +00:00
joe
175ed5a6e4 Additional corrections to OpenSSH buffer handling. 
Obtained from:  openssh.org
Originally committed to head by: nectar
 2003-09-26 19:15:53 +00:00
des
0b9dcf3092 Update version string. 2003-09-24 19:20:23 +00:00
des
202ae7da6f Remove bogus calls to xfree(). 2003-09-24 19:11:52 +00:00
des
7ddad9d4af resp is a pointer to an array of structs, not an array of pointers to structs. 2003-09-24 18:26:29 +00:00
des
005a1d4afd Return the correct error value when a null query fails. 2003-09-24 18:24:27 +00:00
des
21906911ce Fix broken shell code. 2003-09-19 11:29:51 +00:00
nectar
0689a1c0d3 Correct more cases of allocation size bookkeeping being updated before 
calling functions which can potentially fail and cause cleanups to be
invoked.

Submitted by:	Solar Designer <solar@openwall.com>
 2003-09-17 14:36:14 +00:00
nectar
441fabb06e This commit was generated by cvs2svn to compensate for changes in r120161, 
which included commits to RCS files with non-trunk default branches.
 2003-09-17 14:36:14 +00:00
nectar
bacf67e6ca Correct more cases of allocation size bookkeeping being updated before 
calling functions which can potentially fail and cause cleanups to be
invoked.

Submitted by:	Solar Designer <solar@openwall.com>
 2003-09-17 14:36:14 +00:00
nectar
359ce984aa Update the OpenSSH addendum string for the buffer handling fix. 2003-09-16 14:33:04 +00:00
nectar
8cd211c561 Do not record expanded size before attempting to reallocate associated 
memory.

Obtained from:	OpenBSD
 2003-09-16 06:11:58 +00:00
nectar
ff50ba9baf This commit was generated by cvs2svn to compensate for changes in r120113, 
which included commits to RCS files with non-trunk default branches.
 2003-09-16 06:11:58 +00:00
markm
d6aec2b6d6 Very big makeover in the way telnet, telnetd and libtelnet are built. 
Previously, there were two copies of telnet; a non-crypto version
that lived in the usual places, and a crypto version that lived in
crypto/telnet/. The latter was built in a broken manner somewhat akin
to other "contribified" sources. This meant that there were 4 telnets
competing with each other at build time - KerberosIV, Kerberos5,
plain-old-secure and base. KerberosIV is no longer in the running, but
the other three took it in turns to jump all over each other during a
"make buildworld".

As the crypto issue has been clarified, and crypto _calls_ are not
a problem, crypto/telnet has been repo-copied to contrib/telnet,
and with this commit, all telnets are now "contribified". The contrib
path was chosen to not destroy history in the repository, and differs
from other contrib/ entries in that it may be worked on as "normal"
BSD code. There is no dangerous crypto in these sources, only a
very weak system less strong than enigma(1).

Kerberos5 telnet and Secure telnet are now selected by using the usual
macros in /etc/make.conf, and the build process is unsurprising and
less treacherous.
 2003-07-16 20:59:15 +00:00
des
7fc179286a Add a "return" that was missing from 3.6.1p1. Since it's been fixed in 
the OpenSSH-portable CVS repo, I'm committing this on the vendor branch.
 2003-06-24 19:30:44 +00:00
des
270ae60a45 This commit was generated by cvs2svn to compensate for changes in r116791, 
which included commits to RCS files with non-trunk default branches.
 2003-06-24 19:30:44 +00:00
des
108403d091 Fix off-by-one and initialization errors which prevented sshd from 
restarting when sent a SIGHUP.

Submitted by:	tegge
Approved by:	re (jhb)
 2003-05-28 19:39:33 +00:00
des
e0263bb5ea Revert unnecessary part of previous commit. 2003-05-13 10:18:49 +00:00
des
ab070fe748 Rename a few functions to avoid stealing common words (error, log, debug 
etc.) from the application namespace for programs that use pam_ssh(8).
Use #defines to avoid changing the actual source code.

Approved by:	re (rwatson)
 2003-05-12 19:22:47 +00:00
markm
141dcc06d3 Fix up external variables named "debug" that have a horrible habit 
of conflicting with other, similarly named functions in static
libraries. This is done mostly by renaming the var if it is shared
amongst modules, or making it static otherwise.

OK'ed by:	re(scottl)
 2003-05-11 18:17:00 +00:00
obrien
c3792f8bd9 Use __FBSDID vs. rcsid[]. Also protect sccs[] and copyright[] from GCC 3.3. 2003-05-04 02:54:49 +00:00
des
8a5b06b8e0 Remove RCSID from files which have no other diffs to the vendor branch. 2003-05-01 15:05:43 +00:00
des
a4b5e84c1c Nit. 2003-04-23 17:23:06 +00:00
des
471d81d867 Improvements to the proposed shell code. 2003-04-23 17:21:55 +00:00
des
5e9cbb7bff Regenerate. 2003-04-23 17:21:27 +00:00
des
58b9db3b6f Resolve conflicts. 2003-04-23 17:13:13 +00:00
des
85b37b9574 Vendor import of OpenSSH-portable 3.6.1p1. 2003-04-23 16:53:02 +00:00
des
6d34992e86 This commit was generated by cvs2svn to compensate for changes in r113908, 
which included commits to RCS files with non-trunk default branches.
 2003-04-23 16:53:02 +00:00
des
39ecd8ace7 - when using a child process instead of a thread, change the child's 
name to reflect its role
- try to handle expired passwords a little better

MFC after:	1 week
 2003-03-31 13:48:18 +00:00
des
2f9a965fa9 If an ssh1 client initiated challenge-response authentication but did 
not respond to challenge, and later successfully authenticated itself
using another method, the kbdint context would never be released,
leaving the PAM child process behind even after the connection ended.

Fix this by automatically releasing the kbdint context if a packet of
type SSH_CMSG_AUTH_TIS is follwed by anything but a packet of type
SSH_CMSG_AUTH_TIS_RESPONSE.

MFC after:	1 week
 2003-03-31 13:45:36 +00:00
jedgar
ed812d3ac4 Merge conflicts 2003-03-20 20:56:03 +00:00
jedgar
5d79b842c1 Enable RSA blinding by default. 
http://www.openssl.org/news/secadv_20030317.txt
 2003-03-20 20:44:11 +00:00
jedgar
ad2b755e27 This commit was generated by cvs2svn to compensate for changes in r112439, 
which included commits to RCS files with non-trunk default branches.
 2003-03-20 20:41:45 +00:00
jedgar
5514cd4987 Import of PKCS #1 security fix. 
http://www.openssl.org/news/secadv_20030319.txt
 2003-03-20 20:41:45 +00:00
markm
508deb59f8 KerberosIV deorbit sequence: Re-entry. Thank you, faithful friend. 
Enjoy your retirement in ports.
 2003-03-08 12:55:48 +00:00
nectar
c4f823a8ba Unbreak Kerberos 5 authentication in telnet. 
(Credential forwarding is still broken.)

PR:	bin/45397
 2003-03-06 13:41:53 +00:00
nectar
0fee824237 Resolve conflicts after import of OpenSSL 0.9.7a. 2003-02-19 23:24:16 +00:00
nectar
6c9986c446 Vendor import of OpenSSL 0.9.7a. 2003-02-19 23:17:42 +00:00
nectar
21bb0e5fa9 This commit was generated by cvs2svn to compensate for changes in r111147, 
which included commits to RCS files with non-trunk default branches.
 2003-02-19 23:17:42 +00:00
des
fc3e30fe3b Paranoia: instead of a NULL conversation function, use one that always 
returns PAM_CONV_ERR; moreover, make sure we always have the right
conversation function installed before calling PAM service functions.
Also unwrap some not-so-long lines.

MFC after:	3 days
 2003-02-16 11:03:55 +00:00
nectar
d91a03aab2 When `des_read_pw_string' is a macro, as in OpenSSL 0.9.7, 
an attempt to declare a prototype for it will croak.
 2003-02-14 14:37:26 +00:00
des
f4ca4d4385 document the current default value for VersionAddendum. 2003-02-11 12:11:15 +00:00
des
a6e843c458 Set the ruid to the euid at startup as a workaround for a bug in pam_ssh. 
MFC after:	3 days
 2003-02-07 15:48:27 +00:00
trhodes
914d9fc8a8 The manual page lists only 2 files, however it reads as `three files' which is 
obviously incorrect.

PR:		46841
Submitted by:	Sakamoto Seiji <s-siji@hyper.ocn.ne.jp>
 2003-02-05 02:14:03 +00:00
des
b9730314a0 Linux-PAM's pam_start(3) fails with a bogus error message if passed the 
pam_conv argument is NULL.  OpenPAM doesn't care, but to make things
easier for people porting this code to other systems (or -STABLE), use
a dummy struct pam_conv instead of NULL.

Pointed out by:	Damien Miller <djm@mindrot.org>
 2003-02-03 14:10:28 +00:00
des
8da928f615 Bump patch date to 2003-02-01 (the day after I fixed PAM authentication 
for ssh1)
 2003-02-03 11:11:36 +00:00
des
a428b35290 Fix keyboard-interactive authentication for ssh1. The problem was twofold: 
- The PAM kbdint device sometimes doesn't know authentication succeeded
   until you re-query it.  The ssh1 kbdint code would never re-query the
   device, so authentication would always fail.  This patch has been
   submitted to the OpenSSH developers.

 - The monitor code for PAM sometimes forgot to tell the monitor that
   authentication had succeeded.  This caused the monitor to veto the
   privsep child's decision to allow the connection.

These patches have been tested with OpenSSH clients on -STABLE, NetBSD and
Linux, and with ssh.com's ssh1 on Solaris.

Sponsored by:	DARPA, NAI Labs
 2003-01-31 11:08:07 +00:00
nectar
637cc179f5 Background: 
When libdes was replaced with OpenSSL's libcrypto, there were a few
 interfaces that the former implemented but the latter did not.  Because
 some software in the base system still depended upon these interfaces,
 we simply included them in our libcrypto (rnd_keys.c).

Now, finally get around to removing the dependencies on these
interfaces.  There were basically two cases:

  des_new_random_key -- This is just a wrapper for des_random_key, and
     these calls were replaced.

  des_init_random_number_generator et. al. -- A few functions were used
     by the application to seed libdes's PRNG.  These are not necessary
     when using libcrypto, as OpenSSL internally seeds the PRNG from
     /dev/random.  These calls were simply removed.

Again, some of the Kerberos 4 files have been taken off the vendor
branch.  I do not expect there to be future imports of KTH Kerberos 4.
 2003-01-29 18:14:29 +00:00
nectar
b6c07e9a21 = Fix a bug in UI_UTIL_read_pw's error handling that caused 
des_read_pw_string to break (and thus rather mysteriously
  breaking utilities such as kinit).

= Enable the BSD /dev/crypto interface.

(These changes are being imported on the vendor branch, as they have
already been accepted and committed to the OpenSSL CVS repository.)
 2003-01-29 02:25:30 +00:00
nectar
e99b3c8426 This commit was generated by cvs2svn to compensate for changes in r110018, 
which included commits to RCS files with non-trunk default branches.
 2003-01-29 02:25:30 +00:00
markm
3f245d6325 Merge conflicts. 
This is cunning doublespeak for "use vendor code".
 2003-01-28 22:34:21 +00:00
markm
ad7148cc98 Remove files no longer on OpenSSL 0.9.7. crypto/des/rnd_keys.c is 
retained as it is still used.
 2003-01-28 22:12:30 +00:00
markm
aad1d64cb5 Vendor import of OpenSSL release 0.9.7. This release includes 
support for AES and OpenBSD's hardware crypto.
 2003-01-28 21:43:22 +00:00
markm
33af127a88 This commit was generated by cvs2svn to compensate for changes in r109998, 
which included commits to RCS files with non-trunk default branches.
 2003-01-28 21:43:22 +00:00
nectar
4bcab33bf9 Make the Kerberos 4 bits build against OpenSSL 0.9.7. This required 
two basic changes (both of which should be no-ops until OpenSSL 0.9.7
is imported):

 = Define OPENSSL_DES_LIBDES_COMPATIBILITY wherever we include
   openssl/des.h.

 = Spell `struct des_ks_struct []' using the existing
   `des_key_schedule' typedef.

When OpenSSL 0.9.7 is imported, `des_key_schedule' (among other
things) will be a macro invocation instead of a typedef, and things
should `just work'.

Yes, this commit does take several files off the vendor branch.
I do not expect there to be future imports of KTH Kerberos 4.
 2003-01-28 20:18:26 +00:00
des
d37413d05a Force early initialization of the resolver library, since the resolver 
configuration files will no longer be available once sshd is chrooted.

PR:		39953, 40894
Submitted by:	dinoex
MFC after:	3 days
 2003-01-22 14:12:59 +00:00
nectar
12eb3dee85 Add a missing include, needed to get a prototype for `des_read_pw_string'. 
This is particularly important for OpenSSL 0.9.7, as `des_read_pw_string'
is a macro there.  (This fix brought in on the vendor branch, because I
already committed it to Heimdal's CVS.)
 2003-01-21 14:19:06 +00:00
nectar
d729ef0795 This commit was generated by cvs2svn to compensate for changes in r109641, 
which included commits to RCS files with non-trunk default branches.
 2003-01-21 14:19:06 +00:00
billf
75d164a3d8 add more RFC defined telnet options 
Reviewed by:	ps
 2003-01-18 06:10:21 +00:00
des
a9741e060a The previous commit contained a stupid mistake: ctxt->pam_[cp]sock was 
initialized after the call to pthread_create() instead of before.  It just
happened to work with threads enabled because ctxt is shared, but of
course it doesn't work when we use a child process instead of threads.
 2002-12-21 15:09:58 +00:00
des
06b0ce4f65 If possible, use pthreads instead of a child process for PAM. 
Reimplement the necessary bits from auth_pam.c and auth2_pam.c so that
they share the PAM context used by the keyboard-interactive thread.  If
a child process is used instead, they will (necessarily) use a separate
context.

Constify do_pam_account() and do_pam_session().

Sponsored by:	DARPA, NAI Labs
 2002-12-14 13:52:39 +00:00
des
b6985eb271 Add a missing #include "canohost.h". 2002-12-14 13:48:47 +00:00
des
a46b8cda04 Remove code related to the PAMAuthenticationViaKbdInt option (which we've 
disabled).  This removes the only reference to auth2_pam().
 2002-12-14 13:48:13 +00:00
des
9f8ff3709f Back out a lastlog-related change which is no longer relevant. 2002-12-14 13:40:21 +00:00
des
bb06b52b06 Fix a rounding error in the block size calculation. 
Submitted by:	tjr
 2002-12-14 13:38:49 +00:00
des
81fe169630 Since OpenSSH drops privileges before calling pam_open_session(3), 
pam_lastlog(8) can't possibly work, so let OpenSSH handle lastlog.

Approved by:	re (rwatson)
 2002-12-03 15:48:11 +00:00
eric
7153bb5d55 Merge argument parsing changes into this copy of telnet. 
Submitted by:	markm
Approved by:	bmah
 2002-11-27 06:34:24 +00:00