Markus Friedl
011c12f689
sync cvs as of 2012-12-14 (keep cipher-ctr.c)
2012-12-30 09:09:52 +01:00
Markus Friedl
cf692277d7
remove remaining PACKET_SKIP_COMPAT* defines
2012-10-11 00:14:26 +02:00
Markus Friedl
c0624b12c7
check sshbuf_mutable_ptr return value, or convert to sshbuf_ptr
2012-10-10 01:25:20 +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
Markus Friedl
253e997d49
sshconnect2.c: fix JPAKE
2012-09-20 12:16:43 +02:00
Markus Friedl
fbd7e0b979
feedback djm@: no need to protect free(); fix typo
2012-09-20 11:15:46 +02:00
Markus Friedl
383e471d75
PACKET_SKIP_COMPAT2 for sshconnect2.c
2012-09-20 11:15:45 +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
5f13a96cef
convert auth2-gss.c gss-genr.c sshconnect2.c to new buffer API
2012-09-19 19:43:19 +10:00
Markus Friedl
e3403f3457
update to openssh-6.1
2012-07-30 20:41:29 +02:00
Damien Miller
2c25fb2ede
refactor agent client code
...
removed fatal()
buffer_ => sshbuf_
changed lookup of identies to return a fully-deserialised list of keys
removed AuthenticationConnection abstration; all operations now use plain socket
2012-03-26 23:10:27 +11: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
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
03db90e6d7
compat.c: remove dependencies on xmalloc and Buffer
2012-03-04 21:19:20 +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
Markus Friedl
0e69e20693
dispatch_fn() now returns an error code (int) instead of void
2012-01-17 14:37:26 +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
c8197a3b42
change all protocol handlers from 'void *' to 'struct ssh *'
2012-01-17 14:32:48 +01:00
Markus Friedl
543ff8b66b
skip compat api for sshconnect2.c
2012-01-17 14:32:48 +01:00
Markus Friedl
93081a66ae
move statics from userauth_gssapi to Authctxt
2012-01-17 14:32:47 +01:00
Markus Friedl
3cb4b0e6de
userauth: add # of attempts to authctxt
2012-01-17 14:32:47 +01:00
Markus Friedl
6e946b8c40
client userauth: packet_ -> ssh_packet_ and dispatch_ -> ssh_dispatch_
...
remove globals: move hostname/address for hostkey verification to 'struct ssh'
2012-01-17 14:32:47 +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