Markus Friedl
011c12f689
sync cvs as of 2012-12-14 (keep cipher-ctr.c)
2012-12-30 09:09:52 +01:00
Markus Friedl
337493a508
replace Cipher typedef with 'struct sshcipher'
2012-10-12 17:58:02 +02:00
Markus Friedl
b8e501f9e3
ssh->current_keys is redundant, replace with ssh->kex->newkeys
2012-10-12 17:36:33 +02:00
Markus Friedl
12f57cf093
replace Comp typedef with 'struct sshcomp'
2012-10-12 16:56:40 +02:00
Markus Friedl
62dfdae606
replace Enc typedef with 'struct sshenc'
2012-10-12 16:51:58 +02:00
Markus Friedl
94db174dc6
replace Mac typedef with 'struct sshmac'
2012-10-12 16:45:42 +02:00
Markus Friedl
e92ff3d5b1
replace Newkeys typedef with 'struct newkeys'
2012-10-12 16:32:27 +02:00
Markus Friedl
ad4ef1067c
replace Kex typedef with 'struct kex'
2012-10-12 16:22:45 +02:00
Damien Miller
60cb7a627f
new functions for read-only buffers with external storage
...
This adds some new functions: sshbuf_from(), sshbuf_fromb() and sshbuf_froms()
that create new buffers from a read-only blob, the contents of a buffer and
the contents of a string in a buffer respectively. In all cases the memory
contents are not copied - the new buffer, which is read-only, just refers to
the original location in memory.
2012-10-09 23:22:53 +02:00
Damien Miller
3f69ecb299
activate leakmalloc support when LEAKMALLOC make variable is set
...
(mostly by markus@)
2012-03-15 13:27:43 +11:00
Damien Miller
4a3c3a7baf
fix some kex-related leaks
2012-03-07 00:26:54 +01:00
Markus Friedl
f8339e5505
de-fatal state serialisation and remove obsolete state-functions
2012-03-04 21:19:23 +01:00
Markus Friedl
f25d6cdfc8
rename kex_finish() to kex_send_newkeys()
2012-03-04 21:19:19 +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
Damien Miller
df7bb23744
defatal kex_send_kexinit
2012-01-17 14:45:06 +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
d8b01951d3
de-fatal kex-ecdh
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
Markus Friedl
568a12a63e
defatal mac.[ch]
...
Conflicts:
ssh/packet.c
2012-01-17 14:42:52 +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
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
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
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
Markus Friedl
81b6a34857
the host key verification callbacks always get a 'struct ssh *'
...
so change the prototypes accordingly (from void *).
2012-01-17 14:32:48 +01:00
Markus Friedl
c8197a3b42
change all protocol handlers from 'void *' to 'struct ssh *'
2012-01-17 14:32:48 +01:00
Markus Friedl
9cc85e2464
move packet state internals back from packet.h to packet.c
2012-01-17 14:32:46 +01:00
Markus Friedl
530367aafa
Move the key exchange state and other global variables into
...
a per connection state struct, add a initial API that could
be used for a proxy (see ssh-proxy.c)
Joint work with Matthias Pitzl, Stefan Rinkes, Bernhard Zaun and
Arne Becker.
2012-01-17 14:32:46 +01:00
Markus Friedl
a87828ec88
import openssh as of 2012/01/05
2012-01-05 12:08:12 +01:00
