aboutsummaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2015-09-17libcrypto: refactor EVP_(de|en)cryptAris Adamantiadis1-56/+61
2015-09-16kex: Fix zlib compressionAndreas Schneider1-0/+1
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-15kex: Prefer sha2 over sha1Andreas Schneider1-5/+4
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-09pki: Fix a memory leak on error in ssh_pki_copy_cert_to_privkey()Andreas Schneider1-0/+1
CID 1323516 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-09pki: Fix a memory leak in pki_import_cert_buffer()Andreas Schneider1-0/+1
CID #1323517
2015-09-07pki: Add certificate loading functionsAxel Eppe1-2/+110
- ssh_pki_import_cert_base64() - ssh_pki_import_cert_file() - ssh_pki_import_cert_blob() Those functions are currently simple wrappers around their pubkey counterpart. - ssh_pki_copy_cert_to_privkey() This function copies the cert-specific data to a private key. Signed-off-by: Axel Eppe <aeppe@google.com> Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-07pki: Add Add new pki_import_cert_buffer functionAxel Eppe1-0/+51
Signed-off-by: Axel Eppe <aeppe@google.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-07pki: Add rsa, dss certificate key type definitionsAxel Eppe3-0/+24
- Add rsa/dsa (ssh-{rsa,dss}-cert-v01@openssh.com) as key types. - Add a cert_type member in the ssh_key struct. Signed-off-by: Axel Eppe <aeppe@google.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-07pki: Use the standard logging functionAndreas Schneider5-97/+109
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-07cmake: Handle libssh threas library correctlyAndreas Schneider2-2/+8
This should fix the build on Windows and would not install pkg files. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-09-07bignum: Fix OpenSSL crash in SAFE_FREEMichael Wilder1-0/+4
Signed-off-by: Michael Wilder <wilder.michael@cimcor.com> Reviewed-by: Andreas Schneider <asn@samba.org>
2015-09-07crypto: Add OpenSSL EVP functions for FIPS compatibilityMichael Wilder1-143/+409
Signed-off-by: Michael Wilder <wilder.michael@cimcor.com>
2015-08-18server: Fix return code check of ssh_buffer_pack()Andreas Schneider1-1/+1
Thanks to Andreas Gutschick <andreas.gutschick@mitel.com> Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-08-10pki: Fix return values of ssh_key_is_(public|private)Andreas Schneider1-2/+2
Thanks to Kevin Haake <khaake@red-cocoa.com> Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-08-01sftp: Fix incorrect handling of received length fieldsTilo Eckert1-7/+13
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de>
2015-07-30auth: Fix return status for ssh_userauth_agent()Peter Volpe1-0/+5
BUG: https://red.libssh.org/issues/201 Return SSH_AUTH_DENIED instead of SSH_AUTH_ERROR when the provided agent offers no public keys. Signed-off-by: Peter Volpe <pvolpe@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-07-30define our own platform-independent S_IF macrosTilo Eckert1-24/+16
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-07-30fix file mode checks in sftp_open()Tilo Eckert1-8/+7
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-07-08fix permissionsAris Adamantiadis1-0/+0
2015-07-07client: handle agent forward open requests with callbacksFabiano Fidêncio2-0/+39
Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com> Reviewed-by: Aris Adamantiadis <aris@badcode.be>
2015-07-03cmake: Fix zlib include directoryAndreas Schneider1-1/+1
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-29SSH_AUTH_PARTIAL is now correctly passed to the caller of ↵Tilo Eckert1-8/+7
ssh_userauth_publickey_auto(). Implicitly fixed unsafe return code handling that could result in use-after-free. Signed-off-by: Tilo Eckert <tilo.eckert@flam.de> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-29available auth_methods must be reset on partial authenticationTilo Eckert1-1/+1
Signed-off-by: Tilo Eckert <tilo.eckert@flam.de> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-29channels: Fix exit-signal data unpackingPeter Volpe1-1/+1
Signed-off-by: Peter Volpe <pvolpe@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-29agent: Add ssh_set_agent_socketPeter Volpe1-3/+20
Allow callers to specify their own socket for an ssh agent. Signed-off-by: Peter Volpe <pvolpe@redhat.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-24Don't allocate a new identity list in the new session's options.Seb Boving1-6/+0
The previous list is not freed. Since the new session just got created, an identity list is already allocated and empty. Signed-off-by: Sebastien Boving <seb@google.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-24cmake: Do not use CMAKE_(SOURCE|BINARY)_DIRDouglas Heriot1-2/+2
2015-06-24pki: Fix allocation of ed25519 public keysTiamo Laitakari1-2/+2
Signed-off-by: Tiamo Laitakari <tiamo.laitakari@cs.helsinki.fi> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-24misc: Correctly guard the sys/time.h includeAndreas Schneider2-3/+8
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-24kex: Add comments to #if clausesAndreas Schneider1-6/+10
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-06-03channels: fix exit-status not correctly setAris Adamantiadis1-5/+3
2015-05-29Comment that ssh_forward_cancel() is deprecated.Mike DePaulo1-0/+1
Signed-off-by: Aris Adamantiadis <aris@badcode.be>
2015-05-29Reintroduce ssh_forward_listen() (Fixes: #194)Mike DePaulo1-0/+5
Signed-off-by: Aris Adamantiadis <aris@badcode.be>
2015-05-05kex: also compare host keys for 'first_kex_packet_follows'Jon Simons1-21/+23
Also consider the host key type at hand when computing whether a 'first_kex_packet_follows' packet matches the current server settings. Without this change libssh may incorrectly believe that guessed settings which match by kex algorithm alone fully match: the host key types must also match. Observed when testing with dropbear clients. Signed-off-by: Jon Simons <jon@jonsimons.org> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-05server: return SSH_OK for ignored SSH_MSG_KEXDH_INIT caseJon Simons1-0/+1
Return SSH_OK for the case that an incoming SSH_MSG_KEXDH_INIT should be ignored. That is, for the case that the initial 'first_kex_packet_follows' guess is incorrect. Before this change sessions served with libssh can be observed to error out unexpectedly early when testing with dropbear clients that send an incompatible guess. Signed-off-by: Jon Simons <jon@jonsimons.org> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-05cmake: Add --enable-stdcall-fixup for MinGW buildsAndreas Schneider1-0/+4
This fixes warnings for getaddrinfo() and freeaddrinfo(). Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-05sftp: Fix size checkAndreas Schneider1-5/+7
CID: #1296588 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04external: Fix resetting the stateAndreas Schneider1-1/+1
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04external: Make sure we burn buffers in bcryptAndreas Schneider1-5/+4
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04external: Fix a possible buffer overrun in bcrypt_pbkdfAndreas Schneider1-3/+9
CID: #1250106 This fixes a 1 byte output overflow for large key length (not reachable in libssh). Pulled from OpenBSD BCrypt PBKDF implementation. Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04sftp: Add bound check for sizeAndreas Schneider1-1/+2
CID: #1238630 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04buffer: Cleanup vaargs in ssh_buffer_unpack_va()Andreas Schneider1-0/+1
CID: #1267977 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04string: Improve ssh_string_len() to avoid tainted variablesAndreas Schneider1-4/+11
CID: #1278978 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04pki_container: Fix a memory leakAndreas Schneider1-2/+9
CID: #1267980 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-05-04pki_container: Add check for return valueAndreas Schneider1-1/+4
CID: #1267982 Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-04-23buffers: Fix a possible null pointer dereferenceAris Adamantiadis1-0/+8
This is an addition to CVE-2015-3146 to fix the null pointer dereference. The patch is not required to fix the CVE but prevents issues in future. Signed-off-by: Aris Adamantiadis <aris@0xbadc0de.be> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-04-23CVE-2015-3146: Fix state validation in packet handlersAris Adamantiadis2-9/+15
The state validation in the packet handlers for SSH_MSG_NEWKEYS and SSH_MSG_KEXDH_REPLY had a bug which did not raise an error. The issue has been found and reported by Mariusz Ziule. Signed-off-by: Aris Adamantiadis <aris@0xbadc0de.be> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-04-14Fix leak of sftp->ext when sftp_new() failsKevin Fan1-0/+2
Signed-off-by: Kevin Fan <kevinfan@google.com> Reviewed-by: Andreas Schneider <asn@cryptomilk.org>
2015-04-10socket: Cleanup ssh_socket_close() code.Andreas Schneider1-5/+6
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
2015-04-10bind: Correctly close sockets and invalidate them.Andreas Schneider1-13/+5
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>