Commit Graph

64 Commits

Author SHA1 Message Date
nsayer
7005445e10 Since the root-on-insecure-tty code was added to telnetd, a dependency
on char *line was added to libtelnet. Put a dummy one in to keep the
linker happy.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76697 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-16 20:34:42 +00:00
nsayer
74034d9846 Make sure the protocol actively rejects bad data rather than
(potentially) not responding to an invalid SRA 'auth is' message.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76696 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-16 20:24:58 +00:00
nsayer
e7c0163dfe srandomdev() affords us the opportunity to radically improve, and at the
same time simplify, the random number selection code.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76691 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-16 18:32:46 +00:00
nsayer
0a0c02d634 Catch any attempted buffer overflows. The magic numbers in this code
(512) are a little distressing, but the method really needs to be
extended to allow server-supplied DH parameters anyway.

Submitted by:	kris


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76690 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-16 18:27:09 +00:00
nsayer
ebece97cb0 Catch malloc return failures. This should help avoid dereferencing NULL on
low-memory situations.

Submitted by:	kris


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76689 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-16 18:17:55 +00:00
peter
8e7393fb93 Hack to work around braindeath in libtelnet:sra.c. The sra.o file
references global variables from telnetd, but is also linked into
telnet as well. I was tempted to back out the last sra.c change
as it is 100% bogus and should be taken out and shot, but for now
this bandaid should get world working again. :-(


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76616 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-15 09:52:03 +00:00
nsayer
b482ad5b9e If the uid of the attempted authentication is 0 and if the pty is
insecure, do not succeed. Copied from login.c. This functionality really
should be a PAM module.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76610 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-15 04:47:14 +00:00
nsayer
4213319244 Pointy hat fix -- reapply the SRA PAM patch. To -current this time.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@76339 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-05-07 20:42:02 +00:00
ru
ff3aa86c66 mdoc(7) police: removed hard sentence breaks introduced in rev.1.10.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@75465 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-04-13 08:49:52 +00:00
nsayer
eca1a06f99 Clean up telnet's argument processing a bit. autologin and encryption is
now the default, so ignore the arguments that turn it on. Add a new -y
argument to turn off encryption in case someone wants to do that. Sync
these changes with the man page (including removing the now obsolete
statement about availability only in the US and Canada).


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@75263 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-04-06 15:56:10 +00:00
nsayer
785ba71778 Reactivate SRA.
Make handling of SIGINT and SIGQUIT follow SIGTSTP in TerminalNewMode().
This allows people to break out of SRA authentication if they wish to.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@75236 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-04-05 14:09:15 +00:00
nsayer
47180006ae Fix core noted in -stable with 'auth disable SRA'.
I just mistakenly commited this to RELENG_4. I have contacted Jordan to see
about how to fix this. Pass the pointy hat.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@74411 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-03-18 09:44:25 +00:00
assar
cd5df88636 enable auto-negotiation of encrypt and decrypt
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@74138 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-03-12 03:54:48 +00:00
asmodai
ed8b315538 Synch: Add $FreeBSD$.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@72139 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-02-07 21:58:16 +00:00
asmodai
46713b7ae5 Fix typo: compatability -> compatibility.
Compatability is not an existing english word.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@72093 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-02-06 12:05:58 +00:00
asmodai
47df13c3d8 Fix typo: seperate -> separate.
Seperate does not exist in the english language.

Submitted to look at by:	kris


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@72089 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-02-06 10:39:38 +00:00
asmodai
80f3e3bc78 Fix typo: wierd -> weird.
There is no such thing as wierd in the english language.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@72083 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-02-06 09:32:26 +00:00
ru
aea25d194d mdoc(7) police: split punctuation characters + misc fixes.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@71899 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-02-01 17:12:45 +00:00
ru
9e4c977b52 Prepare for mdoc(7)NG.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@70890 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2001-01-10 16:51:28 +00:00
assar
40b68302ee (scrub_env): change to only accept a listed set of variables,
including only non-filename contents for TERMCAP


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@69825 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-12-10 20:50:20 +00:00
asmodai
fe910aa69a Add more environment variables to be filtered through scrub_env().
Synched from normal telnet.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@69389 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-30 13:14:54 +00:00
asmodai
e84c612e39 String paranoia fix. Synched from normal telnet.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@69387 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-30 13:10:01 +00:00
asmodai
a352b628e8 String paranoia. Merged from regular telnet.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@69384 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-30 10:55:25 +00:00
kris
312e8003c1 Correct definition of MAXHOSTNAMELEN in ifdef'ed code.
Submitted by:	Edwin Groothuis <mavetju@chello.nl>
PR:		bin/22787


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@69223 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-26 21:37:51 +00:00
ru
eec40d7c66 mdoc(7) police: use the new features of the Nm macro.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@68965 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-20 20:10:44 +00:00
kris
53049b911e Fix a buffer overflow from a long local hostname.
Obtained from:	OpenBSD


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@68891 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-19 10:08:26 +00:00
ru
0ee5242ab6 Avoid use of direct troff requests in mdoc(7) manual pages.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@68575 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-11-10 17:46:15 +00:00
kris
2ffcc09501 Sync with usr.bin/telnet/telnet.c r1.9 - fix buffer overflow in DISPLAY
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@67827 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-10-29 00:10:14 +00:00
ume
a2af2980e2 Fix buffer size of ALIGNed buffer.
PR:		bin/20053
Submitted by:	Alex Kapranoff <alex@kapran.bitmcnit.bryansk.su>


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@63662 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-20 14:54:04 +00:00
peter
4bd1ed896a Forced commit. This is to try and help folks that used the international
crypto repo and have slightly different files but with the same version.
cvsup in 'checkout mode' has no trouble with this, but cvs can get really
silly about it.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@63249 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-16 05:53:14 +00:00
peter
1448d0f1e3 Add missing $FreeBSD$ to files that are NOT still on vendor a branch.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@63248 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-16 05:48:49 +00:00
nsayer
794e8e7295 Fix 'telnet -X sra' coredump
PR# 19835


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@62958 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-11 15:04:05 +00:00
kris
a19c3ab413 Don't call printf with no format string.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@62868 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-10 05:16:59 +00:00
ume
7b1c9dcfd4 Make telnet -s work. It is corresponding to EAI_NONAME -> EAI_NODATA
change (getaddrinfo.c rev 1.12).


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@62805 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-08 05:22:00 +00:00
itojun
79d0212f03 sync with usr.bin/telnet/commands.c 1.21 -> 1.22. pierre.dampure@alveley.org
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@62773 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-07-07 12:35:05 +00:00
shin
5137153b86 CMSG_XXX macros alignment fixes to follow RFC2292.
Approved by: jkh


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57724 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-03-03 12:50:46 +00:00
markm
2d4e3ed569 Get crypto from libcrypto, not libdes.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57442 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-24 19:28:31 +00:00
markm
811772a718 Freefall/Internat diff reducer.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57414 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-24 10:37:29 +00:00
shin
737e54e224 Use static buffer to save source route hostnames.
Approved by: jkh


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57343 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-19 16:33:14 +00:00
shin
62286e5a31 Print "Trying ..." for each host. Also cleanups for error printing.
Approved by: jkh

Submitted by: Ben Smithurst <ben@scientia.demon.co.uk>


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57342 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-19 16:17:41 +00:00
shin
c750243830 Fix bugs in telnet.
Sorry there were still several bugs.
   -error retry at af missmatch was incomplete.
   -af matching for source addr option was wrong
   -socket was not freed at retry.

Approved by: jkh


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57233 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-15 15:59:12 +00:00
shin
d2ec198a69 Add more dual stack consideration.
-Should retry as much as possible when some of source
     routing intermediate hosts' address families missmatch
     happened.
     (such as when a host has only A record, and another host
     has each of A and AAAA record.)

    -Should retry as much as possible when dest addr and
     source addr(specified with -s option) address family
     missmatch happend

Approved by: jkh


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57125 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-10 20:06:36 +00:00
shin
92a0e6dadf Fix telnet core dump at invalid service name specified.
Added an error check to avoid it.

Approved by: jkh

Submitted by: Robert Muir <rmuir@gibralter.net>


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@57016 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-02-07 00:52:49 +00:00
shin
845ce56d7b Add NI_NAMEREQD flag to getnameinfo() call. Without this flag,
getnameinfo() don't return error at name resolving failure.
But it is used at doaddrlookup(-N) case in telnet, error need to be
returned to correctly initialize hostname buffer.

Discovered at checking recent KAME repository change, noticed by itojun.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@56870 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-01-29 18:21:05 +00:00
shin
32ca7e751c 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


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@56668 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
2000-01-27 09:28:38 +00:00
markm
afe31edad1 Termcap header no longer needed.
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@50759 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
1999-09-01 18:57:38 +00:00
peter
1e75920e30 $Id$ -> $FreeBSD$
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@50479 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
1999-08-28 01:35:59 +00:00
nsayer
95b971e484 According to Mark Murray, Makefiles do not belong here. I guess we're
going to have to figure something else out.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@49901 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
1999-08-16 18:59:05 +00:00
nsayer
0f2c0f75fe Add SRA authentication to src/crypto/telnet.
SRA does a Diffie-Hellmen exchange and then DES-encrypts the
authentication data. If the authentication is successful, it also
sets up a session key for DES encryption.

SRA was originally developed at Texas A&M University.

This code is probably export restricted (despite the fact that I
originally found it at a University in Germany).

SRA is not perfect. It is vulnerable to monkey-in-the-middle attacks
and does not use tremendously large DH constants (and thus an individual
exchange probably could be factored in a few days on modern CPU
horsepower). It does not, however, require any changes in user or
administrative behavior and foils session hijacking and sniffing.
The goal of this commit is that telnet and telnetd end up in the DES
distribution and that therefore an encrypted session telnet becomes
standard issue for FreeBSD.


git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@49887 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
1999-08-16 11:24:29 +00:00
nsayer
1549f66b7a Fix int function without return (make consistent with neighbors)
git-svn-id: http://svn0.us-east.freebsd.org/base/head/contrib/telnet@49861 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
1999-08-16 02:15:29 +00:00