summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Viennot <nicolas@viennot.biz>2014-10-31 00:10:02 -0400
committerNicolas Viennot <nicolas@viennot.biz>2014-10-31 00:30:36 -0400
commit6e4adcc140102b80883bba85dff05003620b0029 (patch)
treecf7c368b6dfb57c6c6be8b20bfe75995aae5ff63
parent0783022d6d77ab3716e2a754856d40497b4cfd76 (diff)
Update libssh
-rw-r--r--libssh/AUTHORS2
-rw-r--r--libssh/CMakeLists.txt22
-rw-r--r--libssh/CPackConfig.cmake2
-rw-r--r--libssh/ConfigureChecks.cmake10
-rw-r--r--libssh/build/.gitkeep0
-rw-r--r--libssh/cmake/Modules/AddCMockaTest.cmake2
-rw-r--r--libssh/cmake/Modules/DefineCMakeDefaults.cmake3
-rw-r--r--libssh/cmake/Modules/DefineCompilerFlags.cmake7
-rw-r--r--libssh/cmake/Modules/FindArgp.cmake2
-rw-r--r--libssh/cmake/Modules/FindNaCl.cmake2
-rw-r--r--libssh/cmake/Modules/MacroAddCompileFlags.cmake21
-rw-r--r--libssh/cmake/Modules/MacroAddLinkFlags.cmake20
-rw-r--r--libssh/cmake/Modules/MacroAddPlugin.cmake30
-rw-r--r--libssh/cmake/Modules/MacroCopyFile.cmake33
-rw-r--r--libssh/cmake/Modules/UseDoxygen.cmake174
-rw-r--r--libssh/config.h.cmake6
-rw-r--r--libssh/doc/Doxyfile.in (renamed from libssh/doc/doxy.config.in)2
-rw-r--r--libssh/doc/authentication.dox4
-rw-r--r--libssh/doc/doxy.trac.in1546
-rw-r--r--libssh/doc/forwarding.dox11
-rw-r--r--libssh/doc/threading.dox1
-rw-r--r--libssh/examples/CMakeLists.txt13
-rw-r--r--libssh/examples/authentication.c8
-rw-r--r--libssh/examples/samplesshd-tty.c466
-rw-r--r--libssh/examples/samplesshd.c314
-rw-r--r--libssh/examples/ssh_server_fork.c697
-rw-r--r--libssh/examples/sshnetcat.c45
-rw-r--r--libssh/include/libssh/bignum.h32
-rw-r--r--libssh/include/libssh/buffer.h17
-rw-r--r--libssh/include/libssh/callbacks.h4
-rw-r--r--libssh/include/libssh/channels.h2
-rw-r--r--libssh/include/libssh/crypto.h10
-rw-r--r--libssh/include/libssh/curve25519.h5
-rw-r--r--libssh/include/libssh/dh.h4
-rw-r--r--libssh/include/libssh/ecdh.h4
-rw-r--r--libssh/include/libssh/ed25519.h79
-rw-r--r--libssh/include/libssh/fe25519.h68
-rw-r--r--libssh/include/libssh/ge25519.h43
-rw-r--r--libssh/include/libssh/knownhosts.h27
-rw-r--r--libssh/include/libssh/legacy.h90
-rw-r--r--libssh/include/libssh/libcrypto.h13
-rw-r--r--libssh/include/libssh/libgcrypt.h8
-rw-r--r--libssh/include/libssh/libssh.h56
-rw-r--r--libssh/include/libssh/libsshpp.hpp38
-rw-r--r--libssh/include/libssh/packet.h4
-rw-r--r--libssh/include/libssh/pki.h5
-rw-r--r--libssh/include/libssh/pki_priv.h20
-rw-r--r--libssh/include/libssh/priv.h25
-rw-r--r--libssh/include/libssh/sc25519.h74
-rw-r--r--libssh/include/libssh/server.h66
-rw-r--r--libssh/include/libssh/session.h16
-rw-r--r--libssh/include/libssh/sftp.h8
-rw-r--r--libssh/include/libssh/socket.h1
-rw-r--r--libssh/include/libssh/wrapper.h29
-rw-r--r--libssh/libssh-config.cmake.in6
-rwxr-xr-xlibssh/obj/build_make.sh (renamed from libssh/build/build_make.sh)2
-rw-r--r--libssh/src/CMakeLists.txt16
-rw-r--r--libssh/src/agent.c8
-rw-r--r--libssh/src/auth.c563
-rw-r--r--libssh/src/base64.c13
-rw-r--r--libssh/src/bignum.c96
-rw-r--r--libssh/src/bind.c77
-rw-r--r--libssh/src/buffer.c438
-rw-r--r--libssh/src/callbacks.c2
-rw-r--r--libssh/src/channels.c882
-rw-r--r--libssh/src/channels1.c7
-rw-r--r--libssh/src/client.c100
-rw-r--r--libssh/src/config.c57
-rw-r--r--libssh/src/connect.c14
-rw-r--r--libssh/src/curve25519.c70
-rw-r--r--libssh/src/dh.c526
-rw-r--r--libssh/src/ecdh.c37
-rw-r--r--libssh/src/ed25519.c222
-rw-r--r--libssh/src/error.c4
-rw-r--r--libssh/src/fe25519.c416
-rw-r--r--libssh/src/ge25519.c367
-rw-r--r--libssh/src/ge25519_base.data858
-rw-r--r--libssh/src/getpass.c2
-rw-r--r--libssh/src/gssapi.c455
-rw-r--r--libssh/src/gzip.c14
-rw-r--r--libssh/src/kex.c316
-rw-r--r--libssh/src/kex1.c6
-rw-r--r--libssh/src/known_hosts.c104
-rw-r--r--libssh/src/legacy.c8
-rw-r--r--libssh/src/libcrypto.c84
-rw-r--r--libssh/src/libgcrypt.c127
-rw-r--r--libssh/src/log.c6
-rw-r--r--libssh/src/messages.c603
-rw-r--r--libssh/src/misc.c3
-rw-r--r--libssh/src/options.c306
-rw-r--r--libssh/src/packet.c441
-rw-r--r--libssh/src/packet1.c27
-rw-r--r--libssh/src/packet_cb.c32
-rw-r--r--libssh/src/packet_crypt.c31
-rw-r--r--libssh/src/pcap.c149
-rw-r--r--libssh/src/pki.c249
-rw-r--r--libssh/src/pki_crypto.c376
-rw-r--r--libssh/src/pki_ed25519.c305
-rw-r--r--libssh/src/pki_gcrypt.c24
-rw-r--r--libssh/src/poll.c56
-rw-r--r--libssh/src/sc25519.c373
-rw-r--r--libssh/src/scp.c6
-rw-r--r--libssh/src/server.c306
-rw-r--r--libssh/src/session.c222
-rw-r--r--libssh/src/sftp.c641
-rw-r--r--libssh/src/sftpserver.c122
-rw-r--r--libssh/src/socket.c260
-rw-r--r--libssh/src/string.c9
-rw-r--r--libssh/src/threads.c25
-rw-r--r--libssh/src/threads/CMakeLists.txt134
-rw-r--r--libssh/src/wrapper.c117
-rw-r--r--libssh/tests/CMakeLists.txt8
-rw-r--r--libssh/tests/client/torture_algorithms.c136
-rw-r--r--libssh/tests/client/torture_auth.c116
-rw-r--r--libssh/tests/client/torture_connect.c40
-rw-r--r--libssh/tests/client/torture_forward.c10
-rw-r--r--libssh/tests/client/torture_knownhosts.c192
-rw-r--r--libssh/tests/client/torture_request_env.c10
-rw-r--r--libssh/tests/client/torture_session.c5
-rw-r--r--libssh/tests/client/torture_sftp_read.c4
-rw-r--r--libssh/tests/pkd/CMakeLists.txt35
-rw-r--r--libssh/tests/pkd/pkd_client.h69
-rw-r--r--libssh/tests/pkd/pkd_daemon.c500
-rw-r--r--libssh/tests/pkd/pkd_daemon.h40
-rw-r--r--libssh/tests/pkd/pkd_hello.c534
-rw-r--r--libssh/tests/pkd/pkd_keyutil.c138
-rw-r--r--libssh/tests/pkd/pkd_keyutil.h40
-rw-r--r--libssh/tests/pkd/pkd_util.c46
-rw-r--r--libssh/tests/pkd/pkd_util.h16
-rw-r--r--libssh/tests/test_ssh_bind_accept_fd.c139
-rw-r--r--libssh/tests/torture.c242
-rw-r--r--libssh/tests/torture.h10
-rw-r--r--libssh/tests/unittests/torture_buffer.c142
-rw-r--r--libssh/tests/unittests/torture_callbacks.c40
-rw-r--r--libssh/tests/unittests/torture_channel.c1
-rw-r--r--libssh/tests/unittests/torture_pki.c517
136 files changed, 11366 insertions, 6575 deletions
diff --git a/libssh/AUTHORS b/libssh/AUTHORS
index fd753860..51b3e46f 100644
--- a/libssh/AUTHORS
+++ b/libssh/AUTHORS
@@ -1,7 +1,7 @@
Author(s):
Aris Adamantiadis <aris@0xbadc0de.be> (project initiator)
-Andreas Schneider <mail@cynapses.org> (developer)
+Andreas Schneider <asn@cryptomilk.org> (developer)
Nick Zitzmann <seiryu (at) comcast (dot) net> (mostly client SFTP stuff)
diff --git a/libssh/CMakeLists.txt b/libssh/CMakeLists.txt
index 5998bc50..48559f37 100644
--- a/libssh/CMakeLists.txt
+++ b/libssh/CMakeLists.txt
@@ -7,8 +7,8 @@ cmake_minimum_required(VERSION 2.6.0)
set(APPLICATION_NAME ${PROJECT_NAME})