Commit Graph

255 Commits

Author SHA1 Message Date
Ruslan Ermilov
bce0c9275c NOSECURE is implied by NOCRYPT, meaning if the latter is defined
we won't be here.
2003-04-30 07:34:14 +00:00
Dag-Erling Smørgrav
581ff5e326 Remove Kerberos IV shims. 2003-04-23 17:26:01 +00:00
Dag-Erling Smørgrav
d8b043c8d4 Update for 3.6.1p1; also remove Kerberos IV shims. 2003-04-23 17:25:47 +00:00
Philippe Charnier
45ebb0c103 The .Nm utility 2003-03-24 16:09:07 +00:00
Mike Makonnen
a5c21394e3 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
2003-03-07 16:00:55 +00:00
Ruslan Ermilov
aa1cd79b7f Handle includes the normal way.
Reviewed by:	markm
Approved by:	nectar
2003-02-27 23:07:26 +00:00
Jacques Vidrine
b7d18f9a8a Regenerate man pages after import of OpenSSL 0.9.7a. 2003-02-19 23:30:52 +00:00
Jacques Vidrine
6042ca2e01 Install the OpenSSL man pages in /usr/share/openssl/man
and remove the WANT_OPENSSL_MANPAGES knob.
2003-02-10 19:57:56 +00:00
Mark Murray
ab643b4d66 Update for OpenSSL 0.9.7. No assembler code at the moment. This
will follow.
2003-01-28 22:58:14 +00:00
Kris Kennaway
c55ae80a58 Remove myself as maintainer of openssl; I no longer have enough time to
devote to it.
2002-11-21 08:48:08 +00:00
Dag-Erling Smørgrav
4d56bc2300 Update for OpenSSH 3.5p1. 2002-10-29 10:18:00 +00:00
Dag-Erling Smørgrav
81d858170e 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>
2002-07-05 08:39:09 +00:00
Dag-Erling Smørgrav
f0b56c5c7e No guts, no glory. Switch to OpenSSH-portable.
Sponsored by:	DARPA, NAI Labs
2002-06-25 19:10:09 +00:00
Dag-Erling Smørgrav
360c9f6a02 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
2002-06-24 12:32:30 +00:00
Dag-Erling Smørgrav
16c52d154b Previous commit made no sense. 2002-06-24 10:17:26 +00:00
Dag-Erling Smørgrav
dca1f43686 Fix style and unbreal static build. 2002-06-24 10:16:38 +00:00
Dag-Erling Smørgrav
8d024c6627 Install the new man pages. 2002-06-23 21:43:43 +00:00
Dag-Erling Smørgrav
fd9fc3f0c2 Update Makefiles for OpenSSH 3.3. 2002-06-23 16:09:29 +00:00
Mark Murray
01e8018af8 Build using pregenerated manpages; don't use perl to translate .pod's.
The translated .pod's have already been committed.
2002-05-14 19:39:00 +00:00
Ruslan Ermilov
6bde859f40 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>
2002-04-26 17:55:27 +00:00
Dag-Erling Smørgrav
8f7701469e Adjust for OpenSSH 3.1.
Sponsored by:	DARPA, NAI Labs
2002-03-18 10:20:33 +00:00
Ruslan Ermilov
e47a40e7f7 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
2002-02-08 13:42:58 +00:00
Ruslan Ermilov
0509dca0c3 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
2002-01-23 15:54:17 +00:00
Mark Murray
f3c99bd05e Clean up makefiles, and turn on WARNS=2. Take into account the telnet
#if cleanup.
2001-11-30 21:10:58 +00:00
Mark Murray
7c5a3600ab Diff reduce all the crypto telnet Makefiles. 2001-08-20 12:32:45 +00:00
Bruce Evans
ea36b96388 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.
2001-08-03 22:28:25 +00:00
Mark Murray
563df95270 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.
2001-08-03 16:03:26 +00:00
Bruce Evans
4c05509cd0 Fixed world breakage when NOSHARED=yes. libmp now depends on libcrypto,
so it must be linked before libcrypto to work right.
2001-07-30 14:36:19 +00:00
Ruslan Ermilov
f091f0029a Added missing DPADD and CLEANFILES. 2001-07-12 09:17:51 +00:00
Bruce Evans
e2413c56ed 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.
2001-05-09 14:30:49 +00:00
Nick Sayer
76235b992b 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.
2001-05-07 20:38:39 +00:00
Brian Feldman
d350064e0b Follow the OpenSSH 2.9 upgrade with the infrastructure. Two new
programs are now included: sftp(1) and ssh-keyscan(1).
2001-05-04 04:21:25 +00:00
Ruslan Ermilov
4ecbb30346 Bye-bye /usr/lib/libtelnet.a. This should fix ``make release'' brokeness.
Approved by:	markm
2001-03-28 12:08:22 +00:00
Ruslan Ermilov
b8cba406f2 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.
2001-03-26 14:53:33 +00:00
Ruslan Ermilov
e9f98cd047 man(7) -> mdoc(7). 2001-01-16 15:28:12 +00:00
Brian Feldman
087815f8bc 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
2000-11-14 04:42:25 +00:00
Kris Kennaway
95200624a6 Update for OpenSSL 0.9.6 2000-11-13 02:21:38 +00:00
Kris Kennaway
2f538dadf7 Update for OpenSSH 2.2.0 2000-09-10 09:43:29 +00:00
Andrey A. Chernov
0305cfcec6 Add missing quotes around xauth path 2000-08-23 19:14:48 +00:00
Kris Kennaway
4d858ef441 Respect X11BASE to derive the location of xauth(1)
PR:		17818
Submitted by:	Bjoern Fischer <bfischer@Techfak.Uni-Bielefeld.DE>
2000-08-23 09:39:20 +00:00
Kris Kennaway
283cfe50ae Install the openssl(1) manpage with an MLINK from ssl(8) to at least put
something in the location where OpenSSH likes to point.
2000-08-03 05:29:04 +00:00
Peter Wemm
ecece7e319 Add missing $FreeBSD$ to files that are NOT still on vendor a branch. 2000-07-16 05:48:49 +00:00
Mark Murray
ce09ad5098 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.
2000-06-24 06:50:58 +00:00
Kris Kennaway
4fc9354419 Update for OpenSSH 2.1 2000-05-15 05:26:50 +00:00
Kris Kennaway
9ccbd450e8 Update for OpenSSL 0.9.5a and clean up a bit. 2000-04-13 07:37:35 +00:00
Kris Kennaway
fcd9d76716 Missed a fix for the new openssh; this fixes make world. 2000-03-26 21:17:11 +00:00
Kris Kennaway
1ef4beca5f Update for latest OpenSSH 2000-03-26 07:54:12 +00:00
Kris Kennaway
bb49f794f5 Buildworld fixes for NO_OPENSSH and NO_OPENSSL
Approved by:	jkh
2000-03-09 06:29:05 +00:00
John Hay
aa77fdaa47 MFI: Make ssh and sshd link in the krb5 part of make release.
Reviewed by:	markm
2000-03-03 20:34:05 +00:00
Mark Murray
e1eaf14cd7 New distribution names. 2000-02-28 19:25:34 +00:00
Peter Wemm
9fa5f5fd96 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.
2000-02-26 13:13:03 +00:00
Peter Wemm
42a75d55f1 Merge from internat.freebsd.org; deal with -DRSAref the same way as
libcrypto - not that it means much on the US code tree.
2000-02-25 14:15:31 +00:00
Peter Wemm
8df7a1fa29 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.
2000-02-25 08:21:35 +00:00
Mark Murray
c9f2d5f483 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.
2000-02-24 18:59:34 +00:00
Mark Murray
c23e256eef Add the OpenSSH userland-building Makefiles. 2000-02-24 17:00:55 +00:00
Mark Murray
97dacfda2b Diff reducer. Comes from Internat. 2000-02-24 09:52:37 +00:00
Mark Murray
4486a1f099 Remove useless whitespace.
Part of big commit OK'ed by: JKH
2000-02-24 09:48:58 +00:00
Kris Kennaway
0c7304fede Back out the previous commit - it broke world and was not approved.
I don't know what I was thinking committing without approval - sorry.
2000-02-14 08:09:52 +00:00
Kris Kennaway
b0ba1374bc Link dynamically, not statically. 2000-02-13 00:53:12 +00:00
Kris Kennaway
8c52579a78 Add NO_OPENSSL knob to turn off building of openssl
Requested by:   wollman
2000-01-30 04:12:49 +00:00
Yoshinobu Inoue
4dd8b5ab79 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
2000-01-27 09:28:38 +00:00
Kris Kennaway
a5c3c93893 Don't search for libraries in ${LOCALBASE}. This should fix the problems
people were seeing with conflicts with the openssl port.
2000-01-20 07:29:01 +00:00
Kris Kennaway
e36de8f1b1 The wrong version of the file was committed previously which explains the
problems seen here.
2000-01-16 21:00:06 +00:00
Kris Kennaway
f9992f30fc Turn back on openssl building. 2000-01-16 05:25:26 +00:00
Kris Kennaway
2f00e5fdc4 Add MAINTAINER tag so people don't feel the need to randomly frob with this. 2000-01-16 02:20:03 +00:00
Brian Feldman
d82f495687 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.
2000-01-15 18:02:10 +00:00
Kris Kennaway
45b8027e25 Connect OpenSSL to the build. 2000-01-14 08:01:51 +00:00
Kris Kennaway
41e8e5da52 Build infrastructure for OpenSSL 2000-01-14 05:49:29 +00:00
Peter Wemm
ed9823add9 Revert -lmd changes now that libcrypt doesn't expose this binutils/ld
bug any more.
1999-12-18 16:42:33 +00:00
Marcel Moolenaar
6b5f58c5c3 Add libmd to DPADD and LDADD. 1999-12-17 11:45:28 +00:00
Mark Murray
1a19815c14 Dont build telenet if we are going for kerberised telnet; this just
jumps all over kerberised telnet otherwise.
1999-10-12 19:48:05 +00:00
Mark Murray
d14fc57cb7 Make telnet with SRA work.
Submitted by:	Nick Sayer
1999-10-07 19:47:09 +00:00
Peter Wemm
97d92980a9 $Id$ -> $FreeBSD$ 1999-08-28 01:35:59 +00:00
Kris Kennaway
3e977c59cf Typo in comment. 1999-04-25 13:14:36 +00:00
Peter Wemm
c0ec1f37ef Revert $FreeBSD$ to $Id$ 1997-02-22 14:40:44 +00:00
Jordan K. Hubbard
1130b656e5 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.
1997-01-14 07:20:47 +00:00
Mark Murray
4ee026279c Secure telnet is now in eBones. 1996-11-07 14:42:57 +00:00
Jordan K. Hubbard
cd9a2f5c28 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.
1996-06-24 04:26:21 +00:00
Nate Williams
c4a4597e90 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
1996-06-05 22:48:04 +00:00
Paul Traina
33bb8564be Add support for socks 1996-04-23 05:18:43 +00:00
Mark Murray
6dd8a38202 Big clean-up job. Remove ancient and never-to-be used stuff.
The look much more like BSD Makefiles now.
1996-03-11 16:17:58 +00:00
Andrey A. Chernov
f6d9ce2bae Sense MAKE_EBONES, DESTDIR
SRCS cleanup
DPADD cleanup
1996-03-09 13:26:21 +00:00
Mike Pritchard
7c87ef470d 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.
1996-02-02 00:26:12 +00:00
Peter Wemm
6065a0be11 This commit was generated by cvs2svn to compensate for changes in r13122,
which included commits to RCS files with non-trunk default branches.
1995-12-30 19:02:48 +00:00
Andrey A. Chernov
ab6b1a8ad5 Pick correct library dir whenever obj exists or not 1995-12-21 17:57:16 +00:00
Justin T. Gibbs
9d01cc32c6 Remove MAKE_EBONES conditionals. They were originally placed here because
of missing functionality in our libkrb which is no longer a problem.
1995-10-11 00:04:09 +00:00
Andrey A. Chernov
d6cf037780 Remove duplicated targets which now build from main tree
if available and allowed
1995-09-29 20:23:09 +00:00
Justin T. Gibbs
b7f41e3f67 Add TELNETOBJDIR and CRYPTOBJDIR for use in LDADD entries. This makes
secure reference the libraries that were just build instead of in /usr/lib.
1995-09-16 03:04:10 +00:00
Justin T. Gibbs
790136a438 Enable kerberosIV authentication/encryption conditionalized on MAKE_EBONES. 1995-09-14 21:29:21 +00:00
Andrey A. Chernov
0a06628ab2 Comment out LDADD+=-ldescrypt, it is not yet active due to
missng defines for krb4encpwd and rsaencpwd and missing rsa library too.
1995-08-05 19:10:25 +00:00
Mark Murray
d5fc4d2a65 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:
1995-07-29 12:49:25 +00:00
Andrey A. Chernov
9ed77b336f 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)
1995-07-24 22:55:59 +00:00
Andrey A. Chernov
dbd07ffcc0 Add -ldescrypt, or wrong crypt version can be picked from libc
Reviewed by:
Submitted by:
Obtained from:
1995-07-24 22:01:01 +00:00
Andrey A. Chernov
e74d115547 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:
1995-07-24 21:47:30 +00:00
Andrey A. Chernov
4109d6bfef Add comment about new_rnd_key.c module needed from original
libdes (and not present in eBones libdes)
1995-07-24 21:12:57 +00:00
Andrey A. Chernov
f8e556c37d Fix dependances, typing errors, etc.
Note: this thing need original libdes not Eric Young libdes from eBones
Submitted by:
Obtained from:
1995-07-24 20:40:03 +00:00
Paul Traina
9809ff32f6 Update telnet to the 95.05.31 release.
Obtained from:	Dave Borman <dab@cray.com>
1995-07-20 11:40:06 +00:00
Rodney W. Grimes
5ebc7e6281 Remove trailing whitespace. 1995-05-30 06:12:45 +00:00
Dima Ruban
399e5b4411 Security fixes.
CERT Advisory CA-95:03.telnet.encryption

Obtained from: CERT
1995-02-17 03:57:00 +00:00
Poul-Henning Kamp
f079582484 Make the "distribute" target build the "des" distribution. Make des'ed
init and ed, by pointing to real sources.
1994-11-14 20:45:35 +00:00
Paul Traina
448380bfbf !Just! fixing makefile, no code changes Geoff 1994-09-30 06:04:40 +00:00
Andrey A. Chernov
95fb75febe Add libcipher.a: libcrypt exports only crypt() but not des_setkey()
which is in libcipher.a
1994-09-12 17:27:55 +00:00
Paul Traina
21b4fe120d 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
1994-09-07 07:16:52 +00:00
Geoff Rehmet
eb3ae6fd94 The telnet version with encryption in in.
Reviewed by:	geoff.
1994-08-27 15:48:54 +00:00
Garrett Wollman
0cc8ddab2b Moved from usr.bin/bdes for export-control. 1994-08-07 18:17:39 +00:00