Commit Graph

2276 Commits

Author SHA1 Message Date
Damien Miller
6448ec6b1a sync 2002-02-13 16:48:45 +11:00
Damien Miller
89a1b9f908 unbreak 2002-02-13 16:43:52 +11:00
Damien Miller
8e3bdca1da - (djm) Sync openbsd-compat with OpenBSD CVS too 2002-02-13 16:00:15 +11:00
Damien Miller
3db5f530d0 - djm@cvs.openbsd.org 2002/02/13 00:59:23
[sftp-client.c sftp-client.h sftp-glob.c sftp-glob.h sftp.h]
     [sftp-int.c sftp-int.h]
     API cleanup and backwards compat for filexfer v.0 servers; ok markus@
2002-02-13 14:10:32 +11:00
Damien Miller
3606ee2938 - markus@cvs.openbsd.org 2002/02/13 00:39:15
[readpass.c]
     readpass.c is not longer from UCB, since we now use readpassphrase(3)
2002-02-13 14:05:23 +11:00
Damien Miller
00c9217558 - markus@cvs.openbsd.org 2002/02/13 00:28:13
[sftp-server.c]
     handle SSH2_FILEXFER_ATTR_SIZE in SSH2_FXP_(F)SETSTAT; ok djm@
2002-02-13 14:05:00 +11:00
Damien Miller
5873dfd829 - djm@cvs.openbsd.org 2002/02/12 12:44:46
[sftp-client.c]
     Let overlapped upload path handle servers which reorder ACKs. This may be
     permitted by the protocol spec; ok markus@
2002-02-13 14:04:37 +11:00
Damien Miller
16a133339a - djm@cvs.openbsd.org 2002/02/12 12:32:27
[sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
     Perform multiple overlapping read/write requests in file transfer. Mostly
     done by Tobias Ringstrom <tori@ringstrom.mine.nu>; ok markus@
2002-02-13 14:03:56 +11:00
Damien Miller
afc7a5d774 - markus@cvs.openbsd.org 2002/02/11 16:21:42
[match.c]
     support up to 40 algorithms per proposal
2002-02-13 13:55:30 +11:00
Damien Miller
6a47f30c55 - markus@cvs.openbsd.org 2002/02/11 16:19:39
[sshd.c]
     include md5.h not hmac.h
2002-02-13 13:55:06 +11:00
Damien Miller
654c03fd06 - markus@cvs.openbsd.org 2002/02/11 16:17:55
[sshd.c]
     do not complain about port > 1024 if rhosts-auth is disabled
2002-02-13 13:54:44 +11:00
Damien Miller
2ce18dabf3 - markus@cvs.openbsd.org 2002/02/11 16:15:46
[sshconnect1.c]
     include md5.h, not evp.h
2002-02-13 13:54:27 +11:00
Damien Miller
bc27d4e987 - markus@cvs.openbsd.org 2002/02/11 16:10:15
[kex.c]
     restore kexinit handler if we reset the dispatcher, this unbreaks rekeying
     s/kex_clear_dispatch/kex_reset_dispatch/
2002-02-13 13:54:06 +11:00
Damien Miller
afcc22542e - deraadt@cvs.openbsd.org 2002/02/10 01:07:05
[readconf.h sshd.8]
     more /etc/ssh; openbsd@davidkrause.com
2002-02-10 18:32:55 +11:00
Damien Miller
05eda437a6 - (djm) OpenBSD CVS Sync
- deraadt@cvs.openbsd.org 2002/02/09 17:37:34
     [pathnames.h session.c ssh.1 sshd.8 sshd_config ssh-keyscan.1]
     move ssh config files to /etc/ssh
 - (djm) Adjust portable Makefile.in tnd ssh-rand-helper.c o match
2002-02-10 18:32:28 +11:00
Damien Miller
4860650842 - markus@cvs.openbsd.org 2002/02/07 09:35:39
[ssh.c]
     remove bogus comments
2002-02-08 22:07:33 +11:00
Damien Miller
699d003e3a - markus@cvs.openbsd.org 2002/02/06 14:55:16
[channels.c clientloop.c serverloop.c ssh.c]
     channel_new never returns NULL, mouring@; ok djm@
2002-02-08 22:07:16 +11:00
Damien Miller
f3dcf1fc88 - markus@cvs.openbsd.org 2002/02/06 14:37:22
[session.c]
     minor KNF
2002-02-08 22:06:48 +11:00
Damien Miller
025e01c7f0 - mpech@cvs.openbsd.org 2002/02/06 14:27:23
[sftp.c]
     sync usage() with manual.
2002-02-08 22:06:29 +11:00
Damien Miller
81b6e787a0 - markus@cvs.openbsd.org 2002/02/06 14:22:42
[sftp.1]
     sort options; ok mpech@, stevesk@
2002-02-08 22:06:03 +11:00
Damien Miller
c653b89b5a - stevesk@cvs.openbsd.org 2002/02/05 15:50:12
[ssh-agent.c]
     use log interface and remove perror() in child.  use
     fatal_add_cleanup() vs. atexit().  ok mouring@ markus@
2002-02-08 22:05:41 +11:00
Damien Miller
a500cd608e - markus@cvs.openbsd.org 2002/02/05 14:32:55
[channels.c channels.h ssh.c]
     merge channel_request() into channel_request_start()
2002-02-08 22:04:26 +11:00
Damien Miller
8829d3669d - djm@cvs.openbsd.org 2002/02/05 00:00:46
[sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
     Add "-B" option to specify copy buffer length (default 32k); ok markus@
2002-02-08 22:04:05 +11:00
Damien Miller
e8c9ed436a - stevesk@cvs.openbsd.org 2002/02/04 20:41:16
[ssh-agent.1]
     more sync for default ssh-add identities; ok markus@
2002-02-08 22:02:16 +11:00
Damien Miller
5aa5d78e40 - (djm) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2002/02/04 12:15:25
     [sshd.c]
     add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1,
     fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@
2002-02-08 22:01:54 +11:00
Damien Miller
f3451a2181 - (djm) Cleanup after sync:
- :%s/reverse_mapping_check/verify_reverse_mapping/g
2002-02-05 12:40:46 +11:00
Damien Miller
cb8ea157b8 - djm@cvs.openbsd.org 2002/02/05 00:00:46
[sftp.1 sftp.c sftp-client.c sftp-client.h sftp-int.c]
     Add "-B" option to specify copy buffer length (default 32k); ok markus@
2002-02-05 12:27:58 +11:00
Damien Miller
d14ee1e29c - djm@cvs.openbsd.org 2002/02/04 21:53:12
[sftp.1 sftp.c]
     Add "-P" option to directly connect to a local sftp-server. Should be useful
     for regression testing; ok markus@
2002-02-05 12:27:31 +11:00
Damien Miller
ab57f35114 - stevesk@cvs.openbsd.org 2002/02/04 20:41:16
[ssh-add.1]
     more sync for default ssh-add identities; ok markus@
2002-02-05 12:26:58 +11:00
Damien Miller
fcd9320440 - markus@cvs.openbsd.org 2002/02/04 12:15:25
[log.c log.h readconf.c servconf.c]
     add SYSLOG_FACILITY_NOT_SET = -1, SYSLOG_LEVEL_NOT_SET = -1,
     fixes arm/netbsd; based on patch from bjh21@netbsd.org; ok djm@
2002-02-05 12:26:34 +11:00
Damien Miller
9b74bfc5be - markus@cvs.openbsd.org 2002/02/04 11:58:10
[auth2.c]
     cross checking of announced vs actual pktype in pubkey/hostbaed auth; ok stevesk@
2002-02-05 12:26:03 +11:00
Damien Miller
4d4d53f399 - stevesk@cvs.openbsd.org 2002/02/04 00:53:39
[ssh-agent.c]
     unneeded includes
2002-02-05 12:25:28 +11:00
Damien Miller
d2b8f1657e - stevesk@cvs.openbsd.org 2002/02/03 23:22:59
[ssh-agent.1]
     ssh-add also adds $HOME/.ssh/id_rsa and $HOME/.ssh/id_dsa now.
2002-02-05 12:24:19 +11:00
Damien Miller
9749c0c972 - stevesk@cvs.openbsd.org 2002/02/03 22:35:57
[ssh.1 sshd.8]
     some KeepAlive cleanup/clarify; ok markus@
2002-02-05 12:23:58 +11:00
Damien Miller
68f45983b2 - markus@cvs.openbsd.org 2002/02/03 17:59:23
[sshconnect2.c]
     more cross checking if announced vs. used key type; ok stevesk@
2002-02-05 12:23:32 +11:00
Damien Miller
67f0bc043c - markus@cvs.openbsd.org 2002/02/03 17:58:21
[channels.c channels.h ssh.c]
     generic callbacks are not really used, remove and
     add a callback for msg of type SSH2_MSG_CHANNEL_OPEN_CONFIRMATION
     ok djm@
2002-02-05 12:23:08 +11:00
Damien Miller
50e884d125 - markus@cvs.openbsd.org 2002/02/03 17:55:55
[channels.c channels.h]
     remove unused channel_input_channel_request
2002-02-05 12:22:08 +11:00
Damien Miller
c7ef63dd41 - markus@cvs.openbsd.org 2002/02/03 17:53:25
[auth1.c serverloop.c session.c session.h]
     don't use channel_input_channel_request and callback
     use new server_input_channel_req() instead:
     	server_input_channel_req does generic request parsing on server side
     	session_input_channel_req handles just session specific things now
     ok djm@
2002-02-05 12:21:42 +11:00
Damien Miller
664d6b9a8e - markus@cvs.openbsd.org 2002/01/31 15:00:05
[serverloop.c]
     no need for WNOHANG; ok stevesk@
2002-02-05 12:20:16 +11:00
Damien Miller
9ab47eeb22 - markus@cvs.openbsd.org 2002/01/31 13:35:11
[kexdh.c kexgex.c]
     cross check announced key type and type from key blob
2002-02-05 12:19:52 +11:00
Damien Miller
07a2d429b2 - markus@cvs.openbsd.org 2002/01/29 23:50:37
[scp.1 ssh.1]
     mention exit status; ok stevesk@
2002-02-05 12:16:15 +11:00
Damien Miller
5fab4b9b1d - markus@cvs.openbsd.org 2002/01/29 22:46:41
[session.c]
     don't depend on servconf.c; ok djm@
2002-02-05 12:15:07 +11:00
Damien Miller
c313be2756 - markus@cvs.openbsd.org 2002/01/29 16:41:19
[ssh-add.1]
     add DIAGNOSTICS; ok stevesk@
2002-02-05 12:14:41 +11:00
Damien Miller
baa0870852 - stevesk@cvs.openbsd.org 2002/01/29 16:29:02
[session.c]
     limit subsystem length in log; ok markus@
2002-02-05 12:14:10 +11:00
Damien Miller
c5d8635d6a - markus@cvs.openbsd.org 2002/01/29 14:32:03
[auth2.c auth.c auth-options.c auth-rhosts.c auth-rh-rsa.c canohost.c servconf.c servconf.h session.c sshd.8 sshd_config]
     s/ReverseMappingCheck/VerifyReverseMapping/ and avoid confusion; ok stevesk@
2002-02-05 12:13:41 +11:00
Damien Miller
43cba34b64 - markus@cvs.openbsd.org 2002/01/29 14:27:57
[ssh-add.c]
     exit 2 if no agent, exit 1 if list fails; debian#61078; ok djm@
2002-02-05 12:12:49 +11:00
Damien Miller
35b13d633b - stevesk@cvs.openbsd.org 2002/01/27 18:08:17
[ssh.c]
     handle simple case to identify FamilyLocal display; ok markus@
2002-02-05 12:12:09 +11:00
Damien Miller
95c249ff47 - stevesk@cvs.openbsd.org 2002/01/27 14:57:46
[channels.c servconf.c servconf.h session.c sshd.8 sshd_config]
     add X11UseLocalhost; ok markus@
2002-02-05 12:11:34 +11:00
Damien Miller
512bccbb5a - stevesk@cvs.openbsd.org 2002/01/26 16:44:22
[includes.h session.c]
     revert code to add x11 localhost display authorization entry for
     hostname/unix:d and uts.nodename/unix:d if nodename was different than
     hostname.  just add entry for unix:d instead.  ok markus@
2002-02-05 12:11:02 +11:00
Damien Miller
3672e4bc7a - markus@cvs.openbsd.org 2002/01/25 22:07:40
[kex.c kexdh.c kexgex.c key.c mac.c]
     use EVP_MD_size(evp_md) and not evp_md->md_size; ok steveks@
2002-02-05 11:54:07 +11:00