Commit Graph

91 Commits

Author SHA1 Message Date
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
Markus Friedl
5f2f99f51e let kex_finish() return an error code 2012-01-17 14:44:19 +01:00
Markus Friedl
ea6b0c14cf kexgexs.c: replace blocking ssh_packet_read() with callback 2012-01-17 14:44:19 +01:00
Markus Friedl
d8b01951d3 de-fatal kex-ecdh 2012-01-17 14:44:19 +01:00
Markus Friedl
b618c7766b packet_read_poll*: switch from ssh_packet_get to sshpkt_get + return codes 2012-01-17 14:44:19 +01:00
Markus Friedl
679bcc093b packet.c: {get,put}_u32 -> {PEEK,POKE}_U32 2012-01-17 14:44:19 +01:00
Markus Friedl
6ec240ac5b de-fatal kex-gex, add matching error codes, minimize diff to kex-dh 2012-01-17 14:44:18 +01:00
Damien Miller
3ed152cd93 move cipher warning flag to session_state 2012-01-17 14:43:51 +01:00
Markus Friedl
85054aaf18 merge "defatal mac.[ch]" from djm
Conflicts:

	ssh/packet.c
2012-01-17 14:43:39 +01:00
Markus Friedl
568a12a63e defatal mac.[ch]
Conflicts:

	ssh/packet.c
2012-01-17 14:42:52 +01:00
Damien Miller
ef0c2e123f defatal cipher.[ch]
unbreak arcfour(128|256)
2012-01-17 14:37:27 +01:00
Markus Friedl
c037dfa962 deal with error-codes returned by dispatch function (fatal for now) 2012-01-17 14:37:27 +01:00
Markus Friedl
f63a37137d de-fatal kex dh (test for de-fatal of packet.c) 2012-01-17 14:37:27 +01:00
Markus Friedl
52128ed203 packet.c: s/ret/r/g 2012-01-17 14:37:27 +01:00
Markus Friedl
43f038abce ssh_packet_read_poll/seqnr now return an error and no longer use xmalloc 2012-01-17 14:37:27 +01:00
Markus Friedl
9e254e24c5 new sshpkt API: {get,put} wraps ssh_packet_{get,put}, adds {get_end,disconnect} 2012-01-17 14:37:27 +01:00
Markus Friedl
54c5205bc4 switch packet.c from buffer_* to sshbuf_* and call fatal on failure
this moves the call to fatal() to packet.c itself.
2012-01-17 14:37:27 +01:00
Markus Friedl
9662f3f978 replace Buffer with allocated 'struct sshbuf *' in session_state 2012-01-17 14:37:27 +01:00
Damien Miller
7861f112ba disable SSHBUF_ABORT and fix compilation with it turned off 2012-01-17 14:37:27 +01:00
Damien Miller
44dce8d972 reinitialise compression buffers in postauth privsep child
the postauth privsep child never had its compression buffers initialised.
the old buffer code would would because they were (fortunately) bzeroed,
but the new code is more paranoid.

There is probably a more minimal way to do this that I'm missing :)
2012-01-17 14:37:26 +01:00
Markus Friedl
b720702ef3 unbreak ssh_add_hostkey(): sshkey_read() returns 0 on sucess 2012-01-17 14:37:26 +01:00