Damien Miller
|
4a3c3a7baf
|
fix some kex-related leaks
|
2012-03-07 00:26:54 +01:00 |
|
Damien Miller
|
4364319ce2
|
oops, sshbuf was never freeing its buffer memory
|
2012-03-07 00:26:52 +01:00 |
|
Damien Miller
|
b921712025
|
centralise error handling for sshkey_from_blob, fix leak
|
2012-03-07 00:26:51 +01:00 |
|
Markus Friedl
|
becc57491f
|
ssh_set_app_data(): attach application specific data to 'struct ssh'
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
a9b5c1feef
|
replace ssh_packet_payload() with sshpkt_ptr(); adapt ssh_packet_payload()
sshpkt_ptr() has similar argument/return types as sshbuf_ptr()
u_int -> size_t, void * -> u_char.
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
b8e9499508
|
ssh_api.h: u_int -> size_t
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
1ba4f6ae7d
|
ssh-proxy: use sshbuf_dump() and print hex-dump of forwarded packet
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
980b0a0f16
|
ssh-proxy: delay session close until the output is flushed
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
fbeeedc2c2
|
print protocol mismatch message if version exchange fails
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
6e99587584
|
remove redundant ssh->compat assignment
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
e9505646d7
|
terminate the buffer for the remote protocol version; interop w/JSch
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
f7ecade3a0
|
make sshbuf_get_stringb() a public API
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
ef966564df
|
zero *kexp in kex_from_blob()
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
cfa5a3fa83
|
kex_from_blob(): don't leak the kex on error
|
2012-03-04 21:19:24 +01:00 |
|
Markus Friedl
|
38c47bf56b
|
add alternate Makefile for ssh-proxy (w/o linking libssh.a)
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
43a81ccd73
|
make get_remote_ipaddr() per-connection and move it to ssh_remote_ipaddr()
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
eb30492538
|
cipher-bf1.c and mac.c no longer use log.h/xmalloc.h
|
2012-03-04 21:19:23 +01: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
|
95ba2fbfe0
|
add reallocn() (==xrealloc w/o fatal), use it in deattack.c
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
91f929fc6f
|
de-fatal deattack and use sshbuf.h instead of misc.c
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
06f25e6dee
|
de-fatal ciphers
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
7d063a0c7d
|
de-fatal addrmatch.c
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
f42361df22
|
de-fatal mac.c
|
2012-03-04 21:19:23 +01:00 |
|
Markus Friedl
|
c0941f9d24
|
de-fatal ssh-proxy.c
|
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 |
|
Markus Friedl
|
63e255807e
|
move packet state serialisation from monitor to packet.c
|
2012-03-04 21:19:23 +01:00 |
|
Damien Miller
|
0fe974bd62
|
expose sshkey_parse_public_rsa1() for unit testing
|
2012-03-04 21:19:23 +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
|
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 |
|