Commit Graph

651 Commits

Author SHA1 Message Date
des
f779b8914d Regenerate. 2004-04-20 09:49:37 +00:00
des
0fe392b244 One more conflict. 2004-04-20 09:47:13 +00:00
des
1aad7956ee Resolve conflicts. 2004-04-20 09:46:41 +00:00
des
26ef5d7dea Adjust version number and addendum. 2004-04-20 09:37:29 +00:00
des
dcbf996966 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
des
a4b7a06c27 Vendor import of OpenSSH 3.8.1p1. 2004-04-20 09:35:04 +00:00
nectar
961b06f517 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
61934b82df 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
0fb21ae533 Resolve conflicts after import of Heimdal 0.6.1. 2004-04-03 21:31:10 +00:00
nectar
6af493ae3b 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
bfc5316dea Vendor import of Heimdal 0.6.1. 2004-04-03 21:22:55 +00:00
nectar
4adf939103 Resolve conflicts after import of OpenSSL 0.9.7d. 2004-03-17 17:44:39 +00:00
nectar
035d311d10 Vendor import of OpenSSL 0.9.7d. 2004-03-17 15:49:33 +00:00
nectar
4c9871f3f1 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
575402800c 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
384b7d32e0 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
2977954dac Correctly document the default value of UsePAM. 2004-03-15 18:38:29 +00:00
des
f4f29e4636 Update VersionAddendum in config files and man pages. 2004-02-26 11:54:03 +00:00
des
50c1f8b061 Define HAVE_GSSAPI_H. 2004-02-26 11:06:29 +00:00
des
de8461cdce Regenerate. 2004-02-26 10:57:38 +00:00
des
ee3abff96f Document recently changed configuration defaults. 2004-02-26 10:57:28 +00:00
des
b003ae8441 Resolve conflicts. 2004-02-26 10:52:33 +00:00
des
8deb3d309f Vendor import of OpenSSH 3.8p1. 2004-02-26 10:38:49 +00:00
des
8729592bdc 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
8cb35cba4d Merge OpenSSH 3.8p1. 2004-02-26 10:38:38 +00:00
des
b401196731 Prepare for upcoming 3.8p1 import. 2004-02-26 10:37:34 +00:00
des
0bbb6ee581 Pull asbesthos underpants on and disable protocol version 1 by default. 2004-02-26 10:24:07 +00:00
des
28570be1ac 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
8b18a0078c Update the "overview of FreeBSD changes to OpenSSH-portable" to reflect
reality.
2004-01-25 13:09:56 +00:00
des
abb5482870 Work around removal of EAI_NODATA from netdb.h. 2004-01-18 22:31:30 +00:00
nectar
779fcff4ae 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
d92065c4ae Don't output the terminating '\0' (already fixed in OpenSSH CVS) 2004-01-09 12:57:36 +00:00
des
9c8af5b44a 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
d6fe6047fb 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
2201efee82 Regenerate config.h; I don't know why this didn't hit CVS yesterday. 2004-01-08 09:42:35 +00:00
des
9fa8807db6 Remove obsolete files on the vendor branch. 2004-01-08 09:33:46 +00:00
des
97c709d620 Update to reflect changes since the last version. 2004-01-07 11:51:18 +00:00
des
ec2e4de14c Resolve conflicts and remove obsolete files.
Sponsored by:	registrar.no
2004-01-07 11:16:27 +00:00
des
eb4c5683c3 Vendor import of OpenSSH 3.7.1p2. 2004-01-07 11:10:17 +00:00
des
2615aba8a6 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
18e627439d Merge OpenSSH 3.7.1p2. 2004-01-07 11:10:02 +00:00
simon
b7d9591fbc 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
3923b41f86 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
a46af1645f 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
2f222c3131 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
1c67c644c4 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
a76c26c085 Add list of files to remove from the Heimdal distribution prior to
each import.
2003-10-09 19:35:38 +00:00
nectar
015688fd67 Remove files no longer included with OpenSSL as of version 0.9.7c. 2003-10-01 12:38:27 +00:00