Dag-Erling Smørgrav
6c93a5ae8e
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
Dag-Erling Smørgrav
7705c58f36
Go figure how an extra $Id$ line crept in...
2006-10-04 10:21:00 +00:00
Dag-Erling Smørgrav
27241b599f
Merge vendor patch.
2006-10-04 10:15:53 +00:00
Dag-Erling Smørgrav
497e3d52a4
Tweak ifdefs for backward compatibility.
2006-10-03 11:33:25 +00:00
Dag-Erling Smørgrav
77ec673a84
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
Dag-Erling Smørgrav
e66498cd40
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 L. B. Nielsen
f9d67810bf
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 L. B. Nielsen
4d227dd736
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 L. B. Nielsen
74608424ab
Resolve conflicts after import of OpenSSL 0.9.8d.
2006-10-01 07:46:16 +00:00
Simon L. B. Nielsen
ed5d4f9a94
Vendor import of OpenSSL 0.9.8d.
2006-10-01 07:38:44 +00:00
Simon L. B. Nielsen
02d3319f28
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
Dag-Erling Smørgrav
4a20f963ec
Regenerate.
...
MFC after: 1 week
2006-09-30 13:40:56 +00:00
Dag-Erling Smørgrav
1aa495cac5
#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
Dag-Erling Smørgrav
0bdb06c305
Removed from vendor branch.
...
MFC after: 1 week
2006-09-30 13:39:35 +00:00
Dag-Erling Smørgrav
3c492e28cd
Bump version addendum.
...
MFC after: 1 week
2006-09-30 13:39:07 +00:00
Dag-Erling Smørgrav
333ee03933
Merge conflicts.
...
MFC after: 1 week
2006-09-30 13:38:06 +00:00
Dag-Erling Smørgrav
a435c625d7
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
Dag-Erling Smørgrav
761efaa70c
Vendor import of OpenSSH 4.4p1.
2006-09-30 13:29:51 +00:00
Dag-Erling Smørgrav
9d2c6627a1
Merge vendor patch for BSM problem in protocol version 1.
...
MFC after: 1 week
2006-09-16 15:12:58 +00:00
Dag-Erling Smørgrav
30c2033ae7
Vendor patch for a problem that prevented using protocol version 1 when
...
BSM was enabled.
2006-09-16 15:10:13 +00:00
Simon L. B. Nielsen
c800238ebb
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 L. B. Nielsen
2ab7aa997e
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 L. B. Nielsen
35fc1829d8
Sync FREEBSD-Xlist with what was actually excluded from OpenSSL 0.9.8b
...
import.
2006-07-29 22:40:45 +00:00
Simon L. B. Nielsen
f6ec947c28
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 L. B. Nielsen
09bf29a41f
Resolve conflicts after import of OpenSSL 0.9.8b.
2006-07-29 19:14:51 +00:00
Simon L. B. Nielsen
3b4e3dcb9f
Vendor import of OpenSSL 0.9.8b
2006-07-29 19:10:21 +00:00
Simon L. B. Nielsen
f6ab039488
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
Dag-Erling Smørgrav
567b2a322e
Our glob(3) has all the required features.
...
Submitted by: ache
2006-06-09 08:39:05 +00:00
Dag-Erling Smørgrav
98c61a2292
Revert inadvertant commit of debugging code.
2006-06-09 07:23:14 +00:00
Dag-Erling Smørgrav
ed22e27d8a
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
Dag-Erling Smørgrav
998ab76154
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
Dag-Erling Smørgrav
d8b92da88b
Regenerate.
2006-03-22 20:41:53 +00:00
Dag-Erling Smørgrav
b74df5b26f
Merge conflicts.
2006-03-22 20:41:37 +00:00
Dag-Erling Smørgrav
021d409f5b
Vendor import of OpenSSH 4.3p1.
2006-03-22 19:46:12 +00:00
Dag-Erling Smørgrav
4f87d65874
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
Ruslan Ermilov
e1fe3dba5c
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
Doug Rabson
17ed18fef3
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
Doug Rabson
c0b9f4fe65
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
Colin Percival
51ce0d091c
Correct a man-in-the-middle SSL version rollback vulnerability.
...
Security: FreeBSD-SA-05:21.openssl
2005-10-11 11:50:36 +00:00
Dag-Erling Smørgrav
184ad7d3be
Regenerate
2005-09-03 07:08:51 +00:00
Dag-Erling Smørgrav
d4ecd10857
Resolve conflicts.
2005-09-03 07:04:25 +00:00
Dag-Erling Smørgrav
043840df5b
Vendor import of OpenSSH 4.2p1.
2005-09-03 06:59:33 +00:00
Dag-Erling Smørgrav
f8a2a7f14a
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
Dag-Erling Smørgrav
ad69811c17
fine-tune.
2005-09-03 06:42:11 +00:00
Ken Smith
2672e71736
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
Dag-Erling Smørgrav
c032a2803f
Forgot to bump the version addendum.
2005-06-05 18:30:53 +00:00
Dag-Erling Smørgrav
19bccc89b4
Regenerate.
2005-06-05 15:46:27 +00:00
Dag-Erling Smørgrav
aa49c9264c
Resolve conflicts.
2005-06-05 15:46:09 +00:00
Dag-Erling Smørgrav
6dbd30e786
Update for 4.1p1.
2005-06-05 15:43:57 +00:00
Dag-Erling Smørgrav
4518870c72
Vendor import of OpenSSH 4.1p1.
2005-06-05 15:41:57 +00:00