Commit Graph

172 Commits

Author SHA1 Message Date
Markus Friedl
fbbec84071 sync to cvs as of 2012-09-14 2012-09-14 18:59:11 +02:00
Markus Friedl
e3403f3457 update to openssh-6.1 2012-07-30 20:41:29 +02:00
Markus Friedl
8ed0e3c614 treat all PEM_read_bio_PrivateKey() errors as SSH_ERR_KEY_WRONG_PASSPHRASE 2012-04-06 14:08:12 +02:00
Markus Friedl
19d6c6ae8b do not leak existing comment 2012-04-02 21:13:32 +02:00
Damien Miller
bdc1f63423 fixes - bad message format in ssh_decrypt_challenge(), missing break in ssh_add_identity_constrained() 2012-03-27 09:43:50 +11:00
Damien Miller
4cc6b3c6c5 more verbosity on errors 2012-03-27 09:43:20 +11:00
Damien Miller
a40866a6be hush warnings for certificate loading if file is not present 2012-03-27 09:42:55 +11:00
Damien Miller
fab052172d fixes from Markus 2012-03-27 08:57:21 +11:00
Damien Miller
e237a835f2 gracefully skip unrecognised key types 2012-03-26 23:23:34 +11: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
67ce107972 sshbuf_free(NULL) should be a no-op 2012-03-26 17:04:40 +11:00
Damien Miller
44e5c0f6b2 memory leak in cert_free() 2012-03-21 10:56:06 +11:00
Damien Miller
cc51f0e811 fix free of uninitialised pointer; found by fuzzer 2012-03-20 15:09:18 +01:00
Damien Miller
0caf1913c7 allow KEY_UNSPEC in sshkey_load_private_cert() 2012-03-20 15:09:18 +01:00
Damien Miller
e0e7ddfa4a xmalloc.h not needed here 2012-03-20 15:09:17 +01:00
Damien Miller
3f69ecb299 activate leakmalloc support when LEAKMALLOC make variable is set
(mostly by markus@)
2012-03-15 13:27:43 +11:00
Markus Friedl
9fb8cdc7bd free the session id and version strings in kex_free() 2012-03-07 00:26:56 +01:00
Markus Friedl
faaf51919a free the internal state in ssh_packet_close() 2012-03-07 00:26:56 +01:00
Markus Friedl
9e7303d250 don't leak the hostkey-list in ssh_free() ...
as well as the pub-key variant of the private hostkey
2012-03-07 00:26:55 +01:00
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