Commit Graph

80 Commits

Author SHA1 Message Date
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
Markus Friedl
585db2baab move kex-specific states to struct kex and release states in kex_free() 2012-01-17 14:37:26 +01:00
Markus Friedl
0e69e20693 dispatch_fn() now returns an error code (int) instead of void 2012-01-17 14:37:26 +01:00
Markus Friedl
4f48a68397 rename ssh_packet_get() to ssh_packet_next() and document resulting API 2012-01-17 14:37:26 +01:00
Markus Friedl
c905073179 ssh_api.c: offer hostkey algorithms depending on registered keys
For now, the 'serialized' proposal is de-serialized, modified, and
serialized again in order to change the hostkey algorithm.
2012-01-17 14:36:45 +01:00
Damien Miller
c79348e375 better parameter checking for RSA key generation 2012-01-17 14:32:49 +01:00
Damien Miller
c90c1905fd fix conversion of key types to "plain" (non-cert) names
makes cert-* regress pass
2012-01-17 14:32:49 +01:00
Damien Miller
207b5422e6 fix ecdsa signatures from Markus
guess I somehow botched Markus' pull request :(
2012-01-17 14:32:49 +01:00
Markus Friedl
97a2b75862 dump packet content to stderr if ssh-proxy is started with -D 2012-01-17 14:32:49 +01:00
Markus Friedl
79762ba77d fix reading/writing of pubic keys
pubkeys are stored base64 not base16 and
deal with spaces in pubkeys correctly.
2012-01-17 14:32:49 +01:00
Markus Friedl
e339f7589e key_verify now returns 0 on success and < 0 on error
(used to return 1 on success 0 on failed signatures and -1
on error)
2012-01-17 14:32:49 +01:00
Damien Miller
ea5ceecdc2 first cut at merging disentangled buffer and library code. buffer_* continue
to exist as thin wrappers around sshbuf_*

doesn't yet pass regress (breakage in hostkey checking, probably related to
new sshkey_* return values)
2012-01-17 14:32:48 +01:00