29 Commits

Author SHA1 Message Date
Markus Friedl
88d1ce29a9 sync cvs as of 2012-11-10 2012-11-10 16:26:54 +01:00
Markus Friedl
6ac14552ea stop exporting the_authctxt from sshd.c 2012-10-12 18:24:19 +02:00
Markus Friedl
ad4ef1067c replace Kex typedef with 'struct kex' 2012-10-12 16:22:45 +02:00
Markus Friedl
cf692277d7 remove remaining PACKET_SKIP_COMPAT* defines 2012-10-11 00:14:26 +02:00
Markus Friedl
dcdd40541b replace some active_state with ssh 2012-09-21 12:04:08 +02:00
Markus Friedl
48ca6d1326 remove old packet code from session.c, and pass 'ssh' around.... 2012-09-21 00:58:36 +02:00
Damien Miller
ece6575b3c convert serverloop.c ssh-keygen.c ssh-pkcs11-helper.c to new buffer API 2012-09-21 04:26:38 +10:00
Markus Friedl
359c0b5398 remove redundant kex->ssh assignment 2012-09-20 17:47:09 +02:00
Markus Friedl
d45e8a05ab sshd.c: PACKET_SKIP_COMPAT and move creation of 'ssh' to main(). 2012-09-20 17:47:09 +02:00
Damien Miller
54c2c68956 This stated as a conversion of monitor*.[ch] to the new
buffer API, but it got away from me...

Includes a change from u_int -> size_t in the key API that
touches quite a few things
2012-09-20 01:22:35 +10:00
Damien Miller
725fecd4cc defatal rsa.[ch] 2012-09-19 05:03:02 +10:00
Markus Friedl
e3403f3457 update to openssh-6.1 2012-07-30 20:41:29 +02:00
Markus Friedl
b039f2339c don't make packet.c depend on the channels.c code 2012-03-04 21:19:23 +01:00
Markus Friedl
f8339e5505 de-fatal state serialisation and remove obsolete state-functions 2012-03-04 21:19:23 +01:00
Damien Miller
68cf42d1fe convert everything to new authfile.[ch] API
NB. bugs remain
2012-03-04 21:19:22 +01:00
Markus Friedl
aac1adfc7b replace global 'datafellows' with new ssh->compat flag 2012-03-04 21:19:21 +01:00
Markus Friedl
03db90e6d7 compat.c: remove dependencies on xmalloc and Buffer 2012-03-04 21:19:20 +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
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
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
36bd2a3bbd remove the last argument from ssh_dispatch_run()
since it's always the same as the first...
2012-01-17 14:32:48 +01:00
Markus Friedl
e38108317d generate the compat dispatch API only if requested 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
c44b8a2397 active_state declaration already in packet.h 2012-01-17 14:32:47 +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