Commit Graph

111 Commits

Author SHA1 Message Date
Markus Friedl
ee43f74f13 clientloop.c: packet_ -> ssh_packet, dispatch_ -> ssh_dispatch_ 2012-03-04 21:19:21 +01:00
Markus Friedl
ce73007d5b create struct ssh in ssh_connect() and pass it to ssh_login(),
ssh_exchange_identification(), ssh_kex2() and ssh_userauth2()
so we can avoid accessing the global connections state from there.
2012-03-04 21:19:21 +01:00
Markus Friedl
d9fd38c3a2 unbreak privsep by resetting the rekeying flag after authentication for now 2012-03-04 21:19:21 +01:00
Markus Friedl
dd6d702278 pass a struct sshkey to ssh_add_hostkey() (instead of a string) 2012-03-04 21:19:20 +01:00
Markus Friedl
2c632c1123 print full input buffer if packet size contains garbage (PACKET_DEBUG) 2012-03-04 21:19:20 +01:00
Markus Friedl
46d0ce1aea fix spaces in sshbuf hexdump 2012-03-04 21:19:20 +01:00
Markus Friedl
57cc6bbbe5 ssh_packet_send2() needs to queue pkts until initial kex is done.
fixes ssh-proxy w/ dropbear client
2012-03-04 21:19:20 +01:00
Markus Friedl
eddb17399b ssh_api.c: the client must not send anything before the protocol version 2012-03-04 21:19:20 +01:00
Markus Friedl
91fa188bfb ssh_packet_next(): after a kex callback has been called we need to
get the next packet, too. otherwise we end up waiting for input
even if there is a packet ready. the same applies to the proxy
2012-03-04 21:19:20 +01:00
Markus Friedl
1edbfe0a1b dump_digest(): wrap digest in sshbuf and use sshbuf_dump() 2012-03-04 21:19:20 +01:00
Markus Friedl
435af03a21 sshbuf_dump(): printable ASCII together hexdump 2012-03-04 21:19:20 +01:00
Markus Friedl
729e3e7b18 fix build with DEBUG_KEX 2012-03-04 21:19:20 +01:00
Markus Friedl
8545c8466d unbreak old GEX (interop w/putty) 2012-03-04 21:19:20 +01:00
Markus Friedl
03db90e6d7 compat.c: remove dependencies on xmalloc and Buffer 2012-03-04 21:19:20 +01:00
Markus Friedl
9608cea748 de-xmalloc ssh_api.c 2012-03-04 21:19:20 +01:00
Matthias Pitzl
53c9092076 Function to set a verify_host_key callback 2012-03-04 21:19:20 +01:00
Markus Friedl
c628377460 typo in error message; noted by Arne Becker 2012-03-04 21:19:20 +01:00
Markus Friedl
aec7620ee3 remove obsolete comment in kex_input_kexinit 2012-03-04 21:19:20 +01:00
Markus Friedl
50937afe60 whitespace fix 2012-03-04 21:19:20 +01:00
Markus Friedl
7806c429af kex no longer uses xmalloc.h 2012-03-04 21:19:20 +01:00
Markus Friedl
f25d6cdfc8 rename kex_finish() to kex_send_newkeys() 2012-03-04 21:19:19 +01:00
Markus Friedl
27e9f28bcd kex: use ssh->datafellows instead of the global 2012-03-04 21:19:19 +01:00
Markus Friedl
f0b07791e7 de-fatal dh_new_*(), used during kex DH/GEX 2012-03-04 21:19:19 +01:00
Markus Friedl
c5b7f87669 missing de-fatal + remove blocking read from kex
replace ssh_packet_check_eom() with sshpkt_get_end() and remove
xmalloc as well as the blocking call to ssh_packet_read_seqnr().
this was used to skip the next packet. instead skip the packet now
in dispatch.c
2012-03-04 21:19:19 +01:00
Markus Friedl
6c462faff7 replace xstrdup with strdup in match_*() as its called during kex 2012-03-04 21:19:19 +01:00
Markus Friedl
b14028ba52 fix whiteo in ssh_api.[ch] 2012-03-04 21:19:19 +01:00
Markus Friedl
b995eab1b5 remove unused longjmp code from ssh-keyscan 2012-03-04 21:19:19 +01:00
Markus Friedl
6da9f87abc add new error messages for protocol version and hostkey loading 2012-03-04 21:19:19 +01:00
Markus Friedl
746db96b80 fix/move comment in ssh_packet_next 2012-03-04 21:19:19 +01:00
Markus Friedl
7c291f80f5 hide dispatch_run() unless DISPATCH_COMPAT is defined 2012-03-04 21:19:19 +01:00
Markus Friedl
695568fabc de-fatal ssh_dispatch_run and use it for a longjump-less ssh-keyscan 2012-03-04 21:19:19 +01:00
Markus Friedl
ef6bdcc76d de-fatal input_kex_ecdh_reply() and input_kex_ecdh_init() 2012-03-04 21:19:19 +01:00
Markus Friedl
19a6ad8184 de-fatal kex_ecdh_name_to_nid() 2012-03-04 21:19:19 +01:00
Markus Friedl
d04408425a de-fatal packet_close(): cipher_cleanup() send and receive context
even if cleanup for the first fails
2012-03-04 21:19:19 +01:00
Markus Friedl
f046133614 de-fatal ssh_api.c and change API to return ssh-error codes (err.h) 2012-03-04 21:19:18 +01:00
Markus Friedl
203046094a unbreak build after shared lib disable 2012-03-04 21:19:18 +01:00
Markus Friedl
a5c8c737bb disable build of a shared libssh 2012-03-04 21:19:18 +01:00
Markus Friedl
d4d7a3065f disable build of a shared libssh 2012-03-04 21:19:18 +01:00
Matthias Pitzl
b345cb35c8 Enable build of shared library libssh. 2012-03-04 21:19:18 +01:00
Damien Miller
b65245d55a finish conversion of kex.c
cleans up a few buffer_* calls and adjusts return values
2012-03-04 21:19:18 +01:00
Damien Miller
2828f179cc finish defatal of kex.c 2012-03-04 21:19:18 +01:00
Markus Friedl
01f9f4bfb4 de-fatal ssh_packet_{send2_wrapped,read_poll2} 2012-03-04 21:19:18 +01:00
Markus Friedl
b645f5761f defatal ssh_set_newkeys() & ssh_packet_enable_delayed_compress() 2012-03-04 21:19:18 +01:00
Markus Friedl
14d8f87192 de-fatal ssh_packet_{init,start}_compression() 2012-03-04 21:19:18 +01:00
Damien Miller
df7bb23744 defatal kex_send_kexinit 2012-01-17 14:45:06 +01:00
Markus Friedl
f6bb12089e defatal compression code by merging it into packet.c
Conflicts:

	ssh/packet.c
2012-01-17 14:45:00 +01:00
Markus Friedl
6e36bbb8ae de-fatal ssh_packet_{start,stop}_discard() 2012-01-17 14:44:19 +01:00
Markus Friedl
d1a86a640e remove kex_kexinit_finish; unbreak kex-ecdh 2012-01-17 14:44:19 +01:00
Markus Friedl
9b8ff0770c pass kex-setup errors back to kex_input_kexinit() 2012-01-17 14:44:19 +01:00
Markus Friedl
53217d6dcd let kex_derive_keys() return an error code, too. 2012-01-17 14:44:19 +01:00