Dag-Erling Smørgrav
28ba6a75b2
Accidentally mangled this one in the previous commit.
2008-08-01 01:38:24 +00:00
Dag-Erling Smørgrav
7ca12ebb55
More files which no longer have any local changes.
2008-08-01 01:32:56 +00:00
Dag-Erling Smørgrav
7396b2c4a1
These two files have no local patches except to prevent expansion of the
...
original $FreeBSD$ keywords. Revert those changes, and simply disable
keyword expansion.
2008-08-01 01:30:26 +00:00
Dag-Erling Smørgrav
504c3e3a23
Last remains of old OPIE patch
2008-08-01 01:24:42 +00:00
Dag-Erling Smørgrav
d09462ac3e
We no longer have any local changes here.
2008-08-01 01:19:13 +00:00
Dag-Erling Smørgrav
539f0548f9
Tag expansion is no longer needed (svn handles them correctly).
...
Add svn command to diff against vendor branch.
2008-08-01 01:05:27 +00:00
Dag-Erling Smørgrav
a84fceb333
This is no longer needed.
2008-08-01 01:04:52 +00:00
Dag-Erling Smørgrav
58055dcd5a
Cleanup.
2008-08-01 01:00:34 +00:00
Dag-Erling Smørgrav
5a19634aa0
Ugh. Set svn:mergeinfo correctly.
2008-08-01 00:34:37 +00:00
Dag-Erling Smørgrav
cb7b802714
Catch up with reality.
2008-08-01 00:28:50 +00:00
Dag-Erling Smørgrav
7cbfb01447
Revert an old hack I put in to replace S/Key with OPIE. We haven't used
...
that code in ages - we use pam_opie(8) instead - so this is a NOP.
2008-08-01 00:27:48 +00:00
Dag-Erling Smørgrav
977e23ac4d
Add missing #include for strlen()
2008-07-31 23:33:26 +00:00
Dag-Erling Smørgrav
882ff9f579
Fix alignment of the cmsg buffer by placing it in a union with a struct
...
cmsghdr. Derived from upstream patch.
Submitted by: cognet
MFC after: 2 weeks
2008-07-30 09:16:46 +00:00
Dag-Erling Smørgrav
a9337121a7
Remove a bunch of files we don't need to build OpenSSH. They are still
...
available in base/vendor-crypto/openssh/dist/.
2008-07-23 17:02:25 +00:00
Doug Rabson
33f1219925
Fix conflicts after heimdal-1.1 import and add build infrastructure. Import
...
all non-style changes made by heimdal to our own libgssapi.
2008-05-07 13:53:12 +00:00
Doug Rabson
4fe54d7c6a
This commit was generated by cvs2svn to compensate for changes in r178825,
...
which included commits to RCS files with non-trunk default branches.
2008-05-07 13:39:42 +00:00
Doug Rabson
c19800e8cd
Vendor import of Heimdal 1.1
2008-05-07 13:39:42 +00:00
Dag-Erling Smørgrav
1c71974b6c
Fix the Xlist so it actually works with 'tar -X', and update the upgrade
...
instructions accordingly.
2008-02-06 23:14:24 +00:00
Dag-Erling Smørgrav
2f84291cac
As per discussion, commit experimental metadata for my contrib packages.
...
The idea is to have a FREEBSD-vendor file for every third-party package
in the tree.
2008-02-06 23:06:24 +00:00
Simon L. B. Nielsen
e262aef1ae
Unbreak detection of cryptodev support for FreeBSD which was broken
...
with OpenSSL 0.9.8 import.
Note that this does not enable cryptodev by default, as it was the
case with OpenSSL 0.9.7 in FreeBSD base, but this change makes it
possible to enable cryptodev at all.
This has been submitted upstream as:
http://rt.openssl.org/Ticket/Display.html?id=1624
Submitted by: nork
2008-01-13 11:44:47 +00:00
Simon L. B. Nielsen
a87abab4b0
This commit was generated by cvs2svn to compensate for changes in r172767,
...
which included commits to RCS files with non-trunk default branches.
2007-10-18 20:19:33 +00:00
Simon L. B. Nielsen
a0ddfe4e72
Import DTLS security fix from upstream OpenSSL_0_9_8-stable branch.
...
From the OpenSSL advisory:
Andy Polyakov discovered a flaw in OpenSSL's DTLS
implementation which could lead to the compromise of clients
and servers with DTLS enabled.
DTLS is a datagram variant of TLS specified in RFC 4347 first
supported in OpenSSL version 0.9.8. Note that the
vulnerabilities do not affect SSL and TLS so only clients and
servers explicitly using DTLS are affected.
We believe this flaw will permit remote code execution.
Security: CVE-2007-4995
Security: http://www.openssl.org/news/secadv_20071012.txt
2007-10-18 20:19:33 +00:00
Peter Wemm
d0a6d5e51e
Remove _FREEFALL_CONFIG hacks. su+pam_ksu works well enough to use on
...
the freebsd.org cluster.
2007-10-18 19:36:31 +00:00
Simon L. B. Nielsen
ec4b528c4a
Correct a buffer overflow in OpenSSL SSL_get_shared_ciphers().
...
Security: FreeBSD-SA-07:08.openssl
Approved by: re (security blanket)
2007-10-03 21:38:57 +00:00
Dag-Erling Smørgrav
ffea3f5a05
s/X11R6/local/g
2007-05-24 22:04:07 +00:00
Simon L. B. Nielsen
1a15cc9f5c
Fix runtime crash in OpenSSL with "Illegal instruction" by making some
...
casts a bit less evil.
This was e.g. seen when using portsnap as:
Fetching snapshot tag from portsnap3.FreeBSD.org... Illegal instruction
Note the patch is slightly different from kan's original patch to
match style in the OpenSSL source files a bit better.
Submitted by: kan
Tested by: many
2007-05-22 20:28:19 +00:00
Simon L. B. Nielsen
e9c804063f
- Bring upgrade produce up-to-date for OpenSSL 0.9.8e.
...
- Add reminder to bump version numer in Makefile.inc.
2007-03-15 21:06:48 +00:00
Simon L. B. Nielsen
c30e4c6174
Import fix from upstream OpenSSL_0_9_8-stable branch:
...
EVP_CIPHER_CTX_key_length() should return the set key length
in the EVP_CIPHER_CTX structure which may not be the same as
the underlying cipher key length for variable length ciphers.
This fixes problems in OpenSSH using some ciphers, and possibly other
applications.
See also: http://bugzilla.mindrot.org/show_bug.cgi?id=1291
2007-03-15 20:26:26 +00:00
Simon L. B. Nielsen
0339ca21b8
This commit was generated by cvs2svn to compensate for changes in r167617,
...
which included commits to RCS files with non-trunk default branches.
2007-03-15 20:26:26 +00:00
Simon L. B. Nielsen
1d1b15c8bf
Resolve conflicts after import of OpenSSL 0.9.8e.
2007-03-15 20:07:27 +00:00
Simon L. B. Nielsen
5471f83ea7
Vendor import of OpenSSL 0.9.8e.
2007-03-15 20:03:30 +00:00
Simon L. B. Nielsen
03b688114f
This commit was generated by cvs2svn to compensate for changes in r167612,
...
which included commits to RCS files with non-trunk default branches.
2007-03-15 20:03:30 +00:00
Dag-Erling Smørgrav
62efe23a82
Resolve conflicts.
2006-11-10 16:52:41 +00:00
Dag-Erling Smørgrav
b8e61582fe
This commit was generated by cvs2svn to compensate for changes in r164146,
...
which included commits to RCS files with non-trunk default branches.
2006-11-10 16:39:21 +00:00
Dag-Erling Smørgrav
92eb0aa103
Vendor import of OpenSSH 4.5p1.
2006-11-10 16:39:21 +00:00
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
85511fb52d
Apply vendor patch to fix detection of tap / tun headers and ENGINE support.
2006-10-04 10:14:30 +00:00
Dag-Erling Smørgrav
497e3d52a4
Tweak ifdefs for backward compatibility.
2006-10-03 11:33:25 +00:00
Dag-Erling Smørgrav
62142b308a
Dead files.
2006-10-02 13:29:41 +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
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
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
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