Commit Graph

687 Commits

Author SHA1 Message Date
des
9b7e932d57 Regenerate 2005-09-03 07:08:51 +00:00
des
c7d1f361fb Resolve conflicts. 2005-09-03 07:04:25 +00:00
des
19d27fc2eb 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
42b6e02f5c Vendor import of OpenSSH 4.2p1. 2005-09-03 06:59:33 +00:00
des
22137c7bf2 fine-tune. 2005-09-03 06:42:11 +00:00
kensmith
f0d227cc67 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
85c28cdd5c Forgot to bump the version addendum. 2005-06-05 18:30:53 +00:00
des
43c3ec7384 Regenerate. 2005-06-05 15:46:27 +00:00
des
b023b93c99 Resolve conflicts. 2005-06-05 15:46:09 +00:00
des
6648e92374 Update for 4.1p1. 2005-06-05 15:43:57 +00:00
des
916628a785 Vendor import of OpenSSH 4.1p1. 2005-06-05 15:41:57 +00:00
des
a5b398f1bc 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
860a8577f1 Vendor import of OpenSSH 4.0p1. 2005-06-05 15:40:50 +00:00
des
3e312a8455 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
fdc6af5955 Rewrite some of the regexps so they don't match themselves. 2005-06-04 23:18:33 +00:00
nectar
ad6cce4d9d File removed in update from OpenSSL 0.9.7d -> 0.9.7e. 2005-02-25 06:22:30 +00:00
nectar
f0778552d1 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
3b7a7e8deb Resolve conflicts after import of OpenSSL 0.9.7e. 2005-02-25 05:49:44 +00:00
nectar
32c2feee7f 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
c0f445ca64 Vendor import of OpenSSL 0.9.7e. 2005-02-25 05:39:05 +00:00
nectar
629525804d Update list of files to remove prior to import of OpenSSL 0.9.7e. 2005-02-25 05:31:23 +00:00
nectar
1a9db791fe 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
2ac9df4d43 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
0d51bf3fb8 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
2565fa1348 Vendor import of Heimdal 0.6.3. 2005-02-24 22:22:53 +00:00
nectar
57e9e7ecfb 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
543276df5b Better Xlist command line. 2004-10-28 16:13:28 +00:00
des
e6294fadb5 Resolve conflicts 2004-10-28 16:11:31 +00:00
des
e2b616195f Vendor import of OpenSSH 3.9p1. 2004-10-28 16:03:53 +00:00
des
a16e622b22 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
991e378d5e These are unnecessary and have been causing imp@ trouble. 2004-10-27 19:07:36 +00:00
markm
e04582b0c7 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
7d235296b4 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
a3315fd947 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
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
a4b7a06c27 Vendor import of OpenSSH 3.8.1p1. 2004-04-20 09:35:04 +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
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
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
0fb21ae533 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
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
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