Damien Miller
30c2bb48b9
matching constification of arguments
2012-03-04 21:19:22 +01:00
Damien Miller
044fea56f4
constify arguments
2012-03-04 21:19:22 +01:00
Damien Miller
222ddc9e44
basic unittests for authfile.c pub/private key loading
2012-03-04 21:19:22 +01:00
Markus Friedl
5853fac4dc
ssh-add: fix calls to sshkey_parse_private(), passphrase before filename
2012-03-04 21:19:22 +01:00
Damien Miller
79061f1d6e
signed/unsigned comparison
2012-03-04 21:19:22 +01:00
Markus Friedl
37f4c4a78f
remove remaining xstrdup from sshkey_try_load_public()
2012-03-04 21:19:22 +01:00
Markus Friedl
ff45a11b5a
fix re-try for files with .pub suffix (e.g. for cert tests or encrypted private keys)
2012-03-04 21:19:22 +01:00
Markus Friedl
56b8e0979c
fix rsa1 key loading and passphrase change
2012-03-04 21:19:22 +01:00
Markus Friedl
54fc03566d
use sshkey_load_private in ssh-proxy
2012-03-04 21:19:22 +01:00
Damien Miller
68cf42d1fe
convert everything to new authfile.[ch] API
...
NB. bugs remain
2012-03-04 21:19:22 +01:00
Damien Miller
ce24556633
NULL *commentp in functions that take it
2012-03-04 21:19:21 +01:00
Damien Miller
f576b5ee39
fixes from Markus
2012-03-04 21:19:21 +01:00
Damien Miller
c412d88561
zero *keyp in each function that uses it
2012-03-04 21:19:21 +01:00
Damien Miller
24db83513f
rework authfile.c to avoid fatal and return error codes
2012-03-04 21:19:21 +01:00
Markus Friedl
60702a301e
adapt sshbuf_dump test to new output format
2012-03-04 21:19:21 +01:00
Markus Friedl
93f2ac802a
hide test invocation in regress Makefile
2012-03-04 21:19:21 +01:00
Markus Friedl
bbbf3db186
allocate 'struct ssh' early, so we can store the compat flags
2012-03-04 21:19:21 +01:00
Markus Friedl
79db80bd04
unbreak AES by adding the lost negation for the compat flag back
2012-03-04 21:19:21 +01:00
Markus Friedl
aac1adfc7b
replace global 'datafellows' with new ssh->compat flag
2012-03-04 21:19:21 +01:00
Markus Friedl
509563f6c9
no need to modify the global datafellows flag from the agents,
...
since we can pass the compat flag directly to sshkey_sign()
2012-03-04 21:19:21 +01:00
Markus Friedl
ee43f74f13
clientloop.c: packet_ -> ssh_packet, dispatch_ -> ssh_dispatch_
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
d9fd38c3a2
unbreak privsep by resetting the rekeying flag after authentication for now
2012-03-04 21:19:21 +01:00
Markus Friedl
dd6d702278
pass a struct sshkey to ssh_add_hostkey() (instead of a string)
2012-03-04 21:19:20 +01:00
Markus Friedl
2c632c1123
print full input buffer if packet size contains garbage (PACKET_DEBUG)
2012-03-04 21:19:20 +01:00
Markus Friedl
46d0ce1aea
fix spaces in sshbuf hexdump
2012-03-04 21:19:20 +01:00
Markus Friedl
57cc6bbbe5
ssh_packet_send2() needs to queue pkts until initial kex is done.
...
fixes ssh-proxy w/ dropbear client
2012-03-04 21:19:20 +01:00
Markus Friedl
eddb17399b
ssh_api.c: the client must not send anything before the protocol version
2012-03-04 21:19:20 +01:00
Markus Friedl
91fa188bfb
ssh_packet_next(): after a kex callback has been called we need to
...
get the next packet, too. otherwise we end up waiting for input
even if there is a packet ready. the same applies to the proxy
2012-03-04 21:19:20 +01:00
Markus Friedl
1edbfe0a1b
dump_digest(): wrap digest in sshbuf and use sshbuf_dump()
2012-03-04 21:19:20 +01:00
Markus Friedl
435af03a21
sshbuf_dump(): printable ASCII together hexdump
2012-03-04 21:19:20 +01:00
Markus Friedl
729e3e7b18
fix build with DEBUG_KEX
2012-03-04 21:19:20 +01:00
Markus Friedl
8545c8466d
unbreak old GEX (interop w/putty)
2012-03-04 21:19:20 +01:00
Markus Friedl
03db90e6d7
compat.c: remove dependencies on xmalloc and Buffer
2012-03-04 21:19:20 +01:00
Markus Friedl
9608cea748
de-xmalloc ssh_api.c
2012-03-04 21:19:20 +01:00
Matthias Pitzl
53c9092076
Function to set a verify_host_key callback
2012-03-04 21:19:20 +01:00
Markus Friedl
c628377460
typo in error message; noted by Arne Becker
2012-03-04 21:19:20 +01:00
Markus Friedl
aec7620ee3
remove obsolete comment in kex_input_kexinit
2012-03-04 21:19:20 +01:00
Markus Friedl
50937afe60
whitespace fix
2012-03-04 21:19:20 +01:00
Markus Friedl
7806c429af
kex no longer uses xmalloc.h
2012-03-04 21:19:20 +01:00
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