Jacques Vidrine
6be8ae0724
Vendor import of OpenSSL 0.9.7e.
2005-02-25 05:39:05 +00:00
Jacques Vidrine
eb8fd19957
This commit was generated by cvs2svn to compensate for changes in r142425,
...
which included commits to RCS files with non-trunk default branches.
2005-02-25 05:39:05 +00:00
Jacques Vidrine
3e9d9cface
Update list of files to remove prior to import of OpenSSL 0.9.7e.
2005-02-25 05:31:23 +00:00
Jacques Vidrine
01c0bb1d8a
Clean up the OpenSSL vendor branch by removing files that are not
...
part of recent releases.
2005-02-25 05:25:37 +00:00
Jacques Vidrine
c7a8adabfb
This commit was generated by cvs2svn to compensate for changes in r142421,
...
which included commits to RCS files with non-trunk default branches.
2005-02-25 05:25:37 +00:00
Jacques Vidrine
8d4ba808a5
Vendor import of Heimdal 0.6.3.
2005-02-24 22:22:53 +00:00
Jacques Vidrine
f65ab5f283
This commit was generated by cvs2svn to compensate for changes in r142403,
...
which included commits to RCS files with non-trunk default branches.
2005-02-24 22:22:53 +00:00
Jacques Vidrine
d526eb91a6
Do not include lib/kdfs in future imports.
2005-02-24 22:17:13 +00:00
Jacques Vidrine
e30f8e817e
Remove lib/kdfs from vendor branch: we do not build it, and it will not
...
be included in future imports.
2005-02-24 22:16:35 +00:00
Jacques Vidrine
a43dbe2565
Clean up the Heimdal vendor branch by removing files not included in
...
any import for several years.
If memory serves, this was
Suggested by: ru
an awfully long time ago-- sorry for the delay!
2005-02-24 22:14:04 +00:00
Dag-Erling Smørgrav
d49dad04cb
Better Xlist command line.
2004-10-28 16:13:28 +00:00
Dag-Erling Smørgrav
21e764df0c
Resolve conflicts
2004-10-28 16:11:31 +00:00
Dag-Erling Smørgrav
d74d50a84b
Vendor import of OpenSSH 3.9p1.
2004-10-28 16:03:53 +00:00
Dag-Erling Smørgrav
3b4228da23
This commit was generated by cvs2svn to compensate for changes in r137015,
...
which included commits to RCS files with non-trunk default branches.
2004-10-28 16:03:53 +00:00
Dag-Erling Smørgrav
39b9ae0d72
These are unnecessary and have been causing imp@ trouble.
2004-10-27 19:07:36 +00:00
Mark Murray
1f9bb6cd25
Add support for C3 Nehemiah ACE ("Padlock") AES crypto. This comes
...
from OpenSSL 0.9.5 (yet to be released), and is pretty complete.
2004-08-14 13:38:35 +00:00
Mark Murray
eaeb68fe23
Bring in support for VIA C3 Nehemiah Padlock crypto support (AES).
...
This is from the upcoming OpenSSL 0.9.8 release.
2004-08-13 19:37:23 +00:00
Mark Murray
19ef43daef
This commit was generated by cvs2svn to compensate for changes in r133665,
...
which included commits to RCS files with non-trunk default branches.
2004-08-13 19:37:23 +00:00
Dag-Erling Smørgrav
3c8487013c
Regenerate.
2004-04-20 09:49:37 +00:00
Dag-Erling Smørgrav
cfa59440c5
One more conflict.
2004-04-20 09:47:13 +00:00
Dag-Erling Smørgrav
5962c0e9a3
Resolve conflicts.
2004-04-20 09:46:41 +00:00
Dag-Erling Smørgrav
562de5d9f6
Adjust version number and addendum.
2004-04-20 09:37:29 +00:00
Dag-Erling Smørgrav
52028650db
Vendor import of OpenSSH 3.8.1p1.
2004-04-20 09:35:04 +00:00
Dag-Erling Smørgrav
b247dbc706
This commit was generated by cvs2svn to compensate for changes in r128456,
...
which included commits to RCS files with non-trunk default branches.
2004-04-20 09:35:04 +00:00
Jacques Vidrine
fe2b6e6689
Repair a regression in OpenSSL 0.9.7d: processing an unsigned PKCS#7
...
object could cause a null pointer dereference.
Obtained from: OpenSSL CVS (change number 12080)
MFC After: 1 day
Reported by: Daniel Lang <dl@leo.org>
2004-04-05 19:01:57 +00:00
Jacques Vidrine
4fd8395954
This commit was generated by cvs2svn to compensate for changes in r127904,
...
which included commits to RCS files with non-trunk default branches.
2004-04-05 19:01:57 +00:00
Jacques Vidrine
a0c37ec326
Resolve conflicts after import of Heimdal 0.6.1.
2004-04-03 21:31:10 +00:00
Jacques Vidrine
1c43270ada
Vendor import of Heimdal 0.6.1.
2004-04-03 21:22:55 +00:00
Jacques Vidrine
090bc474c9
This commit was generated by cvs2svn to compensate for changes in r127808,
...
which included commits to RCS files with non-trunk default branches.
2004-04-03 21:22:55 +00:00
Jacques Vidrine
902aa2e784
Resolve conflicts after import of OpenSSL 0.9.7d.
2004-03-17 17:44:39 +00:00
Jacques Vidrine
ced566fd0b
Vendor import of OpenSSL 0.9.7d.
2004-03-17 15:49:33 +00:00
Jacques Vidrine
8f1200ff6f
This commit was generated by cvs2svn to compensate for changes in r127128,
...
which included commits to RCS files with non-trunk default branches.
2004-03-17 15:49:33 +00:00
Jacques Vidrine
81ac585294
Correct a denial-of-service vulnerability in OpenSSL (CAN-2004-0079).
...
Obtained from: OpenSSL CVS (http://cvs.openssl.org/chngview?cn=12033 )
2004-03-17 12:11:08 +00:00
Jacques Vidrine
1612471010
This commit was generated by cvs2svn to compensate for changes in r127114,
...
which included commits to RCS files with non-trunk default branches.
2004-03-17 12:11:08 +00:00
Dag-Erling Smørgrav
d2b1b4f3c5
Correctly document the default value of UsePAM.
2004-03-15 18:38:29 +00:00
Dag-Erling Smørgrav
eea81d70c9
Update VersionAddendum in config files and man pages.
2004-02-26 11:54:03 +00:00
Dag-Erling Smørgrav
98e0062102
Define HAVE_GSSAPI_H.
2004-02-26 11:06:29 +00:00
Dag-Erling Smørgrav
7dbb68c469
Regenerate.
2004-02-26 10:57:38 +00:00
Dag-Erling Smørgrav
3ee07a3a90
Document recently changed configuration defaults.
2004-02-26 10:57:28 +00:00
Dag-Erling Smørgrav
1ec0d75429
Resolve conflicts.
2004-02-26 10:52:33 +00:00
Dag-Erling Smørgrav
efcad6b72f
Vendor import of OpenSSH 3.8p1.
2004-02-26 10:38:49 +00:00
Dag-Erling Smørgrav
6b475b41d8
This commit was generated by cvs2svn to compensate for changes in r126274,
...
which included commits to RCS files with non-trunk default branches.
2004-02-26 10:38:49 +00:00
Dag-Erling Smørgrav
476cd3b2f0
Merge OpenSSH 3.8p1.
2004-02-26 10:38:38 +00:00
Dag-Erling Smørgrav
3aedec2adb
Prepare for upcoming 3.8p1 import.
2004-02-26 10:37:34 +00:00
Dag-Erling Smørgrav
028c324ac8
Pull asbesthos underpants on and disable protocol version 1 by default.
2004-02-26 10:24:07 +00:00
Dag-Erling Smørgrav
b909c84bf2
Turn non-PAM password authentication off by default when USE_PAM is
...
defined. Too many users are getting bitten by it.
2004-02-19 15:53:31 +00:00
Dag-Erling Smørgrav
c880b0438e
Update the "overview of FreeBSD changes to OpenSSH-portable" to reflect
...
reality.
2004-01-25 13:09:56 +00:00
Dag-Erling Smørgrav
8d71fed0f2
Work around removal of EAI_NODATA from netdb.h.
2004-01-18 22:31:30 +00:00
Jacques Vidrine
ede6693b54
Re-add the FreeBSD RCS keyword for the benefit of mergemaster.
...
PR: conf/50040
Requested by: Dimitry Andric <dim@xs4all.nl>
2004-01-09 14:46:11 +00:00
Dag-Erling Smørgrav
002696701b
Don't output the terminating '\0' (already fixed in OpenSSH CVS)
2004-01-09 12:57:36 +00:00
Dag-Erling Smørgrav
2735d723cb
This commit was generated by cvs2svn to compensate for changes in r124287,
...
which included commits to RCS files with non-trunk default branches.
2004-01-09 12:57:36 +00:00
Dag-Erling Smørgrav
f0477b2653
Egg on my face: UsePAM was off by default.
...
Pointed out by: Sean McNeil <sean@mcneil.com>
2004-01-09 08:07:12 +00:00
Dag-Erling Smørgrav
a5ac46fb04
Regenerate config.h; I don't know why this didn't hit CVS yesterday.
2004-01-08 09:42:35 +00:00
Dag-Erling Smørgrav
8cf8104b8f
Remove obsolete files on the vendor branch.
2004-01-08 09:33:46 +00:00
Dag-Erling Smørgrav
e2fb0b2a6b
Update to reflect changes since the last version.
2004-01-07 11:51:18 +00:00
Dag-Erling Smørgrav
cf2b5f3b6d
Resolve conflicts and remove obsolete files.
...
Sponsored by: registrar.no
2004-01-07 11:16:27 +00:00
Dag-Erling Smørgrav
d95e11bf7e
Vendor import of OpenSSH 3.7.1p2.
2004-01-07 11:10:17 +00:00
Dag-Erling Smørgrav
fb7dd0a77c
This commit was generated by cvs2svn to compensate for changes in r124208,
...
which included commits to RCS files with non-trunk default branches.
2004-01-07 11:10:17 +00:00
Dag-Erling Smørgrav
221552e490
Merge OpenSSH 3.7.1p2.
2004-01-07 11:10:02 +00:00
Simon L. B. Nielsen
b0a159ccab
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
Dag-Erling Smørgrav
522a040d24
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
Jacques Vidrine
855f569304
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
Jacques Vidrine
8fc52f5387
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
Jacques Vidrine
2d4851347d
Resolve conflicts after import of Heimdal 0.6.
2003-10-09 19:42:07 +00:00
Jacques Vidrine
bbd80c285e
Vendor import of Heimdal 0.6.
2003-10-09 19:36:20 +00:00
Jacques Vidrine
83dff030ab
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
Jacques Vidrine
6b1b07dfa1
Add list of files to remove from the Heimdal distribution prior to
...
each import.
2003-10-09 19:35:38 +00:00
Jacques Vidrine
52033a8dc8
Remove files no longer included with OpenSSL as of version 0.9.7c.
2003-10-01 12:38:27 +00:00
Jacques Vidrine
5fad2af4e3
Merge conflicts after import of OpenSSL 0.9.7c.
2003-10-01 12:37:51 +00:00
Jacques Vidrine
50ef009353
Vendor import of OpenSSL 0.9.7c
2003-10-01 12:32:41 +00:00
Jacques Vidrine
8ae0780c3a
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
Jacques Vidrine
402cb58a40
Update list of files to remove prior to import of OpenSSL 0.9.7c.
2003-10-01 12:21:16 +00:00
Josef Karthauser
dcf5581978
Additional corrections to OpenSSH buffer handling.
...
Obtained from: openssh.org
Originally committed to head by: nectar
2003-09-26 19:15:53 +00:00
Josef Karthauser
a7e41a41f9
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
Josef Karthauser
3533e7e58a
Additional corrections to OpenSSH buffer handling.
...
Obtained from: openssh.org
Originally committed to head by: nectar
2003-09-26 19:15:53 +00:00
Dag-Erling Smørgrav
44172b702c
Update version string.
2003-09-24 19:20:23 +00:00
Dag-Erling Smørgrav
b584000fa2
Remove bogus calls to xfree().
2003-09-24 19:11:52 +00:00
Dag-Erling Smørgrav
8cc2c63b43
resp is a pointer to an array of structs, not an array of pointers to structs.
2003-09-24 18:26:29 +00:00
Dag-Erling Smørgrav
7961e48467
Return the correct error value when a null query fails.
2003-09-24 18:24:27 +00:00
Dag-Erling Smørgrav
da26b3794a
Fix broken shell code.
2003-09-19 11:29:51 +00:00
Jacques Vidrine
454412956c
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
Jacques Vidrine
78ad1843d4
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
Jacques Vidrine
b69cd7f2b0
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
Jacques Vidrine
979af4e167
Update the OpenSSH addendum string for the buffer handling fix.
2003-09-16 14:33:04 +00:00
Jacques Vidrine
8947bcb756
Do not record expanded size before attempting to reallocate associated
...
memory.
Obtained from: OpenBSD
2003-09-16 06:11:58 +00:00
Jacques Vidrine
9267dca39a
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
Mark Murray
4afa371832
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
Dag-Erling Smørgrav
af8524a91e
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
Dag-Erling Smørgrav
07e57fee7d
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
Dag-Erling Smørgrav
da05574c54
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
Dag-Erling Smørgrav
fbafac351f
Revert unnecessary part of previous commit.
2003-05-13 10:18:49 +00:00
Dag-Erling Smørgrav
57f64f4e2f
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
Mark Murray
074e8e8ee9
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
David E. O'Brien
77b7cdf199
Use __FBSDID vs. rcsid[]. Also protect sccs[] and copyright[] from GCC 3.3.
2003-05-04 02:54:49 +00:00
Dag-Erling Smørgrav
d12c7b01da
Remove RCSID from files which have no other diffs to the vendor branch.
2003-05-01 15:05:43 +00:00
Dag-Erling Smørgrav
2d61bc6706
Nit.
2003-04-23 17:23:06 +00:00
Dag-Erling Smørgrav
ae48cf5798
Improvements to the proposed shell code.
2003-04-23 17:21:55 +00:00
Dag-Erling Smørgrav
07a3a2906c
Regenerate.
2003-04-23 17:21:27 +00:00
Dag-Erling Smørgrav
e73e9afa91
Resolve conflicts.
2003-04-23 17:13:13 +00:00
Dag-Erling Smørgrav
d0c8c0bcc2
Vendor import of OpenSSH-portable 3.6.1p1.
2003-04-23 16:53:02 +00:00
Dag-Erling Smørgrav
486cd0043e
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
Dag-Erling Smørgrav
7a94787140
- 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
Dag-Erling Smørgrav
fc0824d97d
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
Chris D. Faulhaber
a6b47b5f08
Merge conflicts
2003-03-20 20:56:03 +00:00
Chris D. Faulhaber
5b877a2d56
Enable RSA blinding by default.
...
http://www.openssl.org/news/secadv_20030317.txt
2003-03-20 20:44:11 +00:00
Chris D. Faulhaber
35f304853f
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
Chris D. Faulhaber
8786792504
Import of PKCS #1 security fix.
...
http://www.openssl.org/news/secadv_20030319.txt
2003-03-20 20:41:45 +00:00
Mark Murray
4d20ef3ca0
KerberosIV deorbit sequence: Re-entry. Thank you, faithful friend.
...
Enjoy your retirement in ports.
2003-03-08 12:55:48 +00:00
Jacques Vidrine
81d1ffee08
Unbreak Kerberos 5 authentication in telnet.
...
(Credential forwarding is still broken.)
PR: bin/45397
2003-03-06 13:41:53 +00:00
Jacques Vidrine
def0b8c9c5
Resolve conflicts after import of OpenSSL 0.9.7a.
2003-02-19 23:24:16 +00:00
Jacques Vidrine
fceca8a377
Vendor import of OpenSSL 0.9.7a.
2003-02-19 23:17:42 +00:00
Jacques Vidrine
015ec3c905
This commit was generated by cvs2svn to compensate for changes in r111147,
...
which included commits to RCS files with non-trunk default branches.
2003-02-19 23:17:42 +00:00
Dag-Erling Smørgrav
b7f9a9adc7
Paranoia: instead of a NULL conversation function, use one that always
...
returns PAM_CONV_ERR; moreover, make sure we always have the right
conversation function installed before calling PAM service functions.
Also unwrap some not-so-long lines.
MFC after: 3 days
2003-02-16 11:03:55 +00:00
Jacques Vidrine
d1e792e94a
When `des_read_pw_string' is a macro, as in OpenSSL 0.9.7,
...
an attempt to declare a prototype for it will croak.
2003-02-14 14:37:26 +00:00
Dag-Erling Smørgrav
9794bba8a8
document the current default value for VersionAddendum.
2003-02-11 12:11:15 +00:00
Dag-Erling Smørgrav
1e731869b2
Set the ruid to the euid at startup as a workaround for a bug in pam_ssh.
...
MFC after: 3 days
2003-02-07 15:48:27 +00:00
Tom Rhodes
fb256a4a54
The manual page lists only 2 files, however it reads as `three files' which is
...
obviously incorrect.
PR: 46841
Submitted by: Sakamoto Seiji <s-siji@hyper.ocn.ne.jp>
2003-02-05 02:14:03 +00:00
Dag-Erling Smørgrav
2adf4e49c2
Linux-PAM's pam_start(3) fails with a bogus error message if passed the
...
pam_conv argument is NULL. OpenPAM doesn't care, but to make things
easier for people porting this code to other systems (or -STABLE), use
a dummy struct pam_conv instead of NULL.
Pointed out by: Damien Miller <djm@mindrot.org>
2003-02-03 14:10:28 +00:00
Dag-Erling Smørgrav
b946f5e1ff
Bump patch date to 2003-02-01 (the day after I fixed PAM authentication
...
for ssh1)
2003-02-03 11:11:36 +00:00
Dag-Erling Smørgrav
07fd326c9c
Fix keyboard-interactive authentication for ssh1. The problem was twofold:
...
- The PAM kbdint device sometimes doesn't know authentication succeeded
until you re-query it. The ssh1 kbdint code would never re-query the
device, so authentication would always fail. This patch has been
submitted to the OpenSSH developers.
- The monitor code for PAM sometimes forgot to tell the monitor that
authentication had succeeded. This caused the monitor to veto the
privsep child's decision to allow the connection.
These patches have been tested with OpenSSH clients on -STABLE, NetBSD and
Linux, and with ssh.com's ssh1 on Solaris.
Sponsored by: DARPA, NAI Labs
2003-01-31 11:08:07 +00:00
Jacques Vidrine
4b2eaea43f
Background:
...
When libdes was replaced with OpenSSL's libcrypto, there were a few
interfaces that the former implemented but the latter did not. Because
some software in the base system still depended upon these interfaces,
we simply included them in our libcrypto (rnd_keys.c).
Now, finally get around to removing the dependencies on these
interfaces. There were basically two cases:
des_new_random_key -- This is just a wrapper for des_random_key, and
these calls were replaced.
des_init_random_number_generator et. al. -- A few functions were used
by the application to seed libdes's PRNG. These are not necessary
when using libcrypto, as OpenSSL internally seeds the PRNG from
/dev/random. These calls were simply removed.
Again, some of the Kerberos 4 files have been taken off the vendor
branch. I do not expect there to be future imports of KTH Kerberos 4.
2003-01-29 18:14:29 +00:00
Jacques Vidrine
6e955c8f09
= Fix a bug in UI_UTIL_read_pw's error handling that caused
...
des_read_pw_string to break (and thus rather mysteriously
breaking utilities such as kinit).
= Enable the BSD /dev/crypto interface.
(These changes are being imported on the vendor branch, as they have
already been accepted and committed to the OpenSSL CVS repository.)
2003-01-29 02:25:30 +00:00
Jacques Vidrine
912e44b663
This commit was generated by cvs2svn to compensate for changes in r110018,
...
which included commits to RCS files with non-trunk default branches.
2003-01-29 02:25:30 +00:00
Mark Murray
bff3688511
Merge conflicts.
...
This is cunning doublespeak for "use vendor code".
2003-01-28 22:34:21 +00:00
Mark Murray
f1b2c95128
Remove files no longer on OpenSSL 0.9.7. crypto/des/rnd_keys.c is
...
retained as it is still used.
2003-01-28 22:12:30 +00:00
Mark Murray
5c87c606cd
Vendor import of OpenSSL release 0.9.7. This release includes
...
support for AES and OpenBSD's hardware crypto.
2003-01-28 21:43:22 +00:00
Mark Murray
5bd38a39ed
This commit was generated by cvs2svn to compensate for changes in r109998,
...
which included commits to RCS files with non-trunk default branches.
2003-01-28 21:43:22 +00:00
Jacques Vidrine
5bce7286b4
Make the Kerberos 4 bits build against OpenSSL 0.9.7. This required
...
two basic changes (both of which should be no-ops until OpenSSL 0.9.7
is imported):
= Define OPENSSL_DES_LIBDES_COMPATIBILITY wherever we include
openssl/des.h.
= Spell `struct des_ks_struct []' using the existing
`des_key_schedule' typedef.
When OpenSSL 0.9.7 is imported, `des_key_schedule' (among other
things) will be a macro invocation instead of a typedef, and things
should `just work'.
Yes, this commit does take several files off the vendor branch.
I do not expect there to be future imports of KTH Kerberos 4.
2003-01-28 20:18:26 +00:00
Dag-Erling Smørgrav
84860c33f0
Force early initialization of the resolver library, since the resolver
...
configuration files will no longer be available once sshd is chrooted.
PR: 39953, 40894
Submitted by: dinoex
MFC after: 3 days
2003-01-22 14:12:59 +00:00
Jacques Vidrine
4f62b1068d
Add a missing include, needed to get a prototype for `des_read_pw_string'.
...
This is particularly important for OpenSSL 0.9.7, as `des_read_pw_string'
is a macro there. (This fix brought in on the vendor branch, because I
already committed it to Heimdal's CVS.)
2003-01-21 14:19:06 +00:00
Jacques Vidrine
87fd161364
This commit was generated by cvs2svn to compensate for changes in r109641,
...
which included commits to RCS files with non-trunk default branches.
2003-01-21 14:19:06 +00:00
Bill Fumerola
a3bb66de04
add more RFC defined telnet options
...
Reviewed by: ps
2003-01-18 06:10:21 +00:00
Dag-Erling Smørgrav
d46e273b14
The previous commit contained a stupid mistake: ctxt->pam_[cp]sock was
...
initialized after the call to pthread_create() instead of before. It just
happened to work with threads enabled because ctxt is shared, but of
course it doesn't work when we use a child process instead of threads.
2002-12-21 15:09:58 +00:00
Dag-Erling Smørgrav
d953f52834
If possible, use pthreads instead of a child process for PAM.
...
Reimplement the necessary bits from auth_pam.c and auth2_pam.c so that
they share the PAM context used by the keyboard-interactive thread. If
a child process is used instead, they will (necessarily) use a separate
context.
Constify do_pam_account() and do_pam_session().
Sponsored by: DARPA, NAI Labs
2002-12-14 13:52:39 +00:00
Dag-Erling Smørgrav
9be00009ed
Add a missing #include "canohost.h".
2002-12-14 13:48:47 +00:00
Dag-Erling Smørgrav
bdb8839451
Remove code related to the PAMAuthenticationViaKbdInt option (which we've
...
disabled). This removes the only reference to auth2_pam().
2002-12-14 13:48:13 +00:00
Dag-Erling Smørgrav
3600b2f406
Back out a lastlog-related change which is no longer relevant.
2002-12-14 13:40:21 +00:00
Dag-Erling Smørgrav
b6fd52a01d
Fix a rounding error in the block size calculation.
...
Submitted by: tjr
2002-12-14 13:38:49 +00:00
Dag-Erling Smørgrav
5d93b6af54
Since OpenSSH drops privileges before calling pam_open_session(3),
...
pam_lastlog(8) can't possibly work, so let OpenSSH handle lastlog.
Approved by: re (rwatson)
2002-12-03 15:48:11 +00:00
Eric Melville
0d16d02150
Merge argument parsing changes into this copy of telnet.
...
Submitted by: markm
Approved by: bmah
2002-11-27 06:34:24 +00:00
Jacques Vidrine
5bda878e3e
Import of Heimdal 0.5.1.
...
Approved by: re
2002-11-24 20:59:25 +00:00
Jacques Vidrine
1036289598
This commit was generated by cvs2svn to compensate for changes in r107207,
...
which included commits to RCS files with non-trunk default branches.
2002-11-24 20:59:25 +00:00
Dag-Erling Smørgrav
810a15b120
Add caveats regarding the effect of PAM on PasswordAuthentication and
...
PermitRootLogin.
PR: docs/43776
MFC after: 1 week
2002-11-06 08:04:56 +00:00
Dag-Erling Smørgrav
dc04779010
Document the current default for VersionAddendum.
2002-11-05 17:25:15 +00:00
Dag-Erling Smørgrav
ee8aeb145a
Accurately reflect our local changes and additions.
2002-11-05 17:24:01 +00:00
Dag-Erling Smørgrav
0061710269
Document the current default value for VersionAddendum.
2002-11-05 17:17:09 +00:00
Dag-Erling Smørgrav
7e4224fafd
Switch to two-clause license, with NAI's permission.
2002-11-02 19:55:23 +00:00
Dag-Erling Smørgrav
f388f5ef26
Resolve conflicts.
2002-10-29 10:16:02 +00:00
Dag-Erling Smørgrav
dd5f4be98b
Protect against tag expansion + fix some brainos.
2002-10-29 10:12:51 +00:00
Dag-Erling Smørgrav
ef8cdc4065
Some tricks I use when I upgrade.
2002-10-29 09:56:16 +00:00
Dag-Erling Smørgrav
d73be2d96a
Correct shell code to expand globs in FREEBSD-Xlist
2002-10-29 09:55:28 +00:00
Dag-Erling Smørgrav
8488d4a48c
More cruft.
2002-10-29 09:54:53 +00:00
Dag-Erling Smørgrav
4b17dab0ba
Vendor import of OpenSSH-portable 3.5p1.
2002-10-29 09:43:00 +00:00
Dag-Erling Smørgrav
a8694a9a06
This commit was generated by cvs2svn to compensate for changes in r106121,
...
which included commits to RCS files with non-trunk default branches.
2002-10-29 09:43:00 +00:00
Assar Westerlund
20fae80cf2
This commit was generated by cvs2svn to compensate for changes in r105765,
...
which included commits to RCS files with non-trunk default branches.
2002-10-23 06:10:08 +00:00
Assar Westerlund
d5cb658451
import 1.29 to fix buffer overflow:
...
check the length of the authenticator and rlen
Obtained from: Heimdal CVS
2002-10-23 06:10:08 +00:00
Assar Westerlund
5ead950622
import 1.27 to fix buffer overflow:
...
check size of rlen
Obtained from: Heimdal CVS
2002-10-22 02:13:32 +00:00
Assar Westerlund
0c3bd4ca35
This commit was generated by cvs2svn to compensate for changes in r105672,
...
which included commits to RCS files with non-trunk default branches.
2002-10-22 02:13:32 +00:00
Dima Dorfman
ba0f77df7a
Permit the argument to the -s option to be a hostname. I see no
...
reason to restrict this to a numeric address.
PR: 41841
Submitted by: Dmitry Pryanishnikov <dmitry@atlantis.dp.ua>,
Maxim Maximov <mcsi@agava.com>
2002-10-02 00:27:14 +00:00
Jacques Vidrine
1b3f4135a5
Fix an annoying bug that causes a spurious error message when changing
...
passwords, even when the operation actually succeeded.
% k5passwd
luser@REA.LM's Password: **************
New password: **************
Verifying password - New password: **************
k5passwd: krb5_change_password: unable to reach any changepw server in realm REA.LM
[In reality, the password was changed.]
Obtained from: Heimdal CVS
2002-09-30 11:48:23 +00:00
Jacques Vidrine
a5573db3bf
This commit was generated by cvs2svn to compensate for changes in r104204,
...
which included commits to RCS files with non-trunk default branches.
2002-09-30 11:48:23 +00:00
Mark Murray
4141227a94
Catch up with "base" telnet.
...
s/FALL THROUGH/FALLTHROUGH/ for lint(1).
2002-09-25 07:28:04 +00:00
Mark Murray
86953b026a
Catch up with "base" telnet.
...
s/FALL THROUGH/FALLTHROUGH/ for lint(1).
s/Usage/usage/ for consistency.
2002-09-25 07:26:25 +00:00
Mark Murray
53889d70ff
From the requestor:
...
"Could you do me a favor and fix sys_bsd.c to get the howmany() macro
from <sys/param.h>, instead of <sys/types.h>? This will save me from
having to worry about the unsync'd bits before making the change."
Requested by: mike
2002-09-25 07:24:01 +00:00
Jacques Vidrine
0bd4a81b2e
These RFCs and internet-drafts are not really needed in the base
...
system, and I've not been importing them lately. cvs rm them now
so they can be cleaned out of the attic later.
Requested by: obrien
2002-09-18 14:17:14 +00:00
Jacques Vidrine
43a2371256
Resolve conflicts.
2002-09-16 21:07:11 +00:00
Jacques Vidrine
0cadf2f4d7
Import of Heimdal Kerberos from KTH repository circa 2002/09/16.
2002-09-16 21:04:40 +00:00
Jacques Vidrine
18600429b3
This commit was generated by cvs2svn to compensate for changes in r103423,
...
which included commits to RCS files with non-trunk default branches.
2002-09-16 21:04:40 +00:00
Hajimu UMEMOTO
7ac3260308
sshd didn't handle actual size of struct sockaddr correctly,
...
and did copy it as long as just size of struct sockaddr. So,
If connection is via IPv6, sshd didn't log hostname into utmp
correctly.
This problem occured only under FreeBSD because of our hack.
However, this is potential problem of OpenSSH-portable, and
they agreed to fix this.
Though, there is no fixed version of OpenSSH-portable available
yet, since this problem is serious for IPv6 users, I commit the
fix.
Reported by: many people
Reviewed by: current@ and stable@ (no objection)
MFC after: 3 days
2002-09-09 16:49:11 +00:00
Jun Kuriyama
b811072634
Fix typo (s@src/crypto/openssh-portable@src/crypto/openssh@).
2002-09-09 02:00:28 +00:00
Jacques Vidrine
88268f8f47
Pass the pointy hat! Remove accidently imported files.
2002-08-30 21:53:25 +00:00
Jacques Vidrine
c825f43432
Remove some parts of the Heimdal distribution which we do not use
...
and have never used.
2002-08-30 21:37:10 +00:00
Jacques Vidrine
bafe3deb75
Remove files no longer relevant after latest import.
2002-08-30 21:28:12 +00:00
Jacques Vidrine
7b173f654d
Resolve conflicts after import of Heimdal Kerberos circa 2002/08/29.
2002-08-30 21:25:14 +00:00
Jacques Vidrine
8373020d34
Import of Heimdal Kerberos from KTH repository circa 2002/08/29.
2002-08-30 21:23:27 +00:00
Jacques Vidrine
714b4175a0
This commit was generated by cvs2svn to compensate for changes in r102644,
...
which included commits to RCS files with non-trunk default branches.
2002-08-30 21:23:27 +00:00
Nick Sayer
c4f6a2a9e1
Encrypted strings (after hex decoding) aren't null terminated, because
...
0 might simply be part of the ciphertext.
PR: bin/40266
Submitted by: andr@dgap.mipt.ru
MFC after: 3 days
2002-08-22 06:19:07 +00:00
Jacques Vidrine
fd35706acb
Resolve conflicts.
2002-08-10 01:50:50 +00:00
Jacques Vidrine
499810c08e
Import of OpenSSL 0.9.6g.
2002-08-10 01:48:01 +00:00
Jacques Vidrine
47e862627e
This commit was generated by cvs2svn to compensate for changes in r101618,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:48:01 +00:00
Jacques Vidrine
484549566e
Import of OpenSSL 0.9.6f.
2002-08-10 01:46:10 +00:00
Jacques Vidrine
d96a831475
This commit was generated by cvs2svn to compensate for changes in r101615,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:46:10 +00:00
Jacques Vidrine
9e6c5d1742
Import of OpenSSL 0.9.6f.
2002-08-10 01:40:00 +00:00
Jacques Vidrine
506570008c
This commit was generated by cvs2svn to compensate for changes in r101613,
...
which included commits to RCS files with non-trunk default branches.
2002-08-10 01:40:00 +00:00
Jacques Vidrine
b1357e1cec
Correct a bug in the ASN.1 decoder which was introduced with the
...
recent OpenSSL update.
Obtained from: OpenSSL CVS
2002-08-05 16:25:17 +00:00
Jacques Vidrine
cad8e82685
This commit was generated by cvs2svn to compensate for changes in r101386,
...
which included commits to RCS files with non-trunk default branches.
2002-08-05 16:25:17 +00:00
Andrey A. Chernov
bccd761645
Do login cap calls _before_ descriptors are hardly closed because close may
...
invalidate login cap descriptor.
Reviewed by: des
2002-08-05 16:06:35 +00:00
Jacques Vidrine
d57327ee50
Resolve conflicts after import of OpenSSL 0.9.6e.
2002-07-30 13:58:53 +00:00
Jacques Vidrine
4f20a5a274
Import of OpenSSL 0.9.6e.
2002-07-30 13:38:06 +00:00
Jacques Vidrine
0f881ddd5e
This commit was generated by cvs2svn to compensate for changes in r100936,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 13:38:06 +00:00
Jacques Vidrine
b55e3089db
This man page has not been referenced by anything for a while,
...
and is not part of the OpenSSL distribution. Remove it.
2002-07-30 12:54:03 +00:00
Jacques Vidrine
018cd73f8c
Remove many obsolete files. The majority of these are simply no
...
longer included as part of the OpenSSL distribution. However, a few
we just don't need and are explicitly excluded in FREEBSD-Xlist.
2002-07-30 12:51:09 +00:00
Jacques Vidrine
b325c11869
Resolve conflicts after import of OpenSSL 0.9.6d.
2002-07-30 12:46:49 +00:00
Jacques Vidrine
c1803d7836
Import of OpenSSL 0.9.6d.
2002-07-30 12:44:15 +00:00
Jacques Vidrine
0135f0027c
This commit was generated by cvs2svn to compensate for changes in r100928,
...
which included commits to RCS files with non-trunk default branches.
2002-07-30 12:44:15 +00:00
Jacques Vidrine
c8ae058fd0
Update list of files to remove prior to import of OpenSSL 0.9.6d
2002-07-30 12:38:41 +00:00
Tony Finch
f38aa77fc8
Use login_getpwclass() instead of login_getclass() so that the root
...
vs. default login class distinction is made correctly.
PR: 37416
Approved by: des
MFC after: 4 days
2002-07-29 00:36:24 +00:00
Tony Finch
a02377d3e2
FreeBSD doesn't use the host RSA key by default.
...
Reviewed by: des
2002-07-26 15:16:56 +00:00
Andrey A. Chernov
59ac432a4d
Problems addressed:
...
1) options.print_lastlog was not honored.
2) "Last login: ..." was printed twice.
3) "copyright" was not printed
4) No newline was before motd.
Reviewed by: maintainer's silence in 2 weeks (with my constant reminders)
2002-07-26 02:20:00 +00:00
Tony Finch
a9a70dec76
Document the FreeBSD default for CheckHostIP, which was changed in
...
rev 1.2 of readconf.c.
Approved by: des
2002-07-25 15:59:40 +00:00