Commit Graph

610 Commits

Author SHA1 Message Date
simon
b7d9591fbc Add a missing word.
Submitted by:	Michel Lavondes <fox@vader.aacc.cc.md.us>
Reviewed by:	des
MFC after:	1 week
2003-10-31 21:49:47 +00:00
des
3923b41f86 Plug a memory leak in the PAM child process. It is of no great consequence
as the process is short-lived, and the leak occurs very rarely and always
shortly before the process terminates.

MFC after:	3 days
2003-10-23 08:27:16 +00:00
nectar
a46af1645f This commit was generated by cvs2svn to compensate for changes in r120952,
which included commits to RCS files with non-trunk default branches.
2003-10-09 19:52:14 +00:00
nectar
084fdb0d6e Correct badly-formed code (missing quote) within `#if 0' section.
Newer versions of GCC error in such situations.

Obtained from:	Heimdal CVS
2003-10-09 19:52:14 +00:00
nectar
2f222c3131 Resolve conflicts after import of Heimdal 0.6. 2003-10-09 19:42:07 +00:00
nectar
5c90662d44 Vendor import of Heimdal 0.6. 2003-10-09 19:36:20 +00:00
nectar
1c67c644c4 This commit was generated by cvs2svn to compensate for changes in r120945,
which included commits to RCS files with non-trunk default branches.
2003-10-09 19:36:20 +00:00
nectar
a76c26c085 Add list of files to remove from the Heimdal distribution prior to
each import.
2003-10-09 19:35:38 +00:00
nectar
015688fd67 Remove files no longer included with OpenSSL as of version 0.9.7c. 2003-10-01 12:38:27 +00:00
nectar
ad1921a20b Merge conflicts after import of OpenSSL 0.9.7c. 2003-10-01 12:37:51 +00:00
nectar
da0f601d97 This commit was generated by cvs2svn to compensate for changes in r120631,
which included commits to RCS files with non-trunk default branches.
2003-10-01 12:32:41 +00:00
nectar
4f122b83e1 Vendor import of OpenSSL 0.9.7c 2003-10-01 12:32:41 +00:00
nectar
d7611ec4f1 Update list of files to remove prior to import of OpenSSL 0.9.7c. 2003-10-01 12:21:16 +00:00
joe
4a845b54a3 This commit was generated by cvs2svn to compensate for changes in r120489,
which included commits to RCS files with non-trunk default branches.
2003-09-26 19:15:53 +00:00
joe
68edeb8e7b Additional corrections to OpenSSH buffer handling.
Obtained from:  openssh.org
Originally committed to head by: nectar
2003-09-26 19:15:53 +00:00
joe
82f014b618 Additional corrections to OpenSSH buffer handling.
Obtained from:  openssh.org
Originally committed to head by: nectar
2003-09-26 19:15:53 +00:00
des
2b87cb04cd Update version string. 2003-09-24 19:20:23 +00:00
des
74a9204596 Remove bogus calls to xfree(). 2003-09-24 19:11:52 +00:00
des
670b64ec90 resp is a pointer to an array of structs, not an array of pointers to structs. 2003-09-24 18:26:29 +00:00
des
0d8247cd78 Return the correct error value when a null query fails. 2003-09-24 18:24:27 +00:00
des
0743e1344a Fix broken shell code. 2003-09-19 11:29:51 +00:00
nectar
c5a54e5144 Correct more cases of allocation size bookkeeping being updated before
calling functions which can potentially fail and cause cleanups to be
invoked.

Submitted by:	Solar Designer <solar@openwall.com>
2003-09-17 14:36:14 +00:00
nectar
1d6e864121 This commit was generated by cvs2svn to compensate for changes in r120161,
which included commits to RCS files with non-trunk default branches.
2003-09-17 14:36:14 +00:00
nectar
617434894b Correct more cases of allocation size bookkeeping being updated before
calling functions which can potentially fail and cause cleanups to be
invoked.

Submitted by:	Solar Designer <solar@openwall.com>
2003-09-17 14:36:14 +00:00
nectar
d29af097fc Update the OpenSSH addendum string for the buffer handling fix. 2003-09-16 14:33:04 +00:00
nectar
63e7256c72 Do not record expanded size before attempting to reallocate associated
memory.

Obtained from:	OpenBSD
2003-09-16 06:11:58 +00:00
nectar
0e1ba1fbe9 This commit was generated by cvs2svn to compensate for changes in r120113,
which included commits to RCS files with non-trunk default branches.
2003-09-16 06:11:58 +00:00
markm
ccc6829966 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.
2003-07-16 20:59:15 +00:00
des
29ea10eb5f Add a "return" that was missing from 3.6.1p1. Since it's been fixed in
the OpenSSH-portable CVS repo, I'm committing this on the vendor branch.
2003-06-24 19:30:44 +00:00
des
682a77c7a9 This commit was generated by cvs2svn to compensate for changes in r116791,
which included commits to RCS files with non-trunk default branches.
2003-06-24 19:30:44 +00:00
des
319dbfe478 Fix off-by-one and initialization errors which prevented sshd from
restarting when sent a SIGHUP.

Submitted by:	tegge
Approved by:	re (jhb)
2003-05-28 19:39:33 +00:00
des
043db56692 Revert unnecessary part of previous commit. 2003-05-13 10:18:49 +00:00
des
2d6c62f7ee Rename a few functions to avoid stealing common words (error, log, debug
etc.) from the application namespace for programs that use pam_ssh(8).
Use #defines to avoid changing the actual source code.

Approved by:	re (rwatson)
2003-05-12 19:22:47 +00:00
markm
ef42b09323 Fix up external variables named "debug" that have a horrible habit
of conflicting with other, similarly named functions in static
libraries. This is done mostly by renaming the var if it is shared
amongst modules, or making it static otherwise.

OK'ed by:	re(scottl)
2003-05-11 18:17:00 +00:00
obrien
3ef0919ed5 Use __FBSDID vs. rcsid[]. Also protect sccs[] and copyright[] from GCC 3.3. 2003-05-04 02:54:49 +00:00
des
ec7787cf1f Remove RCSID from files which have no other diffs to the vendor branch. 2003-05-01 15:05:43 +00:00
des
5231ceca18 Nit. 2003-04-23 17:23:06 +00:00
des
9d7630cace Improvements to the proposed shell code. 2003-04-23 17:21:55 +00:00
des
09308d6d24 Regenerate. 2003-04-23 17:21:27 +00:00
des
00b19a310e Resolve conflicts. 2003-04-23 17:13:13 +00:00
des
2eea5bd2a6 Vendor import of OpenSSH-portable 3.6.1p1. 2003-04-23 16:53:02 +00:00
des
0f28c5b657 This commit was generated by cvs2svn to compensate for changes in r113908,
which included commits to RCS files with non-trunk default branches.
2003-04-23 16:53:02 +00:00
des
6391ac5ac4 - when using a child process instead of a thread, change the child's
name to reflect its role
- try to handle expired passwords a little better

MFC after:	1 week
2003-03-31 13:48:18 +00:00
des
3233ad0bb4 If an ssh1 client initiated challenge-response authentication but did
not respond to challenge, and later successfully authenticated itself
using another method, the kbdint context would never be released,
leaving the PAM child process behind even after the connection ended.

Fix this by automatically releasing the kbdint context if a packet of
type SSH_CMSG_AUTH_TIS is follwed by anything but a packet of type
SSH_CMSG_AUTH_TIS_RESPONSE.

MFC after:	1 week
2003-03-31 13:45:36 +00:00
jedgar
a97ce38623 Merge conflicts 2003-03-20 20:56:03 +00:00
jedgar
bfe283019e Enable RSA blinding by default.
http://www.openssl.org/news/secadv_20030317.txt
2003-03-20 20:44:11 +00:00
jedgar
5f167eaca9 This commit was generated by cvs2svn to compensate for changes in r112439,
which included commits to RCS files with non-trunk default branches.
2003-03-20 20:41:45 +00:00
jedgar
c33a2c37af Import of PKCS #1 security fix.
http://www.openssl.org/news/secadv_20030319.txt
2003-03-20 20:41:45 +00:00
markm
64f109333b KerberosIV deorbit sequence: Re-entry. Thank you, faithful friend.
Enjoy your retirement in ports.
2003-03-08 12:55:48 +00:00
nectar
825dcf2de4 Unbreak Kerberos 5 authentication in telnet.
(Credential forwarding is still broken.)

PR:	bin/45397
2003-03-06 13:41:53 +00:00