Fix multiple OpenSSL vulnerabilities.

Security: FreeBSD-SA-16:12.openssl
Approved by: so

Fix integer overflow in IGMP protocol. [SA-15:04]

Fix BIND remote denial of service vulnerability. [SA-15:05]

Fix vt(4) crash with improper ioctl parameters. [EN-15:01]

Updated base system OpenSSL to 0.9.8zd. [EN-15:02]

Fix freebsd-update libraries update ordering issue. [EN-15:03]

Approved by: so

Remove svn:mergeinfo carried over from stable/9.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Copy stable/9 to releng/9.3 as part of the 9.3-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Correct OpenSSL 0.9.8za release date.

Approved by: re (delphij)

Merge OpenSSL 0.9.8za.

Approved by: re (kib), so (delphij)

MFH (r237568, r255422, r255460, r255766, r255767, r255774, r255829,
r256126, r257954, r261320, r261499, r263691, r263712): upgrade to
OpenSSH 6.6p1 via 6.3p1, 6.4p1 and 6.5p1.

Differences relative to head:

- No DNSSEC support since stable/9 does not have LDNS
- Sandboxing off by default, and uses rlimit instead of Capsicum
- ED25519 moved to the bottom of the order of preference to avoid
"new public key" warnings

MFH (r254407, r254960, r255371): misc cleanup
MFH (r255386): make libssh private
MFH (r255369, r255376, r255393, r262530): import OpenPAM Nummularia

Merge OpenSSL 0.9.8y. This is a direct commit to stable/9 as HEAD is on a
different release now.

MFH (r245527): add OPENSSH_NONE_CIPHER build option

MFC: r237657, r237658, r237666

Merge OpenSSL 0.9.8x and regen manual pages.

MFC r233136, r233432:
Restore the ability to use a non-standard LOCALBASE to sshd
Add the ability to use a non-standard LOCALBASE to ssh

Approved by: cperciva (implicit)

Copy head to stable/9 as part of 9.0-RELEASE release cycle.

Approved by: re (implicit)

Regenerate manual pages for OpenSSL 0.9.8q.

Regenerate manual pages for OpenSSL 0.9.8p.

Regenerate manual pages for OpenSSL 0.9.8n.

Regenerate manual pages for OpenSSL 0.9.8m.

MFC after: 3 weeks

Upgrade to OpenSSH 5.4p1.

MFC after: 1 month

Fix a couple of comment typos.

MFC after: 1 week

Upgrade to OpenSSH 5.3p1.

Regenerate manual pages for OpenSSL 0.9.8k.

Update build infrastructure for OpenSSL 0.9.8k.

Upgrade to OpenSSH 5.1p1.

I have worked hard to reduce diffs against the vendor branch. One
notable change in that respect is that we no longer prefer DSA over
RSA - the reasons for doing so went away years ago. This may cause
some surprises, as ssh will warn about unknown host keys even for
hosts whose keys haven't changed.

MFC after: 6 weeks

Set magic fbsd:nokeywords property that allows files to bypass
keyword expansion. (file-specific replacement for CVSROOT/exclude)

Add $FreeBSD$

For users of FreeBSD <= 6.2 we recommend during the x.org 7.x upgrade
that they add X11BASE=${LOCALBASE} to /etc/make.conf since X11BASE was
hard-wired to the now-wrong location in old releases.

However, both X11BASE and LOCALBASE have moved out of scope of src/
into ports/ now, which causes problems for upgraded users who have old
make.conf files still containing the above setting. X11BASE becomes
null and we instruct ssh and sshd to look for xauth in /bin/xauth
where it is unlikely to be found.

Instead, provide a copy of the default LOCALBASE?=/usr/local setting
here.

We also have to deal with the case where the user only overrides
LOCALBASE and doesn't set an explicit X11BASE (in ports it will be set
implicitly but not here), which will also move the location of xauth.

MFC after: 3 days
Reported by: rwatson

getopt(3) returns -1, not EOF.

Upgrade to OpenSSL 0.9.8e.

Fix static compilation.

Upgrade to OpenSSL 0.9.8d.

Upgrade to OpenSSL 0.9.8b.

Add a manual dependency on ssh_namespace.h.

Discussed with: ru

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

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)

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)

Revert the commits that made libssh an INTERNALLIB; they caused too much
trouble, especially on amd64.

Requested by: ru

Make libssh an INTERNALLIB like it is in {Net,Open}BSD.

Update for OpenSSH 4.1p1.

Update OpenSSL 0.9.7d -> 0.9.7e.

Sync program's usage() with manpage's SYNOPSIS.

Correctly hide the command arguments.

PR: bin/76374
MFC after: 2 weeks

Update for 3.8p1, including workaround for a bug in gss-genr.c.

style.Makefile(5):
Use WARNS?= instead of WARNS=.

Fixed static linkage.

Reviewed by: des

Enable GSSAPI support. [1]
Also remove some duplicates from ssh's SRCS.

Submitted by: [1] Björn Grönvall <bg@sics.se>

Update Makefiles for OpenSSH 3.7.1p2.

Explicitly add libz and libcrypto to LDADD for any ssh utilities missing
it. While not strictly required, it unbreaks the cross-build world that
is resulting from moving the libraries around.

I have a more permanent solution to this problem in the works, but I
asked des for permission to commit this to get the ball rolling. This
also makes the ssh build more along the lines of what the openssh-portable
and OpenBSD openssh Makefile glue does.

Reviewed by: des

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.

Fixed "make checkdpadd".

OK'ed by: markm

Fix for the NO_OPENSSL case.

Reported by: Marius Strobl <marius@alchemy.franken.de>

Modernise. Use libcrypto instead of libcipher for DES.

Turn MAKE_KERBEROS5 into NO_KERBEROS by negating the logic. Some extra
cleanups were necessary in release/Makefile, and the tinderbox code
was syntax checked, not run checked.

We no longer have a separate kerberos distribution. Its now just
part of the regular security dist.

The including makefile's directory is tried first for .include "...".

Most things depend on !defined(NO_OPENSSL); make it look so.

NOSECURE is implied by NOCRYPT, meaning if the latter is defined
we won't be here.

Remove Kerberos IV shims.

Update for 3.6.1p1; also remove Kerberos IV shims.

The .Nm utility

Fix mixed up arguments passed to a locally defined err(int, char *)
function.

Approved by: markm (mentor)
Submitted by: till toenges <tt@mail.isis.de>
PR: bin/48963

Handle includes the normal way.

Reviewed by: markm
Approved by: nectar

Regenerate man pages after import of OpenSSL 0.9.7a.

Install the OpenSSL man pages in /usr/share/openssl/man
and remove the WANT_OPENSSL_MANPAGES knob.

Update for OpenSSL 0.9.7. No assembler code at the moment. This
will follow.

Remove myself as maintainer of openssl; I no longer have enough time to
devote to it.

Update for OpenSSH 3.5p1.

ssh-keysign(8) belongs in /usr/libexec, not in /usr/bin, and needs to be
setuid so ssh(1) doesn't have to be.

Pointy hat to: des
Submitted by: Katsuyuki TATEISHI <katsu@iec.hiroshima-u.ac.jp>

No guts, no glory. Switch to OpenSSH-portable.

Sponsored by: DARPA, NAI Labs

My previous style commits weren't entirely right. Fix some bugs I
introduced, and a few more I hadn't yet fixed.

Submitted by: bde

Previous commit made no sense.

Fix style and unbreal static build.

Install the new man pages.

Update Makefiles for OpenSSH 3.3.

Build using pregenerated manpages; don't use perl to translate .pod's.
The translated .pod's have already been committed.

Milestone #1 in cross-arch make releases.

Do not install games and profiled libraries to the ${CHROOTDIR}
with the initial installworld.

Eliminate the need in the second installworld. For that, make sure
_everything_ is built in the "world" environment, using the right
tool chain.

Added SUBDIR_OVERRIDE helper stuff to Makefile.inc1. Split the
buildworld process into stages, and skip some stages when
SUBDIR_OVERRIDE is set (used to build crypto, krb4, and krb5
dists).

Added NO_MAKEDB_RUN knob to Makefile.inc1 to avoid running
makewhatis(1) at the end of installworld (used when making crypto,
krb4, and krb5 dists).

In release/scripts/doFS.sh, ensure that the correct boot blocks are
used.

Moved the creation of the "crypto" dist from release.5 to
release.2.

In release.3 and doMFSKERN, build kernels in the "world"
environment. KERNELS now means "additional" kernels, GENERIC is
always built.

Ensure we build crunched binaries in the "world" environment.
Obfuscate release/Makefile some more (WMAKEENV) to achieve this.

Inline createBOOTMFS target.

Use already built GENERIC kernel modules to augment mfsfd's
/stand/modules. GC doMODULES as such.

Assorted fixes:

Get rid of the "afterdistribute" target by moving the single use
of it from sys/Makefile to etc/Makefile's "distribute".

Makefile.inc1: apparently "etc" no longer needs to be last for
"distribute" to succeed.

gnu/usr.bin/perl/library/Makefile.inc: do not override the
"install" and "distribute" targets, do it the "canonical" way.

release/scripts/{man,cat}pages-make.sh: make sure Perl manpages and
catpages appear in the right dists. Note that because Perl does
not respect the MANBUILDCAT (and NOMAN), this results in a loss of
/usr/share/perl/man/cat* empty directories. This will be fixed
soon.

Turn MAKE_KERBEROS4 into a plain boolean variable (if it is set it
means "make KerberosIV"), as documented in the make.conf(5)
manpage. Most of the userland makefiles did not test it for "YES"
anyway.

XXX Should specialized kerberized libpam versions be included into
the krb4 and krb5 dists? (libpam.a would be incorrect anyway if
both krb4 and krb5 dists were choosen.)

Make sure "games" dist is made before "catpages", otherwise games
catpages settle in the wrong dist.

Fast build machine provided by: Igor Kucherenko <kivvy@sunbay.com>

Adjust for OpenSSH 3.1.

Sponsored by: DARPA, NAI Labs

Now that cross-tools ld(1) has been fixed to look for dynamic
dependencies in the correct place, record the fact that -lssh
depends on -lcrypto and -lz.

Removed false dependencies on -lz (except ssh(1) and sshd(8)).
Removed false dependencies on -lcrypto and -lutil for scp(1).

Reviewed by: markm

Add pam_ssh support to the static PAM library, libpam.a:

- Spam /usr/lib some more by making libssh a standard library.
- Tweak ${LIBPAM} and ${MINUSLPAM}.
- Garbage collect unused libssh_pic.a.
- Add fake -lz dependency to secure/ makefiles needed for
dynamic linkage with -lssh.

Reviewed by: des, markm
Approved by: markm

Clean up makefiles, and turn on WARNS=2. Take into account the telnet
#if cleanup.

Diff reduce all the crypto telnet Makefiles.

Link to libcipher in the usual way. `bdes' depended on a nonexistent
library. This only worked because of the undocmented feature of make(1)
that targets named foo.a are always up to date.

Fixed some style bugs.

Revamp and diff-reduce the various secure telnets. Make sure that
Kerberos5 has _a_ telnet (which is not currently K5 enabled).
Incorporate BDE's static linking fixes.

Fixed world breakage when NOSHARED=yes. libmp now depends on libcrypto,
so it must be linked before libcrypto to work right.

Added missing DPADD and CLEANFILES.

Fixed world breakage in previous commit. -lpam must never be used
directly (except in the definition of MINUSLPAM in bsd.libnames.mk)
since it doesn't give all the libraries necessary for static linkage.

Fixed missing ${LIBPAM} in DPADD.

Fixed some style bugs in DPADD and LDADD.

Add PAM support to SRA authentication. Cribbed mostly from ftpd. This
doesn't solve the problem of root being allowed to log in, but that sort
of thing is something PAM should be doing anyway.

Follow the OpenSSH 2.9 upgrade with the infrastructure. Two new
programs are now included: sftp(1) and ssh-keyscan(1).

Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.

Approved by: markm

secure/ build fixes:

- TELNETOBJDIR is gone. `buildworld' already installs libtelnet.a
in ${WORLDTMP}/usr/lib, and we have LIBRARY_PATH pointing there.

- SSHDIR (formerly SSHSRC) is now shared between all SSH modules.
New LIBSSH is introduced for libssh.a (an internal static lib).
Previously, build without prior `obj' was broken; SSH modules
always looked for libssh.a in ${.OBJDIR}. Also, the dependancies
on the libssh.a were missing.

- libtelnet/ did not install the crypto version of telnet.h into
/usr/include/arpa.

- Removed BINOWN, BINMODE, BINDIR and SRCS with default values.

Reviewed by: markm

- MAN[1-9] -> MAN.

man(7) -> mdoc(7).

Disable /usr/bin/ssh being setuid root by default. Let the variable
ENABLE_SUID_SSH being defined reenable it for those that want it.

This follows discussion favoring the change from September. It
is not usually necessary to be setuid root, possibly less safe,
and less convenient (cannot use $HOSTALIASES, for example).

Submitted by: jedgar

Update for OpenSSL 0.9.6

Update for OpenSSH 2.2.0

Add missing quotes around xauth path

Respect X11BASE to derive the location of xauth(1)

PR: 17818
Submitted by: Bjoern Fischer <bfischer@Techfak.Uni-Bielefeld.DE>

Install the openssl(1) manpage with an MLINK from ssl(8) to at least put
something in the location where OpenSSH likes to point.

Add missing $FreeBSD$ to files that are NOT still on vendor a branch.

MFI. This is a documentation-only, diffreducing patch, that if
invoked will cause breakage. US Users - DO NOT try to turn on
IDEA - the sources are not included.

Update for OpenSSH 2.1

Update for OpenSSL 0.9.5a and clean up a bit.

Missed a fix for the new openssh; this fixes make world.

Update for latest OpenSSH

Buildworld fixes for NO_OPENSSH and NO_OPENSSL

Approved by: jkh

MFI: Make ssh and sshd link in the krb5 part of make release.

Reviewed by: markm

New distribution names.

Merge from internat.freebsd.org repo, minus change to rsa_eay.c (missing)

Reorganize and unify libcrypto's interface so that the RSA implementation
is chosen at runtime via dlopen().

This is a checkpoint and may require more tweaks still.

Merge from internat.freebsd.org; deal with -DRSAref the same way as
libcrypto - not that it means much on the US code tree.

Don't pull in libRSAglue for the rsaref case. Since this is linked
dynamically by default, we use the dlopen() calls to load librsaref.so
on US code trees.

Build everything properly. This means:

o Don't b uild libdes.

o Crypto is now housed in libcrypto (with a compatability symlink to
libdes)

o RSA may depend on RSAREF at your locale.

o OpenSSH is now a part of the base system.

Add the OpenSSH userland-building Makefiles.

Diff reducer. Comes from Internat.

Remove useless whitespace.

Part of big commit OK'ed by: JKH

Back out the previous commit - it broke world and was not approved.
I don't know what I was thinking committing without approval - sorry.

Link dynamically, not statically.

Add NO_OPENSSL knob to turn off building of openssl

Requested by: wollman

another tcp apps IPv6 updates.(should be make world safe)
ftp, telnet, ftpd, faithd
also telnet related sync with crypto, secure, kerberosIV

Obtained from: KAME project

Don't search for libraries in ${LOCALBASE}. This should fix the problems
people were seeing with conflicts with the openssl port.

The wrong version of the file was committed previously which explains the
problems seen here.

Turn back on openssl building.

Add MAINTAINER tag so people don't feel the need to randomly frob with this.

We cannot have libcrypto, and therefore OpenSSL at all, without RSA.
If you need examples of breakage, I'm ready to provide more than a
few.

Connect OpenSSL to the build.

Build infrastructure for OpenSSL

Revert -lmd changes now that libcrypt doesn't expose this binutils/ld
bug any more.

Add libmd to DPADD and LDADD.

Dont build telenet if we are going for kerberised telnet; this just
jumps all over kerberised telnet otherwise.

Make telnet with SRA work.

Submitted by: Nick Sayer

$Id$ -> $FreeBSD$

Typo in comment.

Revert $FreeBSD$ to $Id$

Make the long-awaited change from $Id$ to $FreeBSD$

This will make a number of things easier in the future, as well as (finally!)
avoiding the Id-smashing problem which has plagued developers for so long.

Boy, I'm glad we're not using sup anymore. This update would have been
insane otherwise.

Secure telnet is now in eBones.

Bring in my changes for removing the pestilent obj links (unless you
really want them) from /usr/src. This is the final version of the
patches, incorporating the feedback I've received from -current.

Bring in a change that got lost when we spammed over the CVS repository
to fix the mega-commits spamming.

pst 96/05/29 20:09:25

Modified: secure/usr.bin/telnet Makefile main.c
Log:
Remove obsolete SOCKSv4 support

Submitted by: pst
Obtained from: A mirrored CVS repository that will disappear next SUP

Add support for socks

Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.

Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup

Correct some manual page cross reference errors. E.g. su is a section
one man page, not section eight. This is the first round of such changes
and only fixes man pages in manual section one.

This commit was generated by cvs2svn to compensate for changes in r13122,
which included commits to RCS files with non-trunk default branches.

Pick correct library dir whenever obj exists or not

Remove MAKE_EBONES conditionals. They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.

Remove duplicated targets which now build from main tree
if available and allowed

Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries. This makes
secure reference the libraries that were just build instead of in /usr/lib.

Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES.

Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.

After pst and ache fixed secure telnet, it was still not in the main
makefiles. This puts it in.

PLEASE NOTE - YOU WILL NEED TO BUILD AND INSTALL THE libtelnet IN secure/
Reviewed by:
Submitted by:
Obtained from:

Final cleanup pass through Makefiles, now this stuff
autodetect kerberos/eBones and work even with eBones,
but with reduced functionality (don't pick up des/krb stuff
in this case)

Add -ldescrypt, or wrong crypt version can be picked from libc
Reviewed by:
Submitted by:
Obtained from:

Since this stuff not works with eBones, ifdef kerberos stuff
with MAKE_KERBEROS to allow other things to live
Reviewed by:
Submitted by:
Obtained from:

Add comment about new_rnd_key.c module needed from original
libdes (and not present in eBones libdes)

Fix dependances, typing errors, etc.
Note: this thing need original libdes not Eric Young libdes from eBones
Submitted by:
Obtained from:

Update telnet to the 95.05.31 release.

Obtained from: Dave Borman <dab@cray.com>

Remove trailing whitespace.

Security fixes.
CERT Advisory CA-95:03.telnet.encryption

Obtained from: CERT

Make the "distribute" target build the "des" distribution. Make des'ed
init and ed, by pointing to real sources.

!Just! fixing makefile, no code changes Geoff

Add libcipher.a: libcrypt exports only crypt() but not des_setkey()
which is in libcipher.a

Remove static in front of declarations for des_setkey and des_cipher
so that linking against -lcrypt (-ldescrypt) will give us the good
versions instead of the stubs in libc. (These changes need to be
made to the non-US version of libdescrypt too!)

Allow building and support for bdes program.
A bit more work still needs to be done on secure telnet.

Submitted by: pst

This commit was generated by cvs2svn to compensate for changes in r2316,
which included commits to RCS files with non-trunk default branches.

Moved from usr.bin/bdes for export-control.