Compare commits

...

1766 Commits

Author SHA1 Message Date
Andreas Schneider
914a2d8e41 cmake: Prepare for release. 2011-05-30 12:36:54 +02:00
Andreas Schneider
956b64d348 session: Fix return code of ssh_blocking_flush().
(cherry picked from commit 3c21281bf0)
2011-05-28 18:35:21 +02:00
Aris Adamantiadis
91489cd378 remove "0.5.0 is dev" in the doc
(cherry picked from commit 3bc46c3bf0)
2011-05-27 14:20:02 +02:00
Aris Adamantiadis
615bc3b8f7 Forgot a cast to remove warnings
(cherry picked from commit ac167c9077)
2011-05-27 14:19:54 +02:00
Aris Adamantiadis
5b645419fd Fix bug #5, channel_read_nonblocking that blocks 2011-05-27 14:19:42 +02:00
Mark Riordan
c436e07022 Fix memory leak when compression is used
Signed-off-by: Mark Riordan <mriordan@ipswitch.com>
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit dcea8db6b2)
2011-05-27 11:47:26 +02:00
Andreas Schneider
188fb37801 sftp: Reset eof on seek operations.
This fixes bug #48.
(cherry picked from commit c483418b82)
2011-05-26 11:27:35 +02:00
Andreas Schneider
44fed3eb9b misc: Fix compilation on Windows.
(cherry picked from commit ba03388031)
2011-05-26 11:20:25 +02:00
Andreas Schneider
36abd82a7e cmake: Fix detection of clock_gettime. 2011-05-25 22:13:28 +02:00
Aris Adamantiadis
fd6d0b6897 Replace clock_gettime with gettimeofday when missing
(cherry picked from commit 65282841e2)
2011-05-25 22:00:00 +02:00
Aris Adamantiadis
09b0018b93 Introduced ssh_timeout_elapsed functions
Functions to mesure elapsed time before and after a serie of
calls. Introduces a dependancy to clock_gettime() and librt,
hope this doesn't break anything. Porting to gettimeofday() should
not be too hard.
(cherry picked from commit 59f7647cd9)
2011-05-25 21:59:51 +02:00
Andreas Schneider
2624e603d4 Revert "Use BIO* in _privatekey_from_file [Oliver Stöneberg]"
This reverts commit da8356b477.
2011-05-19 19:47:29 +02:00
Oliver Stöneberg
fd61eda16d keyfiles: Move FILE* into HAVE_LIBGCRYPT code.
(cherry picked from commit c7c563eb8ad01ab5750b5ea4e72031ebd298651c)
2011-05-17 21:00:02 +02:00
Oliver Stöneberg
a6dda5fefd keyfiles: Use BIO* in _privatekey_from_file().
(cherry picked from commit 82df5dc2083a6f7234d1545bd671ee1b5b4680b6)
2011-05-17 20:59:55 +02:00
Oliver Stöneberg
da8356b477 Use BIO* in _privatekey_from_file [Oliver Stöneberg]
_privatekey_from_file: moved FILE* into HAVE_LIBGCRYPT code / added missing #ifdef's to default case of switch [Oliver Stöneberg]
2011-05-17 20:57:58 +02:00
Oliver Stöneberg
e5fb20c17b socket: Fixed use-after-free.
When s->callbacks->exception() was called in ssh_socket_pollcallback()
we had a use after free bug.
(cherry picked from commit 9866763789)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
c472bd7437 keyfiles: Fixed compilation without defines.
This fixes cppcheck issues.
(cherry picked from commit 7f0761885c)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
8796756ae5 tests: Fixed some cppcheck warnings.
(cherry picked from commit e3311d03db)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
9c8f285a98 examples: Use the right cleanup functions.
(cherry picked from commit 525324b2f9)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
8154e24027 channel: Fixed potential use-after-free in ssh_channel_get_exit_status().
If ssh_channel_get_exit_status() is called more than once and the
connection closed.
(cherry picked from commit 4e153aed8a)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
629cfbccc4 connect: Set timeout on connect
This also fixes error handling in ssh_poll_ctx_dopoll() and
ssh_handle_packets(), so it won't loop forever on an actual timeout.
(cherry picked from commit 671a982739)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
c5990791db poll: Removed WSAPoll() support.
It was causing too many issues and the poll emulation is quite stable.
(cherry picked from commit f4f4ce37f0)
2011-05-17 20:57:38 +02:00
Oliver Stöneberg
16241938af doc: Small update to auth.c documentation.
(cherry picked from commit 12b61a6266)
2011-05-17 20:57:38 +02:00
Andreas Schneider
6a8cb38dd3 channel: Improve the request signal documentation.
(cherry picked from commit 32cd45612b)
2011-05-15 13:44:11 +02:00
Oliver Stöneberg
bac2227ee2 Updated privatekey_from_file() to use BIO* as well [Oliver Stöneberg] 2011-05-02 19:46:54 +02:00
Oliver Stöneberg
dcb50cc0c8 Use BIO* in _privatekey_from_file [Oliver Stöneberg]
_privatekey_from_file: moved FILE* into HAVE_LIBGCRYPT code / added missing #ifdef's to default case of switch [Oliver Stöneberg]
2011-05-02 19:17:38 +02:00
milo
f503c4a3e1 Delay the check for kbdint->answers in kbdint_send()
(cherry picked from commit 32ba5204b7)
2011-05-02 18:04:56 +02:00
milo
a56c925da9 Fix segfault when ssh_userauth_kbdint_setanswer() has not been called
(cherry picked from commit b6e712e934)
2011-05-02 17:47:00 +02:00
milo
833cc00014 [socket] fix a segfault at disconnect
(cherry picked from commit 7d2064c289)
2011-05-02 17:41:51 +02:00
milo
09e8cf33d7 [messages] don't queue messages if callback present
(cherry picked from commit 1979c14aac)
2011-05-02 17:40:05 +02:00
milo
a03bb2fbf7 [poll] avoid infinite loop in ssh_poll_ctx_free()
(cherry picked from commit 8092541603)
2011-05-02 17:39:28 +02:00
milo
bb784ec6be [channels] Added ssh_channel_window_size() and avoided reentrancy in channel_write_common()
(cherry picked from commit 7ba0938846)
2011-05-02 17:35:34 +02:00
Andreas Schneider
996c00c81c keyfiles: Fixed the build. 2011-05-01 21:04:55 +02:00
Oliver Stöneberg
30bdca07e9 init: Some initialization fixes.
- Check result of ssh_init() in privatekey_from_base64()
- Moved code from ssh_finalize() to appropriate subroutines
- Only initialize sockets once (caused mismatch of WSAStartup() and
  WSACleanup() calls and potential usage of bsd_poll when win_poll
  should be used)
2011-05-01 19:43:57 +02:00
Oliver Stöneberg
b4b49cf3f6 socket: Fixed poll input event.
(cherry picked from commit 040a543f57)
2011-05-01 19:43:01 +02:00
Oliver Stöneberg
189796e94f examples: Removed unnecessary \n from ssh_log() calls in samplessh.
(cherry picked from commit a73459171b)
2011-05-01 19:42:13 +02:00
Oliver Stöneberg
2431c7d925 examples: Fixed memory leak in samplessh when using commands.
(cherry picked from commit c3849a3cfd)
2011-05-01 19:42:01 +02:00
Andreas Schneider
fc9c61714f poll: Fix poll input events.
bug#38
2011-04-15 19:17:40 +02:00
Andreas Schneider
e096658df3 examples: Fix some memory leaks.
(cherry picked from commit 644145a88c)
2011-04-15 19:06:24 +02:00
Andreas Schneider
b1d58c5454 Fix assertion with Visual Studio because of %zu.
(cherry picked from commit ef658b4bef)
2011-04-15 19:03:02 +02:00
Mark Riordan
ced66eb11f scp: Fix potential infinite loop in ssh_scp_close
Signed-off-by: Mark Riordan <mriordan@ipswitch.com>
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 5939cfe78a)
2011-04-14 14:19:15 +02:00
Andreas Schneider
1b44daddf6 examples: Call correct functions on exit.
(cherry picked from commit 3e7d4534ce)
2011-04-14 14:19:08 +02:00
Aris Adamantiadis
a309c1b38e Fixed missing CRYPTO_cleanup_all_ex_data() in ssh_finalize
(cherry picked from commit 934252d6ca)
2011-04-14 13:40:42 +02:00
Andreas Schneider
e56aaf5f44 wrapper: Fixed a possible NULL pointer dereference.
(cherry picked from commit 94e7d345a7)
2011-04-14 10:18:37 +02:00
Andreas Schneider
632cee4426 server: Fixed a possible NULL pointer dereference.
(cherry picked from commit 7e4916cefc)
2011-04-14 10:18:34 +02:00
Oliver Stöneberg
af25fc35d1 build: Fixed some VS2010 problems.
(cherry picked from commit 166ee451c5)
2011-04-11 11:19:26 +02:00
Oliver Stöneberg
db49b84a44 keys: Fixed issues reported by cppcheck.
(cherry picked from commit 46475dfa2f)
2011-04-11 11:19:18 +02:00
Andreas Schneider
c5f4b8c1c7 cmake: Fixed a typo.
(cherry picked from commit 7150cabafa)
2011-04-08 11:06:16 +02:00
Mark Riordan
6a0daddd8f sftp: Fixed double-free in sftp_unlink().
(cherry picked from commit 29bb718a93)
2011-04-08 11:00:04 +02:00
Aris Adamantiadis
af997b221d Fixed doc of ssh_userauth_list()
(cherry picked from commit 1c062b22bf)
2011-03-28 13:36:51 +02:00
Aris Adamantiadis
9d6855702e Change session state after receiving a Disconnect
(cherry picked from commit 4bc9c96e4e)
2011-03-28 13:36:44 +02:00
Andreas Schneider
daf256e15f cpack: Raise version number. 2011-03-23 08:51:06 +01:00
Aris Adamantiadis
0eddcb4424 Fix the ssh_message_retrieve problem by anihilation 2011-03-23 08:49:34 +01:00
Aris Adamantiadis
b7f6794e03 Implement ssh_blocking_flush()
Based on code from Jan Willamowius
(cherry picked from commit dff4e4e6d3)
2011-03-23 08:49:26 +01:00
Andreas Schneider
cd9fc88151 doc: Improve the doc of ssh_bind_set_callbacks.
(cherry picked from commit 7daa81f3aa)
2011-03-09 18:33:49 +01:00
Andreas Schneider
fbe0f37e1b doc: Improved documentation for server options.
(cherry picked from commit 6754c34711)
2011-03-09 18:33:42 +01:00
Andreas Schneider
c496194614 messages: Added missing config.h include. 2011-03-01 14:08:01 +01:00
Andreas Schneider
ca639ceb63 legacy: Added missing channel_write_stderr. 2011-02-23 12:39:25 +01:00
Andreas Schneider
e85537aac4 legacy: Fixed the symbol export. 2011-02-23 12:32:02 +01:00
milo
e839c9cae6 Reverse commit 076dfb82 for the server side
(cherry picked from commit 32e23a25da)
2011-02-19 10:38:15 +01:00
Andreas Schneider
100e94c18e channel: Fixed uninitialized use of session. 2011-02-19 10:24:57 +01:00
Andreas Schneider
e7f7b4e499 server: Fixed logging function name.
(cherry picked from commit ac8276c70e)
2011-02-18 20:57:37 +01:00
Bernhard R. Link
eca8b53868 channel: Improve ssh_channel_open_reverse_forward documentation.
(cherry picked from commit 23b3c46fd6)
2011-02-18 18:01:45 +01:00
Andreas Schneider
b8767be373 channels: set error for new NULL pointer checks
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 8a83990c16)
2011-02-18 18:01:45 +01:00
Bernhard R. Link
9658eade0b socket: Set errors on return.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 071b0034db)
2011-02-18 17:54:43 +01:00
Bernhard R. Link
689536ec92 channels: Set errors on return.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 7ae59c571a)
2011-02-18 17:54:34 +01:00
Bernhard R. Link
3ff2999228 bind: Set errors on return.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit b1db0e54ad)
2011-02-18 17:54:28 +01:00
Andreas Schneider
4f65104ecc misc: Fixed ssh_is_ipaddr_v4() on Windows.
(cherry picked from commit eea1df3574)
2011-02-13 17:39:18 +01:00
Andreas Schneider
242e1c342c build: Try to fix the build on Solaris.
(cherry picked from commit 9baa491b0b)
2011-02-13 17:39:11 +01:00
Andreas Schneider
935e3b70ae misc: Added working ssh_is_ipaddr for Windows.
(cherry picked from commit cd30a1d4b1)
2011-02-13 12:30:52 +01:00
Andreas Schneider
8d1bfb5a85 tests: Fixed misc and isipaddr test on Windows.
(cherry picked from commit ca941d6985)
2011-02-13 12:30:46 +01:00
Andreas Schneider
2ac664968d torture: Fixed torture on Windows.
(cherry picked from commit cbcd5668f5)
2011-02-13 12:30:33 +01:00
Andreas Schneider
1199ad8f47 misc: Fixed ssh_is_ipaddr on FreeBSD.
(cherry picked from commit d1ddec00d9)
2011-02-13 12:30:17 +01:00
Bernhard R. Link
c12559f8f6 always set error when returning error in auth.c
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 637fc7ea59)
2011-02-12 20:15:07 +01:00
Andreas Schneider
840e1abcdc tests: Added ipv6 tests.
(cherry picked from commit 5d4bd5a21d)
2011-02-12 19:22:02 +01:00
Andreas Schneider
e3594ba0ec tests: Fixed torture_isipaddr.
(cherry picked from commit e8c3f55751)
2011-02-12 19:22:02 +01:00
Andreas Schneider
0d07dc5355 srv_sftp: Set error messages in sftp_get_client_message().
(cherry picked from commit 4d38b4c848)
2011-02-12 19:22:01 +01:00
Andreas Schneider
4170258595 connect: Use ssh_is_ipaddr instead of regex.
(cherry picked from commit 768fbdd92e)
2011-02-12 19:22:01 +01:00
Andreas Schneider
dacfc41d21 misc: Added ssh_is_ipaddr() function.
(cherry picked from commit b313fa944a)
2011-02-12 19:22:01 +01:00
Aris Adamantiadis
5158877b72 Connect: Test the new isipaddr() function
(cherry picked from commit 7acc2fa607)
2011-02-12 19:21:42 +01:00
Bernhard R. Link
a785ba3c4d use ssh_log instead of fprintf in ssh_config_parse_file
ssh_config_parse_file calls "fprintf(stderr," directly thus ignoring
a set log callback. Replacing the print with a call to ssh_log should
fix this.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 8d9d46ca66)
2011-02-12 19:21:17 +01:00
Bernhard R. Link
92dbd4eca2 ssh_connect_host_nonblocking returns SSH_EINTR, not E_INTR, so update documentation
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 8e0e4d8fb3)
2011-02-12 19:21:16 +01:00
Bernhard R. Link
a7144c5b6b proper prototypes
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
(cherry picked from commit 8b51d29363)
2011-02-12 19:21:16 +01:00
Andreas Schneider
5a8a2a56af poll: Use WSAPoll() on Windows. 2011-02-09 00:36:16 +01:00
Andreas Schneider
d464b57fa5 Revert "poll: Remove obsolete win_poll functions."
This reverts commit c950ed3b4c.
2011-02-09 00:34:36 +01:00
Andreas Schneider
c950ed3b4c poll: Remove obsolete win_poll functions.
Thanks for the hint Milo ;)
2011-02-09 00:13:47 +01:00
Andreas Schneider
5144f390ca examples: Fixed build warning. 2011-02-08 19:36:44 +01:00
Andreas Schneider
f5e2c94ae3 torture: Fixed memory leak. 2011-02-08 19:08:27 +01:00
Andreas Schneider
8078d4f674 doc: Use fwrite for the command example. 2011-02-08 10:59:50 +01:00
Andreas Schneider
ac785e0aa3 examples: The exec example should be like tutorial one. 2011-02-08 10:54:25 +01:00
Andreas Schneider
541519e563 build: Updated the ChangeLog. 2011-02-07 18:22:34 +01:00
Andreas Schneider
58feb0c983 vim: Added .clang_complete file. 2011-02-07 17:39:06 +01:00
Andreas Schneider
72e08d5dd9 build: Added a --clang option. 2011-02-07 13:34:37 +01:00
Andreas Schneider
f812ace256 tests: Some fixes for sftp_dir. 2011-02-07 13:33:28 +01:00
Andreas Schneider
057704c097 torture: Added more test for correct auth. 2011-02-07 13:31:31 +01:00
Andreas Schneider
92f20ec85a torture: Fixed the kbdint auth. 2011-02-07 13:31:08 +01:00
Andreas Schneider
a26194ece0 torture: Rename the static auth kbdint function. 2011-02-07 13:30:23 +01:00
Andreas Schneider
22b1e5bc7c tests: Added test for sftp directory functions. 2011-02-06 16:35:54 +01:00
Andreas Schneider
38d6d38c1f torture: Added a function to setup a sftp session. 2011-02-06 16:27:43 +01:00
Andreas Schneider
215c41710e torture: Added torture_isdir(). 2011-02-06 15:35:18 +01:00
Andreas Schneider
97d261dc79 torture: Added torture_rmdirs(). 2011-02-06 15:35:18 +01:00
Andreas Schneider
892ebf35f1 torture: Added GPL header. 2011-02-06 15:34:32 +01:00
Andreas Schneider
05cd7296ba tests: Added a torture_ssh_session(). 2011-02-06 11:15:05 +01:00
Andreas Schneider
93a2d79459 session: Added ssh_is_connected(). 2011-02-06 10:50:14 +01:00
Andreas Schneider
30e4096c66 tests: Fixed missing ; 2011-02-06 08:45:37 +01:00
Andreas Schneider
03b387cf47 Revert "sftp: Added missing break's to server."
This reverts commit 131e3b968f.
2011-02-05 18:40:00 +01:00
Andreas Schneider
131e3b968f sftp: Added missing break's to server. 2011-02-05 18:24:23 +01:00
Andreas Schneider
4bf8ee8032 tests: Check fgets output. 2011-02-05 15:23:19 +01:00
Andreas Schneider
63c42f066f tests: Fixed checking return values of system(). 2011-02-05 15:23:19 +01:00
Andreas Schneider
9e40e60bc4 examples: Check return values of write. 2011-02-05 15:23:19 +01:00
Andreas Schneider
8f850585dd session: Fixed possible uninitialized return of ret. 2011-02-05 15:23:19 +01:00
Andreas Schneider
4b07157fc6 getpass: Fixed a compiler warning. 2011-02-05 15:23:19 +01:00
milo
867944b939 Respect RFC when sending stderr data
http://tools.ietf.org/html/rfc4254#section-5.2

      byte      SSH_MSG_CHANNEL_EXTENDED_DATA
      uint32    recipient channel
     *uint32    data_type_code*
      string    data
2011-02-04 12:46:51 +01:00
Andreas Schneider
b0c2be25a6 doc: Fixed the include dir. 2011-01-28 13:13:08 +01:00
Aris Adamantiadis
c1ecec7cda SSH1: Update a few fix from 0.4.8-git 2011-01-26 22:50:05 +01:00
Aris Adamantiadis
00d68d63fa Getpass: fixed loop + indentation 2011-01-26 21:49:58 +01:00
Aris Adamantiadis
5d87ca94a8 Getpass: Fix password clearing 2011-01-26 13:22:29 +01:00
Andreas Schneider
1e827a8e81 getpass: Fixed possible segfault if len is too small. 2011-01-24 17:13:35 +01:00
Andreas Schneider
20e637968a cmake: Define BSD. 2011-01-24 15:44:11 +01:00
Andreas Schneider
5c581f8a4c libsshpp: Removed unused variable. 2011-01-24 15:25:50 +01:00
Andreas Schneider
d67cbdc926 examples: Fixed compilation on Windows. 2011-01-24 15:25:50 +01:00
Andreas Schneider
a63dbc07f3 examples: Fixed knownhosts on Windows. 2011-01-24 13:55:05 +01:00
Andreas Schneider
6a3cd6c20f examples: enable exec and senddata on all plattforms. 2011-01-24 13:55:05 +01:00
Andreas Schneider
8a9ce6239a examples: Remove unused header file. 2011-01-24 13:55:05 +01:00
Andreas Schneider
f3685f0f73 examples: Use ssh_getpass(). 2011-01-24 13:55:05 +01:00
Andreas Schneider
50a119dd0a misc: Added multiplatform ssh_getpass() fuction. 2011-01-24 13:55:05 +01:00
Andreas Schneider
8abdaa7abf examples: Start to build examples on more plattforms. 2011-01-23 18:57:35 +01:00
Aris Adamantiadis
80ef7d9304 Fix problem with ssh_connect w/ timeout &fd > 1024
Convert that code to ssh_poll
(cherry picked from commit b1a65dd25f)
2011-01-22 16:55:36 +01:00
Aris Adamantiadis
84df46f805 Fix use-after-free when socket is closed in a callback handler 2011-01-19 16:01:21 +01:00
Andreas Schneider
460d43f050 cmake: Fixed ZLIB configure check. 2011-01-18 18:56:24 +01:00
Andreas Schneider
625692f4c5 cmake: Don't use cmake 2.8.3 features. 2011-01-17 09:24:57 +01:00
Aris Adamantiadis
0e2bbdd25b Fix doxygen warning 2011-01-16 23:42:19 +01:00
Aris Adamantiadis
6b52aaff1c ssh_auth_password made nonblocking 2011-01-16 23:42:19 +01:00
Aris Adamantiadis
227764a803 Made ssh_userauth_none nonblocking 2011-01-16 23:42:19 +01:00
Aris Adamantiadis
624676b1cc Made ask_userauth nonblocking 2011-01-16 23:42:19 +01:00
Andreas Schneider
a236a15c6c modules: Improved the GCrypt module. 2011-01-16 12:47:06 +01:00
Andreas Schneider
cb775092bc cmake: Fixed NSIS module. 2011-01-16 12:21:58 +01:00
Andreas Schneider
8d7d313498 cmake: Fixed ZLIB path checks. 2011-01-16 12:16:53 +01:00
Andreas Schneider
c6e1792696 cmake: Improved the NSIS module. 2011-01-16 12:12:35 +01:00
Andreas Schneider
90fc5554e1 cmake: Improved the ZLIB find module based on CMake one. 2011-01-16 11:53:37 +01:00
Andreas Schneider
e579dfb342 cmake: Fixed license header of the OpenSSL module. 2011-01-16 11:51:02 +01:00
Andreas Schneider
0c93914948 cmake: Improved FindOpenSSL based on CMake ones. 2011-01-16 11:30:24 +01:00
Aris Adamantiadis
670dd17044 Test double ssh_disconnect 2011-01-15 22:50:34 +01:00
Aris Adamantiadis
b945cbca52 Fix double-connect testcase 2011-01-15 22:43:58 +01:00
Aris Adamantiadis
f8361d324e Fix torture_connect_double so it tests the right thing 2011-01-14 14:35:44 +01:00
Aris Adamantiadis
0b46f68c5f Fixed compilation without argp.h available 2011-01-13 21:21:19 +01:00
Aris Adamantiadis
2917e71aad Replaced argp support for platforms that support it
Argp is really useful, but it's not mandatory.
2011-01-13 18:34:04 +01:00
Aris Adamantiadis
551b87b65b New testcases for nonblocking ssh_connect and double ssh_connect 2011-01-13 18:09:04 +01:00
Aris Adamantiadis
5b6f048197 Use termination functions for event polling 2011-01-12 23:04:43 +01:00
Aris Adamantiadis
a17472ff2b Fix unit tests for opensolaris 2011-01-11 17:55:12 +01:00
Aris Adamantiadis
7fbb926c0b Fix getpwuid_r on opensolaris 2011-01-11 17:55:12 +01:00
Andreas Schneider
bb5f5281c0 build: Fixed build on Windows. 2011-01-11 11:07:17 +01:00
Aris Adamantiadis
9140242cbe Non-blocking mode for ssh_connect
This looks ugly. I'll see if we need to revert or change that patch later.
2011-01-10 18:01:35 +01:00
Aris Adamantiadis
bcea8921ba Change blocking parameter to a flag 2011-01-10 17:39:47 +01:00
Aris Adamantiadis
076dfb8294 Fix connection callbacks called at wrong time 2011-01-10 12:14:26 +01:00
Aris Adamantiadis
d631ce32ed All error path consistent with ssh_packet_kexinit 2011-01-10 11:24:15 +01:00
Aris Adamantiadis
4439d5c774 Log errors with ssh_log 2011-01-10 11:23:49 +01:00
Aris Adamantiadis
ac6278feb7 Fix leak when key exchange fails. 2011-01-09 22:27:55 +01:00
Andreas Schneider
d1e1103198 examples: Improve the authenticate_kbdint function.
The function excepts a predefined password now. It will try to use it if
the prompt is a Password prompt. This works in 80% of the cases.
2011-01-08 10:18:55 +01:00
Aris Adamantiadis
4f83918109 Added interesting link 2011-01-07 13:41:10 +01:00
Andreas Schneider
6b27966c9c keys: Fixed memory leaks in session signing.
Found by cppcheck - http://test.libssh.org/cppcheck-analyzer/
2011-01-06 14:32:39 +01:00
Andreas Schneider
a016d356fa dh: Fixed a memory leak in ssh_print_hexa.
Found by cppcheck - http://test.libssh.org/cppcheck-analyzer/
2011-01-06 14:25:35 +01:00
Andreas Schneider
61852635b5 tests: Moved assert to the write place in torture_keyfiles.
Found by clang-analyzer http://test.libssh.org/clang-analyzer/
2011-01-06 11:44:02 +01:00
Andreas Schneider
184f1e1706 tests: Assert if ssh_get_random failed in torture_rand_thread.
Found by clang-analyzer http://test.libssh.org/clang-analyzer/
2011-01-06 10:15:01 +01:00
Andreas Schneider
dfa01d0862 examples: Use the src mode in scp do_copy function.
Found by clang-analyzer http://test.libssh.org/clang-analyzer/
2011-01-06 10:15:01 +01:00
Andreas Schneider
82547867eb options: Remove unsused getopt option.
Found by clang-analyzer http://test.libssh.org/clang-analyzer/
2011-01-06 10:15:01 +01:00
Andreas Schneider
7d9f889911 tests: Added missing asserts in torture_keyfiles.
Found by clang-analyzer http://test.libssh.org/clang-analyzer/
2011-01-06 10:15:01 +01:00
Andreas Schneider
13ece2a2f8 messages: Added missing NULL pointer checks.
Found by clang-analyzer http://test.libssh.org/clang-analyzer/
2011-01-06 10:04:12 +01:00
Aris Adamantiadis
e57d5a45b9 Fix the missing returns in C++ wrapper 2011-01-05 21:14:27 +01:00
Andreas Schneider
ec12da273e tests: Fixed the segfault in torture_knownhosts. 2011-01-04 23:10:01 +01:00
Aris Adamantiadis
fdffa42c02 Fix "SSH_KEXINIT received in wrong state" race
Setting the flag before doing any IO
2011-01-04 16:59:54 +01:00
Andreas Schneider
d679d5d7ef poll: Ensure that the poll handle and ctx is zeroed. 2011-01-03 09:07:02 +01:00
Andreas Schneider
2464a25de7 tests: Fixed a build warning introduced before. 2011-01-03 09:02:34 +01:00
Andreas Schneider
e12253168c tests: Call init and finalize in client torture tests. 2011-01-03 08:46:14 +01:00
Andreas Schneider
1540dad17f tests: Added more openssl valgrind suppressions. 2011-01-03 07:51:46 +01:00
Andreas Schneider
350838d1b5 messages: Fixed cast warnings on Windows. 2011-01-02 19:35:54 +01:00
Andreas Schneider
f23880ddee base64: Added casts to GET macros to fix build warnings. 2011-01-02 19:35:54 +01:00
Andreas Schneider
be3e5c35cf scp: Fixed a build warning on Windows. 2011-01-02 19:35:54 +01:00
Andreas Schneider
73c0cd050e poll: Fixed a build warning on Windows. 2011-01-02 19:35:53 +01:00
Andreas Schneider
c54d6b7f8a bind: Added include file for close function on Windows. 2011-01-02 19:35:53 +01:00
Andreas Schneider
2b6fa19fe5 cmake: Fixed msvc posix warnings and unsecure functions. 2011-01-02 19:35:53 +01:00
Aris Adamantiadis
3f538b3ddd Call ssh_init()/ssh_finalize bf/af each testcase 2011-01-02 17:25:51 +01:00
Aris Adamantiadis
2faaefade9 Revert "tests: Call ssh_init() and ssh_finalize() before we run the tests."
Reason: breaks test_rand, because threading has to be initialized
before ssh_init()

This reverts commit ef1866db76.
2011-01-02 17:15:03 +01:00
Andreas Schneider
ef1866db76 tests: Call ssh_init() and ssh_finalize() before we run the tests. 2011-01-02 09:19:53 +01:00
Andreas Schneider
d4072082d0 tests: More openssl valgrind suppressions. 2011-01-02 09:10:42 +01:00
Andreas Schneider
a7237e8cea tests: Updated the valgrind suppressions file. 2011-01-01 22:13:03 +01:00
Andreas Schneider
bc2db562e5 cmake: Added missing OpenSSL directories on Windows. 2011-01-01 20:53:55 +01:00
Andreas Schneider
93ce8e8ffd cmake: Added looking for zdll on Windows. 2011-01-01 20:53:55 +01:00
Andreas Schneider
98bacf032f tests: Added torture_auth_autopubkey client test. 2011-01-01 20:53:55 +01:00
Andreas Schneider
e795dae8f2 tests: Added a windows test for torture_path_expand_tilde. 2011-01-01 20:53:55 +01:00
Andreas Schneider
459fa3734f tests: Fixed includes for torture_list on Windows. 2011-01-01 20:53:54 +01:00
Andreas Schneider
52d6b7b914 tests: Fixed includes of torture_options for windows. 2011-01-01 20:53:54 +01:00
Andreas Schneider
5331489581 tests: Fixed the torture_callbacks test.
We should zero the structure else ssh_callback_exists() can't be
working.
2011-01-01 19:14:54 +01:00
Andreas Schneider
2945a42c75 tests: Don't run torture_keyfiles on Windows.
This test needs ssh-keygen to be working.
2011-01-01 19:14:54 +01:00
Andreas Schneider
1f47730a82 tests: Fixed Windows build of torture_options. 2011-01-01 19:14:49 +01:00
Andreas Schneider
1b88542fbe misc: Avoid redefine of _WIN32_IE. 2011-01-01 18:43:37 +01:00
Andreas Schneider
530629c5a7 cmake: Added ssl libraries for OS/2. 2010-12-31 14:55:36 +01:00
Andreas Schneider
98b5f07631 cmake: Fixed a warning on OS/2 if the compiler version is empty. 2010-12-31 14:41:50 +01:00
Andreas Schneider
f46bf41813 libssh: Don't use the visibility flag on OS/2. 2010-12-31 14:35:06 +01:00
Andreas Schneider
8e632b14d1 cmake: Fixed installation path for OS/2. 2010-12-31 14:08:20 +01:00
Andreas Schneider
4728ac54fc build: Fixed some build warnings. 2010-12-30 12:12:34 +01:00
Andreas Schneider
da86340551 cmake: Improved the ctest file. 2010-12-30 12:12:06 +01:00
Andreas Schneider
fc8fdcb16b cmake: Only use Profiling on Unix systems. 2010-12-30 11:55:13 +01:00
Andreas Schneider
be68cfe923 cmake: Fixed NSIS detection on Windows. 2010-12-30 11:17:48 +01:00
Andreas Schneider
cb48057098 threads: Fixed ssh_pthread_thread_id with mingw. 2010-12-30 00:39:07 +01:00
Andreas Schneider
ef91ac4ea0 socket: Fixed ssh_socket_fd_set prototype. 2010-12-30 00:30:44 +01:00
Andreas Schneider
1646ce970c cmake: Fixed find modules on Windows. 2010-12-30 00:26:37 +01:00
Andreas Schneider
08906e0f7f tests: It is enough to include libssh.h for torture_init. 2010-12-29 21:02:51 +01:00
Andreas Schneider
887d201bd3 server: Added missing include files for getaddrinfo on Windows. 2010-12-29 20:53:28 +01:00
Andreas Schneider
1267240810 connect: Added and improved regex for ip detection.
Thanks to Norbert Kiesel, rlo#14.
2010-12-29 20:44:07 +01:00
Andreas Schneider
296767afc4 server: Added include files for getaddrinfo. 2010-12-29 20:36:14 +01:00
Andreas Schneider
13f3679b2f tests: Fixed torture_get_user_home_dir on Windows. 2010-12-29 20:35:55 +01:00
Andreas Schneider
f3a6c3152c cmake: Don't build torture_rand on Windows. 2010-12-29 20:33:32 +01:00
Andreas Schneider
80d7ccb522 cmake: Added missing include dirs for libssh. 2010-12-29 20:18:18 +01:00
Andreas Schneider
78abf5a88d cmake: Added include and library deps to torture. 2010-12-29 20:17:36 +01:00
Andreas Schneider
ad231ccd30 cmake: Fixed test includes and libraries. 2010-12-29 20:11:00 +01:00
Andreas Schneider
d4a6c27a83 cmake: Only set profile GCC flags on UNIX systems. 2010-12-29 20:02:03 +01:00
Andreas Schneider
e7a06ad3b4 cmake: Find cmockery on Windows. 2010-12-29 19:51:46 +01:00
Andreas Schneider
d2bf90c982 build: Fixed include directories for torture lib. 2010-12-29 19:49:07 +01:00
Andreas Schneider
69ac51dfaa connect: Added missing $ in IPREGEX.
Fixes rlo#14.
2010-12-29 19:48:15 +01:00
Andreas Schneider
3e2f714248 tests: Fixed a assert bug in torture_auth. 2010-12-29 09:13:17 +01:00
Aris Adamantiadis
530c17e2ef First real benchmark : raw SSH speed 2010-12-29 00:19:05 +01:00
Aris Adamantiadis
31043334f4 Export and document timestamp functions 2010-12-29 00:19:05 +01:00
Andreas Schneider
361e37dc66 tests: Added a torture_sftp_static test. 2010-12-28 22:14:47 +01:00
Andreas Schneider
df55918a41 tests: Migrated torture_proxycommand to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
e6329c72d1 tests: Migrated torture_knownhosts to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
8bd29736d2 tests: Migrated torture_auth to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
0b2cf70622 tests: Migrated torture_algorithms to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
b0446ad55d tests: Migrated torture_rand to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
d04ce30b03 tests: Migrated torture_options to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
512b776245 tests: Migrated torture_misc to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
d44919dfd4 tests: Migrated torture_list to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
99d45c686c tests: Moved torture_knownhosts to client tests. 2010-12-28 22:14:47 +01:00
Andreas Schneider
2bc03d22a1 tests: Migrated torture_keyfiles to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
fa17f33d2b tests: Migrated torture_init to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
400fc350a7 tests: Migrated torture_callbacks to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
6f65e6ae67 tests: Migrate torture_buffer to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
635a263f64 tests: Migrate the torture library to cmockery. 2010-12-28 22:14:47 +01:00
Andreas Schneider
17f592d4dd tests: Start to migrate tests to cmockery.
https://code.google.com/p/cmockery/wiki/Cmockery_Unit_Testing_Framework
2010-12-28 22:14:47 +01:00
Aris Adamantiadis
7dc183126a Set variables in the good order 2010-12-28 13:50:34 +01:00
Aris Adamantiadis
4fe1656cf8 Moved benchmarks to the tests/ directory 2010-12-28 13:17:27 +01:00
Aris Adamantiadis
a883330101 New benchmark framework
with pluggable style benchmarks and an original SSH RTT calculator !
2010-12-28 02:19:15 +01:00
Andreas Schneider
f0d811edc6 ctest: Added more valgrind suppressions. 2010-12-28 00:38:11 +01:00
Andreas Schneider
438083542d connect: Use a better IP regex. 2010-12-28 00:24:47 +01:00
Aris Adamantiadis
4fa2e4dde1 Added compression options and allow "yes/no" setting
SSH_OPTION_COMPRESSION and SSH_OPTION_COMPRESSION_LEVEL options have been added. Now, end-level apps may simply choose to enable compression without knowing the relevant algorithms behind it.
2010-12-27 23:28:39 +01:00
Andreas Schneider
32c0e1c99a test: Added openssh checks to the compression tests. 2010-12-27 22:47:37 +01:00
Andreas Schneider
b4c62ac9ea server: Replace gethostbyname() with getaddrinfo().
Fixes rlo#13.
2010-12-27 21:51:55 +01:00
Andreas Schneider
a0e98f585a misc: Fixed a possible memory leak. 2010-12-27 18:08:30 +01:00
Andreas Schneider
7c728acd12 sftp: Fixed a memory leak in sftp_xstat.
Thanks to dsc for the bug report.
2010-12-27 17:52:24 +01:00
Andreas Schneider
38b87aab08 channels: Fixed a build warning. 2010-12-23 10:18:09 +01:00
Andreas Schneider
33c41074a7 libsshpp: Fixed return of non-void function. 2010-12-23 08:54:39 +01:00
Andreas Schneider
936c65f03e options: Remove unused variable. 2010-12-21 21:29:22 +01:00
Andreas Schneider
825581d0dc packet1: Fixed dead assignments.
Found by http://test.libssh.org/scan-build/
2010-12-21 16:29:08 +01:00
Aris Adamantiadis
942b993f57 Add log verbosity to some testcases 2010-12-21 16:21:49 +01:00
Andreas Schneider
e6bc4b4ff9 doc: Added samplessh hint to INSTALL. 2010-12-21 16:21:02 +01:00
Andreas Schneider
04e224c3b4 doc: Updated Changelog. 2010-12-21 15:51:07 +01:00
Andreas Schneider
19ab9a015f doc: Added copyright policy section. 2010-12-21 15:40:36 +01:00
Andreas Schneider
94fe52870b doc: Update README. 2010-12-21 15:24:38 +01:00
Andreas Schneider
55470aaaf1 doc: Remove the note. 2010-12-21 15:13:18 +01:00
Andreas Schneider
6a26335158 doc: Some fixes for linking howto. 2010-12-21 15:07:42 +01:00
Andreas Schneider
256e88690d doc: Make the warning bold. 2010-12-21 15:03:13 +01:00
Andreas Schneider
3a94c94f20 doc: More linking details. 2010-12-21 14:55:39 +01:00
Andreas Schneider
473d3e0b3a ctest: Set the suppression file correctly. 2010-12-21 14:43:14 +01:00
Andreas Schneider
d5df18a14f build: Fixed build warning on FreeBSD. 2010-12-20 15:49:29 +01:00
Andreas Schneider
bffaa86664 build: Fixed some build warnings on FreeBSD. 2010-12-20 15:45:49 +01:00
Aris Adamantiadis
1922341e2a New benchmarks directory 2010-12-19 18:56:16 +01:00
Andreas Schneider
bcfab67daf ctest: Set the memcheck suppression file correctly. 2010-12-19 16:30:23 +01:00
Andreas Schneider
27f170011e ctest: Set suppression file only in CTestConfig. 2010-12-19 12:54:52 +01:00
Andreas Schneider
5cb4c9451f ctest: Make sure we have a clean source tree for each build. 2010-12-19 12:54:52 +01:00
Aris Adamantiadis
80408d5357 Fixed memory leak reported by valgrind 2010-12-19 12:37:21 +01:00
Aris Adamantiadis
47d11734e1 Fix free() on uninitialized data on some cases. 2010-12-19 12:33:31 +01:00
Andreas Schneider
14d6b8856f example: Fixed gcc warning. 2010-12-18 14:05:06 +01:00
Andreas Schneider
48e4df4ac0 TODO server: Fixed server support. 2010-12-18 14:02:53 +01:00
Andreas Schneider
f5d0f232c8 ctest: Fixed git URL. 2010-12-18 12:15:14 +01:00
Andreas Schneider
d6a5e5cb68 test: Fixed the default ctest file. 2010-12-15 19:15:02 +01:00
Andreas Schneider
751f202f56 doc: Follow the current naming convention. 2010-12-10 20:28:59 +01:00
Andreas Schneider
37eeb854e4 doc: Started to write a linking howto. 2010-12-10 20:17:57 +01:00
Andreas Schneider
57d752a1c3 include: Only require LIBSSH_STATIC on Windows. 2010-12-10 20:02:15 +01:00
Andreas Schneider
ef1cfbea70 build: Use the same name for static and shared library. 2010-12-10 20:00:23 +01:00
Andreas Schneider
038c764055 server: Remove channel_write_stderr. 2010-12-08 10:52:15 +01:00
Andreas Schneider
3ea33f9ab6 doc: Some small fixes in server.h. 2010-12-07 21:43:26 +01:00
Andreas Schneider
1758c172a2 doc: Fixed pki doc group. 2010-12-07 21:28:50 +01:00
Andreas Schneider
2a6cbed121 doc: Define a doc group for the callbacks. 2010-12-07 21:25:53 +01:00
Andreas Schneider
92fc2d6993 doc: Added buzzword. 2010-12-07 20:59:08 +01:00
Aris Adamantiadis
2dba4839ad Fix from Oleksandr Shneyder
http://www.libssh.org/archive/libssh/2010-11/0000005.html
2010-12-07 16:13:40 +01:00
Andreas Schneider
0825abd03a doc: Fixed doc namespace to be able to install manpages. 2010-12-05 10:53:39 +01:00
Aris Adamantiadis
f58441f474 Moved declarations from auth.h to various headers 2010-10-30 22:38:09 +02:00
Aris Adamantiadis
0e82cdeadc Moved includes from priv.h to bind.h 2010-10-27 23:06:38 +02:00
Aris Adamantiadis
b6901ec4b9 Fix senddata.c for 32bits machines 2010-10-27 22:53:20 +02:00
Aris Adamantiadis
ea4aa26dbb Split ssh_bind functions in a new .c file 2010-10-20 16:54:22 +02:00
Aris Adamantiadis
98221f4e36 Fixed a bunch of smallish bugs
http://linuxtesting.org/upstream-tracker/test_results/libssh/current/test_results.html
for a whole list
2010-10-20 14:47:11 +02:00
Aris Adamantiadis
8e2699e161 start of work to have callbackbased ssh_bind 2010-10-19 23:51:32 +02:00
Andreas Schneider
01eb20e13f cmake: Fixed a problem with ccache. 2010-10-19 11:50:29 +02:00
Aris Adamantiadis
b129181809 Adapt comments in options to give parameters types 2010-10-15 16:53:18 +02:00
Aris Adamantiadis
3253ece2a2 Oops, libssh.h did not compile anymore 2010-10-15 16:43:38 +02:00
Aris Adamantiadis
4b462449cf Fix OPTIONS_BINDADDR, PROXYCOMMAND constant change 2010-10-14 11:53:30 +02:00
Aris Adamantiadis
4f8907a524 Removed the global poll ctx in fav. of /session ctx 2010-10-12 17:57:15 +02:00
Aris Adamantiadis
7b1359042c Add zlib@openssh.com on the list of compression 2010-10-04 16:23:43 +02:00
Aris Adamantiadis
da9cd2e64d Implemented zlib@openssh.com compression 2010-10-04 16:19:20 +02:00
Aris Adamantiadis
5d1636985b Resolved the server blocked bug 2010-10-03 21:36:03 +02:00
Aris Adamantiadis
088b86d4fe Fix doxygen warnings 2010-10-03 16:16:30 +02:00
Aris Adamantiadis
9a89fba332 resolve memory consumption bug 2010-10-03 13:31:02 +02:00
Aris Adamantiadis
0bc032726d Fix prepend bug 2010-10-03 13:01:21 +02:00
Aris Adamantiadis
b2f571e544 test the buffer_prepend_data function 2010-10-03 12:25:33 +02:00
Aris Adamantiadis
338a3d9b05 Removed references to ssh_buffer_get_begin 2010-10-03 12:07:00 +02:00
Aris Adamantiadis
5687d6e79a Added buffer test case 2010-10-03 12:06:47 +02:00
Aris Adamantiadis
a9ec8b055f Fix warnings on testcases 2010-10-02 23:27:26 +02:00
Aris Adamantiadis
5f69d494ad Fix documentation of ssh_set_message_callback 2010-10-02 23:24:19 +02:00
milo
3d8cfa9973 Don't grow window if there is no space in the buffer 2010-10-02 22:55:53 +02:00
Aris Adamantiadis
0d5cc01f1c Fix the window not growing problem
Fix conflict with patch from milo
Conflicts:

	src/channels.c
2010-10-02 22:54:59 +02:00
milo
d7581c4daa Change path to ../src instead of the old ../libssh 2010-10-02 22:52:24 +02:00
milo
524302ca7e Added ssh_channel_write_stderr() for the server 2010-10-02 22:52:06 +02:00
milo
2617024136 Added channel features on the server
- ssh_channel_request_send_exit_status()
- ssh_channel_request_send_exit_signal()

- enhanced these features client-side
2010-10-02 22:51:49 +02:00
milo
26d40b5354 Handle global requests and reverse forwarding 2010-10-02 22:51:35 +02:00
milo
c4356531f7 Add new callbacks in session and channels 2010-10-02 22:51:14 +02:00
Aris Adamantiadis
873e02fc6a First step getting rid of ssh_buffer_get_begin 2010-10-01 23:41:04 +02:00
Aris Adamantiadis
985db35173 Rewrote channel_read_buffer to use ssh_channel_read 2010-10-01 23:03:08 +02:00
Aris Adamantiadis
c4e67730a3 Convert sftp.c to ssh_channel_read 2010-10-01 21:41:56 +02:00
Aris Adamantiadis
9f7e2c3252 Update the window *after* effective read 2010-10-01 18:56:57 +02:00
Aris Adamantiadis
5675fbe73e Fix the behaviour of channel window handling 2010-10-01 18:38:08 +02:00
Aris Adamantiadis
5b1c985a0e Changed the threads cbks from struct to publ func 2010-09-30 11:10:08 +02:00
Aris Adamantiadis
bedc65313f Removed the extern char *environ 2010-09-30 10:42:55 +02:00
Aris Adamantiadis
9f53906209 Remove extern environ from the requirements 2010-09-29 17:06:54 +02:00
Andreas Schneider
be837cdbc2 misc: Fixed a typo. 2010-09-29 14:19:07 +02:00
Andreas Schneider
38359672a5 misc: Make sure ssh_analyze_banner has proper length checks. 2010-09-29 12:12:14 +02:00
Andreas Schneider
1b471256d4 misc: Differentiate between client and server in ssh_analyze_banner. 2010-09-29 12:11:43 +02:00
Andreas Schneider
30e22fed6e misc: Fixed a possible data overread and crash bug. 2010-09-29 11:29:37 +02:00
Andreas Schneider
8b719e51cf misc: Move ssh_analyze_banner to a common location.
Don't duplicate functions!
2010-09-29 11:26:35 +02:00
Andreas Schneider
72b62d3064 build: Fixed the unit test build. 2010-09-29 11:26:16 +02:00
Andreas Schneider
5f24a84298 known_hosts: Added missing include.
Thanks miloj ;)
2010-09-29 11:17:46 +02:00
Andreas Schneider
1eaf55c5f6 keyfiles: Fixed unlink warning. 2010-09-28 19:16:42 +02:00
Andreas Schneider
9d3b84c914 threads: Fixed windows build.
MSVC isn't C99.
2010-09-28 19:12:01 +02:00
Andreas Schneider
b391a7603a pki: Create a file for known_hosts functions. 2010-09-28 19:09:29 +02:00
Andreas Schneider
45b551d4f7 build: Remove unneeded include directories. 2010-09-28 19:08:11 +02:00
Andreas Schneider
15e4ec38f2 pki: Added GPL to header file. 2010-09-28 19:07:16 +02:00
Andreas Schneider
8c318fcb21 keyfiles: Fixed the windows defines. 2010-09-28 19:06:49 +02:00
Andreas Schneider
a2fe4b2b2c options: Rename HOSTKEYCHECK to STRICTHOSTKEYCHECK.
Looks like people are confused by the name and think this is normal host
key checking.
2010-09-28 14:13:18 +02:00
Andreas Schneider
e36c9c529b options: Fixed documentation of SSH_OPTIONS_HOSTKEYCHECK. 2010-09-28 14:10:15 +02:00
Aris Adamantiadis
41c4e1f5c8 Completed senddata example to exit someday 2010-09-26 23:11:07 +02:00
Aris Adamantiadis
75a0281a6b Fixed outgoing flow control + writes behaviours 2010-09-26 22:33:58 +02:00
Vic Lee
a92545517a socket.c: Fixed setting max_fd which breaks ssh_select().
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-09-20 19:22:19 +02:00
Andreas Schneider
fe31fcaeef pki: Fixed a possible crash. 2010-09-18 20:59:29 +02:00
Aris Adamantiadis
f7ea9a3f27 Added documentation for threading 2010-09-12 22:34:38 +02:00
Aris Adamantiadis
b0c03280d1 ssh_threads_init is private 2010-09-12 22:01:21 +02:00
Aris Adamantiadis
5eb7c7b6ec Added initialisation logs for threading 2010-09-12 21:53:42 +02:00
Aris Adamantiadis
b7af2b2959 Changed callbacks type 2010-09-12 21:45:53 +02:00
Andreas Schneider
9f02a817ff build: Added -pedantic-errors. 2010-09-10 21:46:36 +02:00
Andreas Schneider
6345afabf8 build: Remove unneeded debug message. 2010-09-09 20:09:44 +02:00
Aris Adamantiadis
899db7cf22 Fix #ifdef'ed erroneous debug code in buffer.c 2010-09-09 10:01:29 +02:00
Andreas Schneider
f45dc29eb2 build: Improve pthread detection. 2010-09-08 16:51:55 +02:00
Andreas Schneider
d2f38da094 build: Make sure LIBSSH_THREADS_LINK_LIBRARIES is in the cache. 2010-09-08 16:43:55 +02:00
Andreas Schneider
697d51cd93 build: Make sure to link against all required thread libraries. 2010-09-08 16:32:54 +02:00
Andreas Schneider
f9b0dca7bd build: Fixed options parsing. 2010-09-08 16:29:50 +02:00
Andreas Schneider
03087e020c build: Improve the check for argp. 2010-09-08 11:41:14 +02:00
Andreas Schneider
4f75fdcd14 build: There is no need to check for system libraries on Linux. 2010-09-08 11:20:10 +02:00
Andreas Schneider
031c06419b build: Added DefinePlatformDefaults cmake file. 2010-09-08 11:20:10 +02:00
Andreas Schneider
254a08f540 build: Cleanup DefineCompilerFlags. 2010-09-08 11:20:10 +02:00
Andreas Schneider
76ead916ce build: Fixed linking against libssh in thread library. 2010-09-08 10:50:06 +02:00
Andreas Schneider
ab2dafc44a socket: Make code easier to read and debug. 2010-09-07 18:50:38 +02:00
Andreas Schneider
325cc4e395 session: Fixed a memory leak with session->bindaddr. 2010-09-07 17:30:10 +02:00
Andreas Schneider
c1604eff08 misc: Fixed a memory leak. 2010-09-07 17:26:07 +02:00
Andreas Schneider
77b52a5e69 doc: Added links to the RFCs. 2010-09-07 10:27:46 +02:00
Andreas Schneider
d414c4f500 doc: Fixed doxygen config. 2010-09-07 09:55:15 +02:00
Éric Bischoff
398bc769ce doc: More work on the tutorial. 2010-09-07 09:54:42 +02:00
Aris Adamantiadis
49f57a8d0d Implemented the noop and native pointers 2010-09-06 16:52:14 +02:00
Andreas Schneider
fbe102bada threads: Build a libssh threading library. 2010-09-06 15:17:03 +02:00
Aris Adamantiadis
2cca490076 Moved pthread specific code in src/threads/pthread.c
pthread example doesn't compile du to the lack of
libssh_threads_native.so library
2010-09-06 14:51:01 +02:00
Andreas Schneider
f7842e3a4b misc: Rename libssh/ to src/ 2010-09-06 14:28:38 +02:00
Éric Bischoff
38421403d2 doc: Some corrections for shell execution. 2010-09-06 11:03:00 +02:00
Andreas Schneider
461dde231c build: Fixed a wrong if statement. 2010-09-05 13:11:19 +02:00
Andreas Schneider
0785c522f0 build: Fixed build with gcc 3.4.
The -fvisibility=hidden flag is broken in gcc 3.4. This fixes the build
on CentOS, bug #74.
2010-09-05 12:56:01 +02:00
Andreas Schneider
2656c6b4ac server: Fixed a shadowed variable. 2010-09-05 12:34:12 +02:00
Andreas Schneider
ed5ebe7458 tests: Fixed cmdline parsing. 2010-09-05 12:34:12 +02:00
Andreas Schneider
d71d6afa34 tests: Disable options parsing if argp isn't available. 2010-09-03 15:44:41 +02:00
Andreas Schneider
2f8f230f61 build: Added support to find argp on BSD. 2010-09-03 15:38:12 +02:00
Aris Adamantiadis
285388409f Made pthread threading a user macro 2010-09-03 12:03:04 +02:00
Andreas Schneider
aff5786ed3 thread: Fixed detection of thread libraries on Windows. 2010-09-02 12:31:59 +02:00
Andreas Schneider
f97928c740 build: Fixed checking for printf function on Windows. 2010-09-02 11:50:21 +02:00
Andreas Schneider
bca73b8340 poll: Fixed the Windows build on Vista and newer. 2010-09-01 23:31:24 +02:00
Aris Adamantiadis
e67d834156 Fix initialization of threading 2010-09-01 16:05:06 +02:00
Andreas Schneider
a93f2d8bfe build: Fixed pthread detection. 2010-09-01 15:15:17 +02:00
Aris Adamantiadis
8c55294ea9 Openssl implementation of threading + default imp 2010-09-01 14:07:45 +02:00
Aris Adamantiadis
50d8d75d89 some more work on threading but not complete yet 2010-08-31 16:49:55 +02:00
Aris Adamantiadis
bcc2d8474c Begin of a solution for threading 2010-08-30 23:44:03 +02:00
Aris Adamantiadis
e34da1b94d Added "fix" for libgcrypt threading, ...
... but it doesn't seem to work. This is however the recommanded
way of initializing threading :
http://lists.gnupg.org/pipermail/gcrypt-devel/2009-February/001452.html
2010-08-30 14:39:35 +02:00
Aris Adamantiadis
717eff71dd Added test for the openssl threading 2010-08-30 14:08:07 +02:00
Éric Bischoff
ad95cbc542 doc: Added documentation for tunnels. 2010-08-29 16:25:31 +02:00
Aris Adamantiadis
b30aff6d4d Mark channel_read_buffer as deprecated in doxygen 2010-08-29 00:12:01 +02:00
Aris Adamantiadis
bf9a82ad9a Limit the size of packets in ssh_channel_write* 2010-08-28 23:59:18 +02:00
Aris Adamantiadis
c1efcd28f5 Fixes bug #99
returns error when no cryptographic context is available
2010-08-28 23:35:59 +02:00
Aris Adamantiadis
1fa9409554 ssh_channel_forward_* -> ssh_forward_*
Fixes bug #108
2010-08-28 23:31:07 +02:00
Aris Adamantiadis
adcd2e38e9 libsshpp: do not use deprecated functions 2010-08-28 22:53:18 +02:00
Aris Adamantiadis
c19fb5656b Fixed missing libsshpp methods 2010-08-28 22:51:23 +02:00
Aris Adamantiadis
74939b8b8d Added missing /** in doxygen @}'s 2010-08-28 21:32:08 +02:00
Aris Adamantiadis
29a229724b Fix a few documentation issues 2010-08-28 21:05:24 +02:00
Aris Adamantiadis
a9fafc32a8 Near to end of implementation of the C++ wrapper 2010-08-28 13:59:24 +02:00
Andreas Schneider
2de227a88b doc: Fixed section names. 2010-08-27 16:22:38 +02:00
Éric Bischoff
31ad140d20 doc: More work on the tutorial. 2010-08-27 16:20:17 +02:00
Aris Adamantiadis
bcf4e56fe0 Fix C++ documentation about the exceptions 2010-08-27 12:01:42 +02:00
Aris Adamantiadis
1834ca3820 Added a SSH_NO_CPP_EXCEPTIONS mode to libsshpp.h 2010-08-27 11:53:38 +02:00
Andreas Schneider
ad4a4120b7 doc: Add more details to the mainpage. 2010-08-27 11:45:13 +02:00
Andreas Schneider
0800f7ba56 doc: Added a newline on the mainpage. 2010-08-27 11:33:43 +02:00
Andreas Schneider
36576babe8 doc: Document the server responses. 2010-08-27 11:27:42 +02:00
Éric Bischoff
ba9f5b7d95 doc: Improved the tutorial. 2010-08-27 11:11:08 +02:00
Andreas Schneider
11a5383604 poll: Fixed the ssh_poll_(init/cleanup) functions. 2010-08-25 23:11:54 +02:00
Andreas Schneider
d991606493 poll: Fixed the usage of WSAPoll() on Windows.
This should fix ticket #101.
2010-08-25 23:11:54 +02:00
Aris Adamantiadis
14048354d5 Fix conflicts/ missing /** */ in doxygen 2010-08-23 21:21:57 +02:00
Eric Bischoff
94b689e19d New update of doxygen documentation 2010-08-23 21:00:35 +02:00
Aris Adamantiadis
8066100f53 Doxygen fixes 2010-08-23 20:48:30 +02:00
Aris Adamantiadis
f60c22628a lot of C++ wrapper work 2010-08-23 20:34:17 +02:00
Aris Adamantiadis
53e608cbc4 Changed SSH_SUCCESS to SSH_OK 2010-08-20 13:01:12 +02:00
Aris Adamantiadis
d10e73ffd7 Fixed "@deprecated" in doxygen 2010-08-20 13:00:10 +02:00
Aris Adamantiadis
1e75841036 Obsoletes ssh_auth_list, comment ssh_userauth_list 2010-08-19 19:51:18 +02:00
Eric Bischoff
32bf28e7ef doc: Improve the tutorial. 2010-08-19 15:06:38 +02:00
Aris Adamantiadis
fd5aeba117 Change SOversion to 4.2.0 instead of 5.0.0 2010-08-18 23:18:57 +02:00
Milo Jhoran
24b524040b server: Added an API entry for the message callback.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-13 11:17:18 +02:00
milo
e533c3f33b server: Fix missing socket close notification.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-13 11:17:09 +02:00
Aris Adamantiadis
41ab19e1d0 Log Proxycommand command executed 2010-08-10 14:32:03 +02:00
Andreas Schneider
77475bdd55 misc: Added %p for port to ssh_path_expand_escape(). 2010-08-10 11:10:26 +02:00
Milo Jhoran
0c70e80d47 Fix typos in port forwarding (server side) 2010-08-10 00:49:24 +02:00
Andreas Schneider
5aa4592f0c example: Fixed build of samplesshd. 2010-08-10 00:32:51 +02:00
milo
855b73de87 server: Split ssh_bind_accept and create ssh_handle_key_exchange.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-10 00:30:25 +02:00
Aris Adamantiadis
136f4d3b0d Removed unnecessary headers in samplesshd 2010-08-09 22:08:43 +02:00
Aris Adamantiadis
714edcb8d9 Moved content from deprecated.c to legacy.c 2010-08-09 22:05:33 +02:00
Andreas Schneider
a6b6a61775 server: Make ssh_accept a depreacted function to not break the API. 2010-08-09 21:39:32 +02:00
Andreas Schneider
39c9a6dfed server: Merge ssh_bind_accept. 2010-08-09 21:28:47 +02:00
Andreas Schneider
561df8d9a2 server: Rename ssh_accept to ssh_bind_accept. 2010-08-09 20:54:43 +02:00
milo
48a20a6137 example: Fixed the sample ssh server implementation.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:40 +02:00
milo
8ef0fbc294 server: Fixed the server implementation.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:32 +02:00
milo
51a21823f9 server: Added a define to set the server status.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:28 +02:00
milo
7a68331fcd messages: Make sure we pop the message at the beginning.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:23 +02:00
milo
d896d6393b wrapper: Added a log message if client kex is empty.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:17 +02:00
milo
6d531ed0a6 session: Set needed poll events for handling packets.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:13 +02:00
milo
06df7c1b31 socket: Make sure we only transmit data if we have some.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:06 +02:00
milo
2b108483ce pcap: Zero the pcap structure.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:54:01 +02:00
milo
23c745d335 kex: Fixed initialization of server kex.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:53:56 +02:00
milo
eb361626cb session: Added callback for the connection per session.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:53:49 +02:00
milo
b0f8ca556b session: Fixed the type of the session dh_handshake_state.
Signed-off-by: Andreas Schneider <asn@cynapses.org>
2010-08-09 20:53:03 +02:00
Andreas Schneider
e41e28744f build: Added a check for NSIS. 2010-08-03 18:13:59 +02:00
Andreas Schneider
e862f04527 build: Set a default zlib search path for windows. 2010-08-03 18:13:59 +02:00
Andreas Schneider
42519db55d build: Set a default openssl search path for windows. 2010-08-03 18:13:59 +02:00
Andreas Schneider
019cb77b84 build: Don't test for big endian on Windows.
Visual Studio 2010 has problems running the test.
2010-08-03 18:13:59 +02:00
Andreas Schneider
296f6a9217 build: Fixed the Windows preprocessor macros and defines. 2010-08-03 18:13:59 +02:00
Aris Adamantiadis
d688ed2553 Begining of zlib@openssh.org implementation 2010-07-23 16:49:28 +02:00
Aris Adamantiadis
b4c0b03694 Added the client unit testing information 2010-07-23 11:04:09 +02:00
Aris Adamantiadis
e721c122d3 Continue removing old flushing code 2010-07-23 11:01:06 +02:00
Aris Adamantiadis
8cd0d0040e Removed obsolete socket functions 2010-07-23 08:27:05 +02:00
Aris Adamantiadis
e5542b027b State error in server.c 2010-07-23 08:18:37 +02:00
Aris Adamantiadis
5aa9cf2fcf Add consistency check to ssh_set_callbacks 2010-07-23 08:09:57 +02:00
Aris Adamantiadis
a924869096 Receive and send SSH_MSG_UNIMPLEMENTED 2010-07-18 00:39:51 +02:00
Aris Adamantiadis
8c08b062d0 Fixed channel opening failures (infinite loop) 2010-07-17 23:51:15 +02:00
Aris Adamantiadis
96b06e8bb4 Fixed keepalive problem on older openssh servers
Conflicts:

	libssh/channels.c
2010-07-16 23:16:04 +02:00
Aris Adamantiadis
a8efffa969 New example for port forwarding
Conflicts:

	examples/CMakeLists.txt
2010-07-16 23:14:47 +02:00
Andreas Schneider
ef0215fcf2 poll: Added poll constants for Windows.
WSAPoll uses different constanst values as the POSIX implementation,
what else ...
2010-07-09 09:49:21 +02:00
Andreas Schneider
82beeea619 options: Added option to bind a client to an ip address.
Thanks to Donatello Boccaforno <donatello.boccaforno@gmail.com>.
2010-07-07 12:43:50 +02:00
Aris Adamantiadis
a18a3813fb Removed dead code in socket.c 2010-07-07 10:19:47 +02:00
Andreas Schneider
b8180f4069 poll: FD_SETSIZE is only for the count value of FD_SET on Windows. 2010-07-06 00:41:00 +02:00
Aris Adamantiadis
94b00cc762 Add ssh_callbacks_exists internal macro + unittest
(first commit with eclipse helios, crossing fingers ...)
2010-06-25 16:19:19 +02:00
Andreas Schneider
e4701e7c86 poll: Another attempt to get bsd_poll() working correctly. 2010-06-24 09:19:34 +02:00
Andreas Schneider
fc625b8a8e poll: Fixed building with poll-emulation on UNIX. 2010-06-24 09:19:26 +02:00
Andreas Schneider
703f125882 agent: Use the our poll typedef. 2010-06-24 09:19:10 +02:00
Andreas Schneider
4581b24b48 poll: Added a comment to the bsd_poll() implementation. 2010-06-22 14:44:35 +02:00
Andreas Schneider
1d84821d93 poll: Handle FD_SETSIZE in bsd_poll(). 2010-06-22 14:44:24 +02:00
Andreas Schneider
07f607ec4c poll: Fixed a comparsion. 2010-06-22 14:43:48 +02:00
Aris Adamantiadis
c3833c6c03 Fix threadsafety issue in zlib code 2010-06-22 12:42:13 +02:00
Aris Adamantiadis
65008e2d3c Fixes leak reports in valgrind 2010-06-21 15:47:34 +02:00
Andreas Schneider
d33a97b663 poll: Fixed a typo. 2010-06-21 15:41:18 +02:00
Andreas Schneider
6f9fea7fd5 poll: Check if maxfd has been set. 2010-06-20 21:18:46 +02:00
Andreas Schneider
c8d978f4e9 ctest: Update config file for new cdash board. 2010-06-20 10:29:25 +02:00
Andreas Schneider
558f889aae Fixed more fd checks. 2010-06-17 13:47:29 +02:00
Andreas Schneider
937268eb3e torture: Fixed fd check. 2010-06-17 13:38:13 +02:00
Andreas Schneider
8be7ece1f5 client: Fixed fd checks. 2010-06-17 13:37:42 +02:00
Andreas Schneider
6127da58f2 server: Fixed types and checks of fd's. 2010-06-17 13:29:14 +02:00
Andreas Schneider
15e4e7e9da poll: Fixed type of the fd variables and use SSH_INVALID_SOCKET. 2010-06-17 13:25:45 +02:00
Andreas Schneider
d484d4e129 channel: Fixed the type of the max fd variable in ssh_channel_select(). 2010-06-17 13:23:03 +02:00
Andreas Schneider
985019ab64 agent: Use ssh_poll in agent code. 2010-06-17 13:21:22 +02:00
Andreas Schneider
870c9a7a08 socket: Rename INVALID_SOCKET_T to SSH_INVALID_SOCKET. 2010-06-17 13:19:24 +02:00
Andreas Schneider
2a6341c08c socket: Fixed checks for max fd. 2010-06-17 13:13:35 +02:00
Andreas Schneider
78e7873e92 socket: Fixed prototype of ssh_socket_pollcallback(). 2010-06-17 13:09:58 +02:00
Andreas Schneider
7ecec3eb94 poll: Fixed brackets. 2010-06-17 12:01:27 +02:00
Andreas Schneider
f4facc4e10 poll: Fixed another wrong invalid fd check in bsd_poll. 2010-06-17 11:47:39 +02:00
Andreas Schneider
edffc2a291 poll: Some code cleanup for easier debugging. 2010-06-17 11:19:05 +02:00
Andreas Schneider
c30a25e64c poll: Fixed a malfunction with wrong max fd value check. 2010-06-17 11:16:24 +02:00
Andreas Schneider
b9a9f54c45 string: Added a function to delete a char basesd stirng object. 2010-06-11 11:05:37 +02:00
Andreas Schneider
f57d2c3277 build: Fixed building without zlib. 2010-06-11 10:43:02 +02:00
Andreas Schneider
11a1ae59f4 tests: Moved proxycommand test to client tests. 2010-06-03 16:55:45 +02:00
Andreas Schneider
cd1129b9b8 config: Use ssh log and error functions for problems. 2010-06-03 16:45:23 +02:00
Andreas Schneider
216cabc563 tests: Move getpwuid_r to a setup function. 2010-06-03 16:44:47 +02:00
Andreas Schneider
5dd4f7604f tests: Move client tests to a seperate directory.
Tests which require a running sshd should go to tests/client.
2010-06-03 12:36:00 +02:00
Andreas Schneider
94ce1ea451 tests: Fixed the misc torture test. 2010-06-03 12:29:32 +02:00
Andreas Schneider
f3697a0d5c keyfiles: Move the auth callback inside the HAVE_LIBGCRYPT ifdef. 2010-06-03 12:29:31 +02:00
Andreas Schneider
8f0d40a1dd cpp: Fixed return value of userauthAutopubkey. 2010-06-02 10:01:46 +02:00
Andreas Schneider
a138a52021 doc: Fixed ssh_path_expand_tilde documentation. 2010-06-01 23:11:00 +02:00
Andreas Schneider
518a9b8d8c doc: Group the poll functions and add a description. 2010-06-01 23:10:01 +02:00
Andreas Schneider
64ae0525cf socket: According to execle(2) environ shouldn't be const. 2010-06-01 21:50:03 +02:00
Aris Adamantiadis
dc88a937f0 Fix warning for snprintf 2010-05-31 11:19:27 +02:00
Aris Adamantiadis
ac93e2aea7 Fix unclean null termination in ~ expending 2010-05-31 11:19:10 +02:00
Andreas Schneider
560e938038 misc: Move size check down in ssh_path_expand_escape(). 2010-05-31 09:17:54 +02:00
Andreas Schneider
2a5d71971c misc: Make sure the expanded string is null-terminated. 2010-05-30 10:59:47 +02:00
Andreas Schneider
a59e65336d session: Fixed setting up default identity files. 2010-05-28 10:46:50 +02:00
Andreas Schneider
55ef7bc012 options: Make sure that we have always have default options set. 2010-05-21 10:23:19 +02:00
Andreas Schneider
d3f1d094f7 options: Set the local username if still not set. 2010-05-21 10:22:27 +02:00
Andreas Schneider
421fb2a829 keyfiles: Fixed possible problem with known_hosts path. 2010-05-21 10:08:26 +02:00
Aris Adamantiadis
517e58d3dc Fixed keyboard-interactive and unit test 2010-05-19 14:07:40 +02:00
Aris Adamantiadis
0eaa650e32 Fix authentication test 2010-05-19 11:13:47 +02:00
Aris Adamantiadis
4fbe572c02 Added verbosity flag for unit tests 2010-05-18 23:02:41 +02:00
Aris Adamantiadis
7c0ce909ed Added unit test for kbdint and password auth.
The kbdint test still doesn't pass
2010-05-18 22:49:22 +02:00
Aris Adamantiadis
f95157297e Factorize all the main functions in unit tests 2010-05-18 22:25:06 +02:00
Aris Adamantiadis
89993dd757 Fixed unittest name 2010-05-18 22:11:41 +02:00
Andreas Schneider
75e7c30594 cmake: Fixed doxygen. 2010-05-18 00:33:58 +02:00
Andreas Schneider
5032a9f13c doxygen: Fixed latex pdf generation. 2010-05-18 00:33:44 +02:00
Andreas Schneider
4f34062623 sftp: Fixed sftp_chown. 2010-05-17 23:37:11 +02:00
Andreas Schneider
255f5bd73f Install missing legacy header file. 2010-05-17 23:36:39 +02:00
Aris Adamantiadis
0ec847bbe7 Added some other junk test file 2010-05-17 20:08:11 +02:00
Aris Adamantiadis
08bc076a0a New sample that writes a lot of data on channel 2010-05-17 20:08:10 +02:00
Aris Adamantiadis
2c014256f7 Fix sftp_rename on sftp3 2010-05-17 20:08:10 +02:00
Andreas Schneider
488e822c8d poll: Added a cleanup function to free the ws2_32 library. 2010-05-17 11:19:31 +02:00
Aris Adamantiadis
2234c115f2 Separation work between openssl and libgcrypt 2010-05-14 01:22:22 +02:00
Aris Adamantiadis
b23b3f1d99 Sanitize libssh namespace + legacy wrappers 2010-05-14 00:51:08 +02:00
Andreas Schneider
46b249f5ce connect: Fixed signedness warnings from MSVC. 2010-05-12 21:01:18 +02:00
Andreas Schneider
b1b42aeb9c win: Added missing includes with newer MSCV. 2010-05-12 21:01:18 +02:00
Andreas Schneider
56c867edfa connect: Don't shadow errno. 2010-05-12 20:30:52 +02:00
Andreas Schneider
40c1a7e91f connect: Make sure that we use float values for the status. 2010-05-12 20:27:15 +02:00
Andreas Schneider
9739dae794 proxycommand: check the return values of pipe(). 2010-05-12 19:29:13 +02:00
Andreas Schneider
81793de030 Fixed building libssh with DEBUG_CRYPTO. 2010-05-12 19:24:22 +02:00
Andreas Schneider
a5157e69b1 Increment the soversion number. 2010-05-12 19:01:25 +02:00
Andreas Schneider
101a65378c Merge branch 'look' 2010-05-12 18:42:20 +02:00
Andreas Schneider
91ef298e7d Added runtime detection of WSAPoll().
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2010-05-12 18:22:09 +02:00
Andreas Schneider
739234afb9 Added the possibility to define _OPENSSL_DIR and _ZLIB_DIR. 2010-05-12 13:55:32 +02:00
Andreas Schneider
4ecefb5017 Fixed linking errors on Windows. 2010-05-12 13:53:25 +02:00
Andreas Schneider
444008aabc Fixed build of ssh_lowercase and ssh_hostport on Windows. 2010-05-12 13:47:28 +02:00
Andreas Schneider
45857bc606 Fixed windows include files in pcap support. 2010-05-12 13:39:44 +02:00
Andreas Schneider
da9b2e25f6 Fixed Windows build warnings. 2010-05-12 13:08:45 +02:00
Andreas Schneider
fc508f9494 Fixed Windows build. 2010-05-12 12:46:50 +02:00
Andreas Schneider
3573bd4d87 Use the new expand functions. 2010-05-11 09:40:33 +02:00
Andreas Schneider
c7ee14e786 Added a torture test for ssh_path_expand_escape(). 2010-05-11 02:10:55 +02:00
Andreas Schneider
fac56bae32 Added a function to expand an escaped string. 2010-05-11 02:10:55 +02:00
Andreas Schneider
c5c1698cde Added a torture test for ssh_path_expand_tilde(). 2010-05-11 02:10:55 +02:00
Andreas Schneider
4df7daec82 Added a function to expand the tilde from a path. 2010-05-11 02:10:55 +02:00
Aris Adamantiadis
26d04ff037 Fix style in ssh_poll_ctx_dopoll
Also do a rescan of polled events when a poll object has been deleted.
2010-05-10 23:19:39 +02:00
Aris Adamantiadis
5713481838 Fix options copy 2010-05-10 22:46:20 +02:00
Aris Adamantiadis
74c9c1afa9 Added code to test proxycommand
Conflicts:

	examples/sample.c
2010-05-10 22:44:06 +02:00
Aris Adamantiadis
e159f04df8 make compression not mandatory in options_getopt 2010-05-10 22:17:29 +02:00
Aris Adamantiadis
4a21b6f168 Some grammarnazi things + fix int->socket_t 2010-05-10 22:01:09 +02:00
Aris Adamantiadis
fe16cce405 Fix crash in testcase proxycommand 2010-05-10 21:50:03 +02:00
Andreas Schneider
8ba02b6f4c Use configure checks to define vsnprintf and strncpy. 2010-05-10 15:32:17 +02:00
Andreas Schneider
f5191ec222 Added configure checks for _vsnprintf_s and strncpy. 2010-05-10 15:27:40 +02:00
Andreas Schneider
144126789c Added configure checks for vsnprintf and _vsnprintf. 2010-05-10 15:24:52 +02:00
Andreas Schneider
8dcfc9849e Fixed building libssh with VC9. 2010-05-10 14:40:00 +02:00
Andreas Schneider
b28fb6654c Fixed a MSVC build error. 2010-05-10 13:18:16 +02:00
Aris Adamantiadis
9294c3284c Changed test name + test with invalid proxycommand 2010-05-10 11:08:32 +02:00
Andreas Schneider
9278dc0666 Added more defines to use secure VC functions. 2010-05-10 10:41:47 +02:00
Aris Adamantiadis
af519d73ae Fix doc and actually make the test run :) 2010-05-09 01:05:12 +02:00
Aris Adamantiadis
3a326793fd Test case for proxycommand 2010-05-09 00:54:37 +02:00
Aris Adamantiadis
f31a14b793 ssh_socket support for 2 fd + Proxyhost command 2010-05-09 00:48:10 +02:00
Aris Adamantiadis
7886326aa8 Fix u_int_x_t -> uint_x_t 2010-05-08 22:23:05 +02:00
Aris Adamantiadis
31cc03f8e6 added test for ntohll 2010-05-08 22:22:06 +02:00
Aris Adamantiadis
cf7449c525 Added tests for ssh_dirname and ssh_basename 2010-05-08 22:13:35 +02:00
Aris Adamantiadis
b0cdbf5b22 Added test for zlib compression method
Unfortunately the test doesn't pass. (my host doesn't support zlib, only zlib@openssh.com)
2010-05-07 13:51:10 +02:00
Aris Adamantiadis
231e378157 Added torture_algorithms test case
tests for all supported cipher types
2010-05-07 13:39:38 +02:00
Aris Adamantiadis
431d8fe7c7 The actual init test 2010-05-07 13:39:08 +02:00
Aris Adamantiadis
9ee4d6c697 Added torture_ssh_init unit test 2010-05-07 13:16:42 +02:00
Aris Adamantiadis
3f14d7a54a More detailed tests 2010-05-05 14:57:47 +02:00
Aris Adamantiadis
52acb3fcac Make unit test spit libssh error messages 2010-05-05 14:26:30 +02:00
Aris Adamantiadis
a8d08a9478 Fixed a typo in tutorial 2010-05-03 21:15:24 +02:00
Aris Adamantiadis
c691aa3e32 Forgot the pki files 2010-05-02 00:03:06 +02:00
Aris Adamantiadis
430e570629 Added pki.[ch] files as a new standard API for PKs
Right now it's just a wrapper to the existing calls
but soon it's gona be the effective implementation and
other calls will be wrappers.
2010-05-01 20:32:27 +02:00
Aris Adamantiadis
65dc4f1186 Match hashed [host]:port format knownhosts 2010-05-01 16:52:46 +02:00
Aris Adamantiadis
6b320a00a0 knownhosts writing and unit test 2010-05-01 12:47:44 +02:00
Aris Adamantiadis
22be109956 First implementation of known_hosts with port read 2010-05-01 00:40:10 +02:00
Aris Adamantiadis
4bb790fb5d Fix uninitialized variable used 2010-04-28 20:22:05 +02:00
Aris Adamantiadis
7d32ec5d28 Fix warnings found with clang analyzer 2010-04-28 19:36:39 +02:00
Aris Adamantiadis
20e7ec96ae Fix bugs found by clang analyzer 2010-04-28 18:43:41 +02:00
Aris Adamantiadis
2e563e0fa8 Fix documentation of MacroCheckCCompilerFlagSSP 2010-04-28 18:31:07 +02:00
Aris Adamantiadis
cbd0a8f4b5 Change the test file for stackprotector for clang
Now compiles with clang !
2010-04-28 18:01:15 +02:00
Aris Adamantiadis
ecbe577be3 Fixed warnings with clang 2010-04-28 17:23:47 +02:00
Aris Adamantiadis
84db436e3b Fix doc and libgcrypt build 2010-04-28 12:48:47 +02:00
Aris Adamantiadis
904c6ed853 Renamed private type TYPE_RSA to SSH_KEYTYPE_*
Also made this enum public
2010-04-28 12:14:03 +02:00
Aris Adamantiadis
186e07b415 Added ssh_privatekey_type public function 2010-04-28 11:51:42 +02:00
Aris Adamantiadis
4ab63d3d8c Added first unittest-based bug found :) 2010-04-27 23:48:54 +02:00
Aris Adamantiadis
696ef7aecc Added privatekey_from_file with passphrase test 2010-04-27 23:48:18 +02:00
Aris Adamantiadis
9603f2520b make torture_keyfiles silent 2010-04-27 23:28:18 +02:00
Aris Adamantiadis
a5a806f7ee Added test for privatekey_from_file 2010-04-27 23:25:21 +02:00
Aris Adamantiadis
fa294e8603 Fix select loop in sample 2010-04-24 23:22:00 +02:00
Aris Adamantiadis
97d2f755c4 Do not send twice ssh_userauth_none requests
Thanks to Xi Wang for the bug report
2010-04-24 23:01:18 +02:00
Aris Adamantiadis
83536ab7d1 Fixes \r in SSH1 banner
Thanks to Xi Wang for the patch
WARNING: this may cause backward compatibility
issues with SSH1, revert if there are problems
2010-04-24 22:47:34 +02:00
Aris Adamantiadis
6cdbc01208 Fixes infinite loops
Thanks to Xi Wang for the patches
2010-04-24 22:46:19 +02:00
Andreas Schneider
833903e8ec torture: Fix compiling options test if NSS_BUFLEN_PASSWD isn't defined.
Thanks to Xi Wang for the patch.
2010-04-20 13:30:07 +02:00
Andreas Schneider
c53383a316 session: Fixed a memory leak.
Thanks to Xi Wang for the patch.
2010-04-20 13:29:50 +02:00
Andreas Schneider
dfc35699ea packet: Fixed linking if we build without server support.
Thanks to Xi Wang for the patch.
2010-04-20 13:28:54 +02:00
Andreas Schneider
b7a7c816df kex: Fixed a memory leak.
Thanks to Xi Wang for the patch.
2010-04-20 13:28:12 +02:00
Andreas Schneider
090f036205 channels: Don't use signal as a name.
Thanks to Xi Wang for the patch.
2010-04-20 13:27:12 +02:00
Andreas Schneider
8738e93dc0 cmake: Fixed openssl detection.
Thanks to Xi Wang for the patch.
2010-04-20 13:25:46 +02:00
Aris Adamantiadis
ee2bee88ee Fix warnings 2010-04-14 21:20:42 +02:00
Aris Adamantiadis
6ffd38d25e Fix doublefree happening after a negociation error
Fix the cherry-pick merge
Conflicts:

	libssh/client.c
2010-04-14 21:14:32 +02:00
Aris Adamantiadis
250273cf1a Do not compile aes*-ctr with <=OpenSSL 0.9.7b 2010-04-14 21:11:29 +02:00
Aris Adamantiadis
bc15f7b7aa Fix missing string_data() in crypto debug code 2010-04-14 21:11:19 +02:00
Aris Adamantiadis
7c3040c624 First experiment at trying to make libssh c89 2010-04-07 13:20:30 +02:00
Andreas Schneider
c584b55488 Added the copyright policy to the README. 2010-04-07 11:29:47 +02:00
Ruben Garcia Azuara
5a2abd34ce Added support for StrictHostKeyChecking and UserKnownHostsFile parameters.
Added OpenSSH parameters to libssh:
  - StrictHostKeyChecking
  - UserKnownHostsFile

This parameters are useful to avoid checking the fingerprint. Eg:

~/.ssh/config:
    Host 192.10.20.30
    StrictHostKeyChecking no
    UserKnownHostsFile /dev/null

Signed-off-by: Ruben Garcia Azuara <rubenga@tid.es>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2010-04-07 11:29:47 +02:00
Ruben Garcia Azuara
14eb593af3 Fixed solaris compilation warning and ignore case at host parameter.
- Suppress compilation warning in solaris caused by a comma at the end of
    the last value.
  - Ignore case at host parameter in config file

Signed-off-by: Ruben Garcia Azuara <rubenga@tid.es>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2010-04-07 11:29:47 +02:00
Aris Adamantiadis
b2b7bc3b77 Fix building on win32/vs7 2010-04-06 23:24:25 +02:00
Andreas Schneider
fddbf1f94c Added a select(2) based poll-emulation if poll(2) is not available. 2010-04-04 17:38:50 +02:00
Andreas Schneider
5d5f6cc60c Fixed the group of the pcap functions. 2010-04-04 17:38:50 +02:00
Andreas Schneider
ae64c19f20 Fixed the group of the server functions. 2010-04-04 17:38:50 +02:00
Andreas Schneider
e5abc065aa Fixed the documentation of the scp functions. 2010-04-04 17:37:05 +02:00
Andreas Schneider
4ce265b105 Fixed the documentation of the SSH messages. 2010-04-04 17:37:05 +02:00
Andreas Schneider
154e99f2ba Fixed the documentation of channels.c. 2010-04-04 17:37:05 +02:00
Andreas Schneider
dab450be32 Fixed the doxygen group of the libssh c++ wrapper. 2010-04-04 17:37:05 +02:00
Andreas Schneider
a3db621899 Fixed documentation of socket functions. 2010-04-04 15:51:54 +02:00
Andreas Schneider
e26c6d20fe Fixed documenation of ssh_select(). 2010-04-04 15:51:54 +02:00
Andreas Schneider
a75a2bf533 Fixed documentation of dh functions. 2010-04-04 15:51:54 +02:00
Andreas Schneider
8dcfc3c94a Fixed the documentation of the client code. 2010-04-04 15:51:54 +02:00
Andreas Schneider
19c4027194 Fixed the group of the options. 2010-04-04 15:51:54 +02:00
Andreas Schneider
0efd50df26 Fixed the documentation of key functions. 2010-04-04 15:51:54 +02:00
Andreas Schneider
a127c8827a Fixed the documentation of log.c 2010-04-04 15:51:54 +02:00
Andreas Schneider
dcb5a81735 Fixed the documentation of misc.c 2010-04-04 15:51:54 +02:00
Andreas Schneider
4abdf47923 Fixed the documentation of error.c 2010-04-04 15:51:54 +02:00
Andreas Schneider
d39dce85b4 Fixed the documentation of buffer.c 2010-04-04 15:51:54 +02:00
Andreas Schneider
e736725d35 Fixed the documentation of auth.c 2010-04-04 15:51:54 +02:00
Andreas Schneider
d61a699543 Removed the unneeded dependency to doxygen. 2010-04-04 15:51:54 +02:00
Andreas Schneider
320b6c0cd8 Added an improved version of UseDoxygen.cmake which handles trac doc. 2010-04-04 14:10:10 +02:00
Andreas Schneider
7cf05075a0 Added a doxygen configuration for trac. 2010-04-04 14:10:00 +02:00
Andreas Schneider
3e0959fa1b Fixed config parsing wich has overwritten user specified values. 2010-04-04 14:03:44 +02:00
Andreas Schneider
d87b29b678 Fixed Check cmake module. 2010-03-29 23:20:59 +02:00
Andreas Schneider
2c16a3c0e8 Fixed ZLIB cmake module. 2010-03-29 23:20:43 +02:00
Andreas Schneider
dc3d9bb2ab Fixed GCrypt find module. 2010-03-29 23:20:22 +02:00
Andreas Schneider
fd4ed3909e Fixed OpenSSL find module. 2010-03-29 23:14:04 +02:00
Andreas Schneider
3f29a3d4fa Fixed a build warning in sftp. 2010-03-29 23:13:39 +02:00
Andreas Schneider
1a894b65d4 Fixed build warning in the sshd example. 2010-03-29 22:47:22 +02:00
Andreas Schneider
6e82193175 Fixed build warnings of the scp example. 2010-03-29 22:46:03 +02:00
Andreas Schneider
32ac1e04ec Fixed build warnings of the ssh client example. 2010-03-29 22:44:20 +02:00
Andreas Schneider
a47a9ecad1 Fixed build warnings in the knownhosts example. 2010-03-29 22:38:38 +02:00
Andreas Schneider
d07aef725e Fixed build warnings in the exec example. 2010-03-29 22:38:21 +02:00
Andreas Schneider
b5eb08ad09 Fixed the torture_keyfiles test. 2010-03-28 23:46:56 +02:00
Aris Adamantiadis
3ce7d7a28c Workaround for check linkage on ubuntu amd64 2010-03-28 23:17:13 +02:00
Aris Adamantiadis
9da13d4ff8 Fixes the broken algorithm choice for server 2010-03-28 21:59:11 +02:00
Aris Adamantiadis
7d49e49e74 Fix crash when no callback is defined 2010-03-28 21:58:59 +02:00
Andreas Schneider
0689304cff Fixed build warnings on Windows. 2010-03-25 16:48:30 +01:00
Andreas Schneider
8dd4972fda Fixed a build warning. 2010-03-25 15:30:56 +01:00
Andreas Schneider
51436cc3a3 Fixed a build warning in ssh_userauth_autopubkey. 2010-03-25 15:30:23 +01:00
Andreas Schneider
b168b8f03f Fixed a typo that we don't export all symbols. 2010-03-25 14:04:13 +01:00
Andreas Schneider
9e9e7e95ee Fixed spelling. 2010-03-25 13:46:09 +01:00
Andreas Schneider
c805f0cdcb Fix revision. 2010-03-25 13:42:30 +01:00
Andreas Schneider
e4bbba2b15 Added comments to the so version to increment it correctly in future. 2010-03-25 13:26:37 +01:00
Andreas Schneider
3a5af7fb61 Build examples only on the Linux plattform. 2010-03-17 10:12:03 +01:00
Andreas Schneider
34f2d50e29 Require check if testing is enabled. 2010-03-15 16:09:16 +01:00
Andreas Schneider
40d0ca7963 Added options for memcheck and coverage.
Disable it by default as only one machine should do this.
2010-03-15 16:09:05 +01:00
Andreas Schneider
095f348172 Added a ctest script for nightly builds. 2010-03-13 21:17:59 +01:00
Andreas Schneider
67c062e45e Added a valgrind suppression file to ignore check errors. 2010-03-13 17:10:53 +01:00
Andreas Schneider
4516e7bdcb Fixed a memory leak in the torture_get_user_home_dir test. 2010-03-13 16:59:26 +01:00
Andreas Schneider
90d72c214e Fixed the torture_pubkey_generate_from_privkey test. 2010-03-13 16:51:52 +01:00
Andreas Schneider
8fd6c8bc02 Fixed a memory leak in keyfile torture test. 2010-03-13 16:38:43 +01:00
Andreas Schneider
863cd6fcba Added a CTestConfig file to be able to submit to the dashboard. 2010-03-13 14:59:29 +01:00
Andreas Schneider
38fda265e8 Fixed a memory leak in ssh_try_publickey_from_file. 2010-03-13 14:59:02 +01:00
Andreas Schneider
72058bfbcc Added tests for ssh options. 2010-03-13 14:21:23 +01:00
Andreas Schneider
74e23a7fa2 Added missing SSH_OPTIONS_FD option. 2010-03-13 14:21:01 +01:00
Andreas Schneider
6372f671ed Remove support for SSHv1 Cipher variable. 2010-03-12 19:01:50 +01:00
Andreas Schneider
8501ca2ea0 Added some tests for ssh_list. 2010-03-06 12:55:56 +01:00
Andreas Schneider
1264557f0e Added a test for keyfiles.c. 2010-03-04 20:41:21 +01:00
Andreas Schneider
f34cd24f80 Fixed and added support for several identity files. 2010-03-04 20:41:17 +01:00
Andreas Schneider
9cd5e97596 Fixed linking of the tests. 2010-03-04 20:08:04 +01:00
Andreas Schneider
9f59be3224 Rename ssh_list_add to ssh_list_append. 2010-03-04 20:08:04 +01:00
Andreas Schneider
dea644bbd6 Added a prepend function for ssh_list. 2010-03-04 20:08:04 +01:00
Andreas Schneider
8bcb835aa4 Fixed unit testing. 2010-03-02 23:49:21 +01:00
Andreas Schneider
eec3532955 Simplify the build option output. 2010-03-02 23:37:49 +01:00
Andreas Schneider
8424c7a747 Fixed sftp_parse_longname() on Windows.
There is no strndup function on Windows.
2010-03-02 14:15:20 +01:00
Andreas Schneider
464176d511 Added unit testing support using check. 2010-03-02 13:54:14 +01:00
Aris Adamantiadis
e8a1d135e2 Fix a race condition bug in ssh_scp_close()
Conflicts:

	libssh/scp.c
2010-03-01 20:00:02 +01:00
Aris Adamantiadis
b707b5e2a4 Answer to openssh's keepalives 2010-03-01 18:54:52 +01:00
Aris Adamantiadis
c987fd8c53 renamed ssh_list_get_head to ssh_list_pop_head 2010-03-01 18:11:40 +01:00
Aris Adamantiadis
d083554dff Fixed documentation in scp code 2010-02-26 18:48:38 +01:00
Andreas Schneider
ec3af2c5cb Added printout of owner and group in the sftp example. 2010-02-24 00:27:02 +01:00
Andreas Schneider
f857d4aff7 Fixed longname parsing, this only workings with readdir. 2010-02-24 00:26:51 +01:00
Andreas Schneider
39d6ef884a Added owner and group information in sftp attributes.
Parse the longname which is the output of 'ls -l' and set the owner and
group if we are talking to an openssh server.
2010-02-23 22:50:43 +01:00
Andreas Schneider
492d1f24c8 Set CFLAGS correctly. 2010-02-13 12:47:28 +01:00
Aris Adamantiadis
60e5a32d27 Small doc fix 2010-02-12 23:29:24 +01:00
Aris Adamantiadis
f8d0055503 More C++ work 2010-02-12 22:17:50 +01:00
Aris Adamantiadis
8baaf64a72 Fix compilation of opensolaris 2010-02-12 10:08:54 +01:00
Andreas Schneider
6ae69e0df0 Try zlib compression and fallback to none if not available. 2010-02-11 23:27:25 +01:00
Aris Adamantiadis
92ca76721a More C++ wrapper work.
Wrote stubs of functions needed in the wrapper
Created an Exception class which greatly simplifies
the use of libssh in C++
2010-02-11 23:08:07 +01:00
Aris Adamantiadis
6af2e3fc10 Fix closesocket() portbug for win32 2010-02-11 22:42:28 +01:00
Aris Adamantiadis
9bec3ee48e Use closesocket in server.c for win32
Resolves #56
2010-02-11 19:56:23 +01:00
Aris Adamantiadis
17ca9d9da7 Make better error messages for SSH1 errors 2010-02-10 18:20:21 +01:00
Aris Adamantiadis
c1711243f0 aes192-ctr and aes256-ctr working on libcrypto 2010-02-09 22:29:43 +01:00
Aris Adamantiadis
fdfd12716e aes128-ctr aes192-ctr aes256-ctr for libgcrypt 2010-02-09 22:24:04 +01:00
Aris Adamantiadis
dc0d945f28 Added aes128-ctr support for libcrypto (openssl) 2010-02-09 21:21:11 +01:00
Aris Adamantiadis
96465a52ee KEX bug: client preference should be prioritary 2010-02-09 21:20:17 +01:00
Aris Adamantiadis
512fa6e601 Added summary of build options in Cmake 2010-02-08 16:55:03 +01:00
Andreas Schneider
12d43e2967 Rename the libssh sftp documentation group. 2010-02-07 22:36:03 +01:00
Andreas Schneider
e8648416b8 Describe the main group a bit. 2010-02-07 22:36:03 +01:00
Andreas Schneider
b971834d10 Respect known_hosts file set by the user.
Thanks to contact@leblanc-simon.eu for the patch.
2010-02-07 22:35:38 +01:00
Andreas Schneider
94ee9effe6 Improve the SSH string documentation. 2010-02-07 21:50:38 +01:00
Aris Adamantiadis
81bc13e066 Expend macros in doxygen generation 2010-02-06 23:49:41 +01:00
Andreas Schneider
1297da380e Improve the session documentation. 2010-02-05 18:34:39 +01:00
Andreas Schneider
4ee3b28ecb Update the doxygen config. 2010-02-05 18:34:13 +01:00
Andreas Schneider
757f8a6323 Set the soversion to 4.1 as we didn't break something.
yet?
2010-02-05 12:34:20 +01:00
Andreas Schneider
a25b06ecfc Increase version number. 2010-02-05 12:07:50 +01:00
Aris Adamantiadis
6b703b8d6a Update c++ prototypes 2010-02-02 18:30:26 +01:00
Aris Adamantiadis
c97d0d1220 add missing leave_function() 2010-02-02 18:20:23 +01:00
Aris Adamantiadis
7520d9c7b9 Handle timeout correctly 2010-02-02 18:16:46 +01:00
Vic Lee
2577214517 The ssh_message object needs to be freed after processing in channel_accept().
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2010-02-01 17:26:50 +01:00
Aris Adamantiadis
8e7bd43016 Fix compilation without WITH_SSH1 2010-01-30 20:36:00 +01:00
Aris Adamantiadis
e7b74c57f3 Hacked SSH1 to get past authentication
Also resolved some bugs that may impact 0.4. need to check
2010-01-25 23:23:01 +01:00
Aris Adamantiadis
cfdd4296a8 Fix poll not waking up on connect on win32
Under windows, poll does not detect connected socket using
POLLOUT but POLLWRNORM.
"Pending connect requests are indicated in the returned revents member of WSAPOLLFD structure by POLLWRNORM."
http://msdn.microsoft.com/en-us/library/ms741669%28VS.85%29.aspx
However, I did not test that fix. (no windows at hands). I also don't know
if the poll emulation layer works with that too.
2010-01-25 19:48:38 +01:00
Aris Adamantiadis
3407509ed7 Correctly handle channel failures and chan states 2010-01-24 23:03:56 +01:00
Aris Adamantiadis
3ac62dda51 Made packet handlers independant of session buffer 2010-01-24 22:43:52 +01:00
Aris Adamantiadis
3465b592e7 Few function name changes 2010-01-24 22:30:43 +01:00
Aris Adamantiadis
ca499a5495 Made ssh_packet_read asynchronous
Normally that's all that was needed into making SSH1 compliant
with the new API.
Beware, I have only implemented it, not actually tested it.
2010-01-24 22:27:44 +01:00
Aris Adamantiadis
8a1d832f80 Removed last calls to packet_read 2010-01-24 22:08:20 +01:00
Aris Adamantiadis
758df26582 Made parts of SSH asynchronous (inc kex1) 2010-01-24 21:03:03 +01:00
Aris Adamantiadis
6ae558b541 Beginning of async solution for SSH1 2010-01-24 01:07:08 +01:00
Aris Adamantiadis
68f53540df Move SSH-1 specific packet functions in packet1.c 2010-01-23 22:59:10 +01:00
Aris Adamantiadis
48ba9c9bc1 stub of C++ wrapper for libssh 2010-01-21 21:54:20 +01:00
Aris Adamantiadis
245deb2abe Fixed error message when connection failed 2010-01-16 18:47:32 +01:00
Aris Adamantiadis
549ea0d7ba Fix SSH1 related warning 2010-01-16 18:38:49 +01:00
Aris Adamantiadis
94d1112c55 SSH-1 cleanup and compile
Not tested, probably not working correctly yet
2010-01-10 21:05:46 +01:00
Aris Adamantiadis
0c47227144 Fix typo in build_make script 2010-01-10 20:07:37 +01:00
Aris Adamantiadis
a2505078da Set socket blocking after connexion 2010-01-08 23:28:55 +01:00
Aris Adamantiadis
35532a63fe Enforce NULL ptr verification in scp.c 2010-01-08 23:14:10 +01:00
Aris Adamantiadis
514ab6eed2 Fixed blocking bug in channel_poll 2010-01-08 23:05:10 +01:00
Aris Adamantiadis
c41e3a8e68 Cosmetics for packet numbering 2010-01-08 22:49:16 +01:00
Aris Adamantiadis
7d71340241 Oops, forgot the callback for server DH 2010-01-08 22:37:18 +01:00
Aris Adamantiadis
40bcc0bed8 No more packet_read2() ! 2010-01-08 22:33:58 +01:00
Aris Adamantiadis
74009e2be5 Prefix message_new with ssh_ 2010-01-08 22:28:40 +01:00
Aris Adamantiadis
40871ab1cc Prefix message_handle_channel_request with ssh_ 2010-01-08 22:27:16 +01:00
Aris Adamantiadis
2fc4c7e335 Dequeue the processed messages 2010-01-08 22:25:26 +01:00
Aris Adamantiadis
da8263b3f6 Renamed message_queue to ssh_message_queue 2010-01-08 22:16:00 +01:00
Aris Adamantiadis
12db7c4bc1 Merged the channel_request hdlrs and clean hdlrs 2010-01-08 22:14:31 +01:00
Aris Adamantiadis
db3ef37771 ssh_packet_userauth_request with new system 2010-01-08 21:09:40 +01:00
Aris Adamantiadis
7f32558e08 Converted message handlers to new system 2010-01-07 22:41:38 +01:00
Aris Adamantiadis
228ac78397 Changes to messages for async message handling 2010-01-07 22:02:21 +01:00
Aris Adamantiadis
b6656a1525 Removed packet_wait for SSH2 2010-01-06 22:53:10 +01:00
Aris Adamantiadis
84ec17964e Made the server DH asynchronous.
It still needs testing and cleanup, it was done with less
care than the client-side.
The socket listening and connexion is still synchronous
2010-01-06 22:49:40 +01:00
Aris Adamantiadis
ef5dc6cd2b Add support for async global requests
Normally the infamous packet_wait() synchronous call
is gone in all SSH2 client code.
2010-01-06 21:48:44 +01:00
Aris Adamantiadis
84e6aca5c5 Fixed typos from a* to error.c 2010-01-06 21:12:00 +01:00
Aris Adamantiadis
ebd0987376 Fix build when WITH_SSH1 undefined 2010-01-06 13:34:56 +01:00
Aris Adamantiadis
20baf4f5b6 Part of kex.c is SSH-1 specific 2010-01-03 23:38:37 +01:00
Aris Adamantiadis
335a0fe768 Remove some references to packet_wait() 2010-01-03 23:36:06 +01:00
Aris Adamantiadis
b25ebf4bdb Removed channel_handle now unused function 2010-01-03 23:23:56 +01:00
Aris Adamantiadis
804bb44eda Channel requests are asynchronous
Exec example also runs perfectly now.
2010-01-03 23:16:14 +01:00
Aris Adamantiadis
1b15896e8b Fix infinite loop in exec example 2010-01-03 23:15:55 +01:00
Aris Adamantiadis
055fbe1d87 Explicitely use the packet buffer arg in channels 2010-01-03 22:34:48 +01:00
Aris Adamantiadis
648e5d62ba Some work for async channel requests 2010-01-03 22:14:21 +01:00
Andreas Schneider
49de20aa5c Fixed cmake warning.
There is no CMakeLists.txt in tests and we don't build something
in the root CMakeLists.txt.
2009-12-30 19:08:03 +01:00
Vic Lee
13d534e89a Add pkg-config file libssh.pc
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-12-30 19:05:48 +01:00
Vic Lee
1944dc8b5f Add new API function ssh_userauth_privatekey_file().
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-12-30 19:05:37 +01:00
Vic Lee
f2ca2d50b5 In ssh_userauth_pubkey, if publickey argument is NULL, generate it from privatekey.
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-12-30 19:05:29 +01:00
Aris Adamantiadis
b361fb5898 Fix use-without-initialization 2009-12-28 22:29:50 +01:00
Aris Adamantiadis
8d1faa0dbc Made channel_open_session partially asynchronous 2009-12-27 00:06:34 +01:00
Aris Adamantiadis
77baa2df15 Fix a few log strings and levels in auth.c 2009-12-26 22:12:08 +01:00
Aris Adamantiadis
a229cb4676 Asynchronous authentication works ! 2009-12-26 21:59:37 +01:00
Aris Adamantiadis
682ed18123 New packet handler for SSH_USERAUTH_BANNER 2009-12-26 20:24:07 +01:00
Aris Adamantiadis
3aae59c224 Fix tricky bug within packet decoding 2009-12-26 17:03:27 +01:00
Aris Adamantiadis
6f3505bf6b Asynchronous service request 2009-12-26 16:51:33 +01:00
Aris Adamantiadis
bfdc48e320 Simplification of the "exec" sample 2009-12-24 10:46:46 +01:00
Vic Lee
fcda8beb1c File handle need to be closed in case of errors in privatekey_from_file
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-12-23 09:37:35 +01:00
Andreas Schneider
d0647afae5 Added an example for exec. 2009-12-22 18:34:23 +01:00
Aris Adamantiadis
a6383cec51 Fix typos in doc 2009-12-22 10:20:19 +01:00
Vic Lee
44fd5ff451 Added private key type detection feature in privatekey_from_file
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-12-22 09:02:10 +01:00
Andreas Schneider
ea34f37d43 Generate the APPLICATION_VERSION. 2009-12-21 15:56:21 +01:00
Andreas Schneider
23dcc2c7f3 Fixed ssh_get_user_home_dir() to be thread safe. 2009-12-21 12:32:58 +01:00
Aris Adamantiadis
91f7d127ea Tutorial doxyginized and updated up to auth sect. 2009-12-20 23:21:59 +01:00
Aris Adamantiadis
43c1245396 Some options functions did not show up in doxygen 2009-12-20 20:23:58 +01:00
Aris Adamantiadis
43288bc4f2 added ssh_message_auth_reply_pk_ok_simple 2009-12-20 18:51:37 +01:00
Aris Adamantiadis
2e22d6ef99 Add key validation in server side authentication 2009-12-20 18:05:02 +01:00
Andreas Schneider
6509b6e742 Started to add the tutorial to doxygen. 2009-12-19 00:31:47 +01:00
Aris Adamantiadis
d2ce0042b3 Deleted obsolete doxygen files 2009-12-19 00:10:54 +01:00
Aris Adamantiadis
0dcb63ff5e Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-12-19 00:10:13 +01:00
Andreas Schneider
bebbac1bd8 Improved doxygen output of ssh_options_set(). 2009-12-19 00:08:54 +01:00
Aris Adamantiadis
a1870a62cf Documentation callbacks.h + standardization 2009-12-18 23:56:59 +01:00
Andreas Schneider
1ef1a77421 Disabled caller graphs as they are only of internal interest. 2009-12-18 23:54:31 +01:00
Andreas Schneider
98819f92e3 Updated the doxygen file. 2009-12-18 23:41:25 +01:00
Andreas Schneider
ebce70eba1 Fixed documentation of buffer struct. 2009-12-18 23:41:01 +01:00
Andreas Schneider
ed257b982a Fixed documentation of ssh_options_copy(). 2009-12-18 23:38:27 +01:00
Andreas Schneider
1b7877f6ed Moved the doxygen mainpage to doc/mainpage.dox 2009-12-18 23:35:41 +01:00
Andreas Schneider
7500b0564c Document the callback structure correctly. 2009-12-18 23:19:37 +01:00
Andreas Schneider
0c992ece3b Added a mainpage to doxygen. 2009-12-18 23:12:47 +01:00
Andreas Schneider
e124249a8b Fixed the doxygen documentation. 2009-12-18 23:12:37 +01:00
Aris Adamantiadis
d950d6af52 Optional compilation of developper's doc 2009-12-16 23:19:18 +01:00
Aris Adamantiadis
55abcfeef6 These docs are outdated too 2009-12-15 23:53:28 +01:00
Aris Adamantiadis
49b3712891 Stub for doxygen main documentation 2009-12-15 23:50:16 +01:00
Aris Adamantiadis
b9a8b22728 Doxygen now outputs on stderr, inputs from doc/ 2009-12-15 23:48:51 +01:00
Aris Adamantiadis
65f8e86e41 Deleted obsolete documentation draft 2009-12-15 23:37:53 +01:00
Aris Adamantiadis
9780f22866 Made packet_wait issue warnings 2009-12-13 20:49:47 +01:00
Aris Adamantiadis
46b2b99f63 Fix strange error message in sample authentication 2009-12-13 19:53:32 +01:00
Aris Adamantiadis
c92f54102e Key exchange currently done asynchronously
Fixed an important bug in packet buffering (two packets received in the same recv would'nt be processed correctly)
2009-12-13 18:20:05 +01:00
Aris Adamantiadis
964d5f88cc ssh_poll_handle detaches from context before free 2009-12-13 17:04:23 +01:00
Aris Adamantiadis
ad7e9d88fb packet SSH_KEXINIT received and parsed
Resolved some bugs in the callback mechanism as well
2009-12-12 00:23:53 +01:00
Aris Adamantiadis
3ace7817b4 Async connection + banner fetch is working 2009-12-11 23:26:25 +01:00
Aris Adamantiadis
0de35ca8f0 Fix logging problem in match_known_host 2009-12-11 21:23:52 +01:00
Aris Adamantiadis
80b6cf77b0 Added a global poll context 2009-12-11 21:11:23 +01:00
Andreas Schneider
79b4bf4ac2 Don't install crypto.h which is an internal header file. 2009-12-10 13:55:42 +01:00
Aris Adamantiadis
ab6b510408 More doxygen stuff 2009-12-09 20:27:10 +01:00
Aris Adamantiadis
ab52ca01ad Resolving doxygen errors in internal mode 2009-12-09 19:53:58 +01:00
Aris Adamantiadis
64b72f8d3a Fix some doxygen errors 2009-12-09 19:43:16 +01:00
Andreas Schneider
ffc9806e6d Remove socklen_t definition.
Tthe problem is that winsock2.h defines socklen_t as a typedef, not as a
define, so depending on the order of includes you can get errors in
ws2tcpip.h with msvc.
2009-12-09 13:02:48 +01:00
Aris Adamantiadis
984fb41b98 Moved #defines into an enum 2009-12-06 23:47:58 +01:00
Aris Adamantiadis
a1e05c62ae struct socket -> struct ssh_socket_struct +typedef 2009-12-06 22:48:56 +01:00
Aris Adamantiadis
076e884873 More callback stuff in connection
I have coded it, not actually tested it :) It still needs
work to get past the banner exchange.
2009-12-05 15:05:02 +01:00
Aris Adamantiadis
2f6fbbd706 Trying to adapt client.c to use callbacks 2009-12-03 23:55:46 +01:00
Aris Adamantiadis
4924ac8099 Asynchronous sockets work !
Still need a bit of tuning but it's stable enough
for our current needs
2009-12-01 23:34:55 +01:00
Andreas Schneider
7962029bdc Fixed indent. 2009-12-01 16:59:41 +01:00
Andreas Schneider
f83f837de7 Added gettimeofday for Windows.
Thanks to Patrick Spendrin.
2009-12-01 16:57:49 +01:00
Andreas Schneider
48b719cf68 Fixed uint* to work on Windows.
Thanks to Patrick Spendrin.
2009-12-01 16:15:54 +01:00
Aris Adamantiadis
96afa4530c More logging 2009-11-30 23:56:21 +01:00
Aris Adamantiadis
270a8a26fa Fix stupid bug which stops log_verbosity working 2009-11-30 23:55:02 +01:00
Aris Adamantiadis
92a50f731c Socket connect callback working...
Still need to make sure the connect syscall is correctly
called
2009-11-30 23:44:40 +01:00
Aris Adamantiadis
76d6838223 Some brain surgery to add event-based sockets
chapter 1- SSH Socket Connections.
I would like to be able to
-Have a ssh_poll_ctx object
-Add a ssh socket over it
-launch the socket connection (using socket functions)
-ssh_poll_ctx_dopoll()
-Wait for the timeout or have the "connected" callback called
2009-11-30 22:35:43 +01:00
Aris Adamantiadis
0bfb9d476c Standardize callbacks style and add documentation 2009-11-29 22:51:14 +01:00
Aris Adamantiadis
91bb1b2de6 Squashed commit of the following:
commit 43fad8dfd977637c31fade76ace2905f6528c3bc
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Fri Nov 27 18:39:06 2009 +0100

    adaptation to the new ssh_poll_handle object name

commit 1e5e6ac4605adf10d437d04f0fd4b7e66024853c
Merge: 3fd92a0... 810adad...
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Fri Nov 27 18:33:06 2009 +0100

    Merge branch 'master' into badcode/libssh_async

commit 3fd92a08eb74b1447a9ff4ca4e1d137475c62cc6
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Mon Nov 2 14:25:46 2009 +0100

    Compiles again

commit 8910d7b9692418c9ccea0234f6d49674d238dc16
Merge: e83f1b5... cce34a6...
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Mon Nov 2 12:47:34 2009 +0100

    Merge branch 'master' into libssh_async

    Very big merge !

    Conflicts:
    	include/libssh/callbacks.h
    	include/libssh/priv.h
    	libssh/channels.c
    	libssh/messages.c
    	libssh/packet.c
    	libssh/server.c
    	libssh/session.c
    	libssh/socket.c

commit e83f1b593219e183082b015315f09bfe95a29cfc
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Mon Nov 2 12:07:01 2009 +0100

    rename callback.h

commit dffa7b730e8f39e2198de18ab69a8e57bef95e58
Merge: 5a8b748... de8808c...
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Tue Sep 15 10:50:07 2009 +0200

    Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh into libssh_async

commit 5a8b7484f36599d28f2c0c14a23b76bfc7257638
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Sun Sep 13 12:55:18 2009 +0200

    More updates to callback system

commit 18620c20d5e4e62107093f7fd330e553493253fa
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Sat Sep 12 22:26:52 2009 +0200

    Same thing with channel_rcv_data

commit fc4a56f6726e409a5866272923f1cbebfc821af3
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Sat Sep 12 22:17:45 2009 +0200

    added a few packet handlers for channels

commit 4b6bb4fd00b10cf1321a764126f277ab204bffe3
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Fri Sep 11 23:15:25 2009 +0300

    sample packet handlers + bugfixes

commit 2784d09d6dec0a8f868912d14f90d860233b3f82
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Fri Sep 11 20:30:50 2009 +0300

    Packet callbacks nearly finished

    Need tests and implementation of some packet callbacks

commit cd3ea43f20c9ae2f54576ca98a0ea75c5d4299d3
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Thu Sep 10 12:46:02 2009 +0300

    First step of async packet handling

    The socket to packet handler is nearly done (needs testing)
    I still need to define the interface for callbacks.

commit 487f4d2a900a5fe3b90ceda4460ab7d38d7ad722
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Tue Sep 8 23:24:09 2009 +0300

    Almost complete socket callback system

    Finished the callback function so it bufferizes data when
    callee does not use it.
    Flushes the buffer automaticaly after a ssh_socket_nonblocking_flush

commit 23571f22fac9e40c855dfa99569bba181a39648b
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Date:   Tue Sep 8 22:22:32 2009 +0300

    First draft of a callback system
2009-11-27 20:42:43 +01:00
Aris Adamantiadis
810adadf2e Compile with pcap support by default
This will permit to get pcap debugging out of the box
2009-11-27 18:18:12 +01:00
Aris Adamantiadis
8da712ea61 Compile in stub for pcap funcs when pcap disabled
Avoid that way linking problems
2009-11-27 18:16:10 +01:00
Aris Adamantiadis
56cfb8036f Build the pcap code into example in all cases 2009-11-27 18:08:53 +01:00
Andreas Schneider
f332dd810e Added changelog entries for 0.4 rc2. 2009-11-20 16:11:17 +01:00
Andreas Schneider
d1c6fa9261 Build the pcap source only if enabled. 2009-11-19 09:33:06 +01:00
Aris Adamantiadis
b00e2ad40e Fix compile bug introduced by another bugfix 2009-11-18 20:54:39 +01:00
Aris Adamantiadis
ca9f42a20f Fix another memleak
Use buffer_free instead of SAFE_FREE
2009-11-18 20:53:06 +01:00
Andreas Schneider
e939786836 Fixed possible doulbe free problem found by Bernhard R. Link. 2009-11-18 15:35:15 +01:00
Andreas Schneider
11cc5f5815 Added more error messages and checking to handle_channel_request. 2009-11-18 14:56:12 +01:00
Andreas Schneider
d60b1ec1a2 Fixed a memory leak in channel_new() if we have an error. 2009-11-18 10:30:01 +01:00
Aris Adamantiadis
ae11589205 Pcap: more cleanup and minimalist API 2009-11-16 23:20:16 +01:00
Aris Adamantiadis
70b9475449 Pcap: Fix bug with non-encrypted incoming packets 2009-11-16 22:53:22 +01:00
Aris Adamantiadis
02aecc1278 Improved pcap dumping support 2009-11-16 22:36:31 +01:00
Andreas Schneider
3e90a11599 Improve standard logging. 2009-11-12 12:52:05 +01:00
Andreas Schneider
b4095189d7 Fixed setting the timeout and ssh2 and ssh1 option. 2009-11-12 12:50:31 +01:00
Andreas Schneider
c0b4c4d60c Fixed setting the log verbosity. 2009-11-12 11:44:36 +01:00
Andreas Schneider
12da24c056 Added an option to set log verbosity as string. 2009-11-10 09:12:07 +01:00
Andreas Schneider
d821117033 Always use the poll-emulation on Windows.
Until we we have a solution to use WSAPoll only on Vista and newer.
2009-11-09 20:13:27 +01:00
Aris Adamantiadis
30266f7627 Added explanation in ssh_silent_disconnect doxygen 2009-11-09 13:24:47 +01:00
Aris Adamantiadis
10b625e180 First lines of experimental pcap output support
This will serve to debug packets right under wireshark !
2009-11-08 23:42:41 +01:00
Aris Adamantiadis
10f27457d3 Add an other (simplier ?) polling method to sample 2009-11-08 20:00:23 +01:00
Aris Adamantiadis
af1f431364 change buffer size in sample.c 2009-11-07 17:35:24 +01:00
Aris Adamantiadis
272a4d1e45 Refactorize sample.c 2009-11-07 17:23:06 +01:00
Aris Adamantiadis
3a95ecfe74 move authentication out of sampe.c 2009-11-07 03:45:27 +01:00
Aris Adamantiadis
14ae9a7f0c Moved sftp parts into a new example 2009-11-06 19:21:18 +01:00
Aris Adamantiadis
51f1918109 Update structures name to new convention
SSH_POLL* -> ssh_poll_handle,
SSH_POLL_CTX* -> ssh_poll_ctx
2009-11-06 18:52:49 +01:00
Andreas Schneider
fa27956daf Improve MSVC support. Better binary compatibility.
Patch by Patrick Spendrin from KDE.
2009-11-06 09:57:09 +01:00
Aris Adamantiadis
ab0d8a3828 A few test cases for benchmarks 2009-11-05 18:18:35 +01:00
Andreas Schneider
efded18724 Fixed compilation of samplesshd. 2009-11-05 16:38:05 +01:00
Andreas Schneider
f52bc064e9 Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-11-05 16:08:49 +01:00
Aris Adamantiadis
75f066dfcd channel_read() won't block until count b. are read 2009-11-05 16:00:05 +01:00
Aris Adamantiadis
535ff07f0f Forgot to update config.h.cmake 2009-11-05 13:09:42 +01:00
Aris Adamantiadis
5e002635fc Fix compilation on freebsd 6.0 which lacks argp.h 2009-11-03 21:04:36 +01:00
Aris Adamantiadis
e71c28f6a0 Fix warnings on old gcc's
they don't like variable names having type names
2009-11-03 21:04:07 +01:00
Aris Adamantiadis
c0e091a52f Fix openssl header inclusion
caused cbc_encrypt to be redefined by an openssl
macro
2009-11-03 21:03:22 +01:00
Andreas Schneider
8ab0f8e51f Increase package version. 2009-10-29 20:22:05 +01:00
Andreas Schneider
cce34a6176 Fixed setting knownhosts in ssh_is_server_known(). 2009-10-29 12:10:44 +01:00
Andreas Schneider
89f0311927 Fixed a segfault on Windows. 2009-10-29 12:10:22 +01:00
Aris Adamantiadis
e455f6f756 Make libssh_scp a little more consistant 2009-10-29 10:50:47 +01:00
Aris Adamantiadis
17f2645a32 Fix server kex again 2009-10-29 10:36:00 +01:00
Aris Adamantiadis
9f034aca9c Fix server kex 2009-10-29 10:02:49 +01:00
Bernhard R. Link
22bdfa3886 improve error reporting of sftp.c
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-25 11:12:02 +01:00
Bernhard R. Link
ef8246a592 buffer_get_data returns 0 on error, so checking buffer_get_u* for < 0 makes no sense
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-25 09:50:06 +01:00
Aris Adamantiadis
110d201e02 fix stupid bug 2009-10-23 12:48:40 +02:00
Aris Adamantiadis
be4f695c5c Compatibility with (broken) sftp version 2 protocols 2009-10-23 12:19:22 +02:00
Andreas Schneider
792def7a65 Add missing free. 2009-10-23 11:45:44 +02:00
Andreas Schneider
840cecbe0e Fix memory leaks in ssh_bind_options_set() if called twice.
This fixes ticket #36.
2009-10-22 18:56:02 +02:00
Aris Adamantiadis
27d25752e9 Allow use of SSH_DIR/ when expanding key paths 2009-10-17 18:10:42 +02:00
Aris Adamantiadis
a479b30298 Verify existence of callback before using them 2009-10-17 17:54:39 +02:00
Andreas Schneider
86620fc991 Improve example authentication. 2009-10-15 17:56:03 +02:00
Andreas Schneider
b3dfd5cffc Added missing documentation for ssh_bind_options_set. 2009-10-15 17:22:04 +02:00
Andreas Schneider
f0858ff6b2 Added option parsing using GNU argp. 2009-10-15 17:17:58 +02:00
Andreas Schneider
7b7280e728 Added option to set log_verbosity in the server. 2009-10-15 17:17:36 +02:00
Andreas Schneider
2523ed0779 Added an option to set the port as string. 2009-10-15 17:02:51 +02:00
Andreas Schneider
e736b1a40e Fixed ssh_get_user_home_dir on Windows. 2009-10-15 16:37:07 +02:00
Andreas Schneider
cbf012c337 Fixed ssh_get_home_dir and ssh dir to be more portable on UNIX systems.
Thanks to Pino Toscano.
2009-10-15 14:53:11 +02:00
Andreas Schneider
c360ed1d9a Add API changes to README. 2009-10-13 22:23:06 +02:00
Andreas Schneider
22e74e3bab Remove deprecated functions. 2009-10-13 22:14:23 +02:00
Vic Lee
02b3104215 Fix a memory corruption in parse_status_msg
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-11 11:11:08 +02:00
Aris Adamantiadis
26a5294116 add logging 2009-10-11 00:20:37 +02:00
Aris Adamantiadis
5e4c78e114 Fix server. Now, it runs 2009-10-11 00:14:21 +02:00
Aris Adamantiadis
e74305c5eb updated the sftp subsystem to follow the type conv 2009-10-10 20:55:17 +02:00
Aris Adamantiadis
499f9aa707 Add structure cleaning in comment 2009-10-10 20:07:52 +02:00
Andreas Schneider
4dee9a3e68 Document the function to set the callbacks and provide an example. 2009-10-10 19:59:14 +02:00
Aris Adamantiadis
399041180f resolve callback crash 2009-10-10 16:25:40 +02:00
Aris Adamantiadis
3f55fb5b22 fix typo in header inclusion 2009-10-10 12:04:35 +02:00
Aris Adamantiadis
37a4a65d60 Add ssh_free at the end 2009-10-10 12:04:16 +02:00
Andreas Schneider
ccd886feb4 Added auth callback function to sample to test callback stuff. 2009-10-10 11:55:42 +02:00
Andreas Schneider
b1bc283e9a Rename callback header file. 2009-10-10 10:52:04 +02:00
Andreas Schneider
be75fac7ff Add a function to set the callback structure to the session. 2009-10-10 10:51:56 +02:00
Aris Adamantiadis
6ec65c6f9d ssh_disconnect doesn't free the session anymore 2009-10-09 22:50:48 +02:00
Aris Adamantiadis
71ab0cf6cc No more SSH_BIND SSH_MESSAGE etc. 2009-10-09 22:37:23 +02:00
Aris Adamantiadis
1e0e8a5493 samplessh uses ssh_options_getopt() 2009-10-09 22:28:03 +02:00
Aris Adamantiadis
4b65aea401 Last nail on SSH_OPTIONS, SSH_SESSION etc. 2009-10-09 22:26:08 +02:00
Aris Adamantiadis
98ff6fbbce get rid of the option structure 2009-10-09 22:24:23 +02:00
Aris Adamantiadis
43e0d73b63 sample.c compiles now 2009-10-09 22:04:56 +02:00
Aris Adamantiadis
58294442d3 Moved samples into examples directory 2009-10-09 21:44:05 +02:00
Aris Adamantiadis
2e9c13dad0 Modified server API 2009-10-09 21:26:15 +02:00
Andreas Schneider
9c667ebc26 Remove functions to set callbacks. 2009-10-09 15:18:06 +02:00
Andreas Schneider
d1b772f1bc Added more error messages to config parser. 2009-10-06 15:49:47 +02:00
Andreas Schneider
876f843f23 Update ChangeLog. 2009-10-06 15:44:12 +02:00
Andreas Schneider
0e2e0983f3 Fixed build temporarily. 2009-10-05 10:41:00 +02:00
Vic Lee
6063a8d09c Fix a segment fault in privatekey_from_file
Signed-off-by: Vic Lee <llyzs@163.com>
2009-10-05 10:02:04 +02:00
Aris Adamantiadis
40778d4ba9 Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-10-05 10:01:24 +02:00
Bernhard R. Link
60d6954b75 samplesshd: allow overriding KEYS_FOLDER by compiler option
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-05 00:05:09 +02:00
Bernhard R. Link
bf376b6d4f do not segfault in ssh_bind_accept if bindaddr is NULL
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-05 00:04:38 +02:00
Bernhard R. Link
ff52e3630f improve error handling in options.c
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-05 00:04:02 +02:00
Andreas Schneider
f1f17f18dc Fix documentation. 2009-10-05 00:03:47 +02:00
Bernhard R. Link
7c759b9615 add ssh_set_error_oom and ssh_set_error_invalid
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-05 00:02:43 +02:00
Bernhard R. Link
d54e9550da proper prototype of ssh_session_new
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-10-05 00:01:50 +02:00
Andreas Schneider
d7c0270c89 Fixed SSHv1 to work with the option changes. 2009-10-04 11:47:26 +02:00
Andreas Schneider
7a37f9faf7 Fixed ssh_options_copy(). 2009-10-04 10:10:19 +02:00
Aris Adamantiadis
149a2b4a18 Temporary server fixup for options structure delet
server_set_kex needs to be rewritten
2009-10-03 23:06:26 +02:00
Andreas Schneider
ab5b4c7cfe Get rid of the options structure. 2009-10-02 20:26:14 +02:00
Andreas Schneider
e78334688f Fixed setting of LFS CFLAGS. 2009-10-02 20:19:48 +02:00
Andreas Schneider
566fda70a5 Fixed LFS support on unix. 2009-10-02 20:17:21 +02:00
Andreas Schneider
62cebe23d9 Fixed build of sample client. 2009-10-02 17:21:59 +02:00
Andreas Schneider
42aacc7106 Remove unused option functions. 2009-10-02 10:18:27 +02:00
Andreas Schneider
8ed9cdce80 Remove --as-needed linker flag. 2009-10-01 10:19:07 +02:00
Aris Adamantiadis
a3a7f17d0f Missed copying of log verbosity 2009-09-30 13:10:59 +02:00
Aris Adamantiadis
571dd56eca libcrypto.so is in /lib on opensolaris 2009-09-29 17:57:37 +02:00
Aris Adamantiadis
f6f0988d10 Fix warnings on opensolaris 2009-09-29 17:57:37 +02:00
Aris Adamantiadis
f9d1542542 resolve warning on opensolaris 2009-09-29 11:46:06 +02:00
Aris Adamantiadis
d32fe11da3 Fix build with SSH1 2009-09-28 10:28:52 +02:00
Aris Adamantiadis
cd7f6bea57 more priv.h splitting 2009-09-26 14:05:58 +02:00
Aris Adamantiadis
c3dc60103f Fix small bug in ssh_options_parse_config 2009-09-26 12:42:47 +02:00
Aris Adamantiadis
2a2616f65c Fix bug in dir_expand_sub 2009-09-26 12:28:03 +02:00
Bernhard R. Link
f643c34ee8 support in ~/ and SSH_DIR/ in filenames instead of %s/
Get rid of snprintf to fixed sized buffers in setting options.
Instead make locations starting with ~/ relative to the
users initial working directory (as libssh does not look into
the home directory but only at the initial home directory).
and starting with SSH_DIR/ relative to the configured ssh directory.
2009-09-26 12:23:30 +02:00
Aris Adamantiadis
0f77578ee2 Fixed doxygen compilation warnings 2009-09-26 01:34:14 +02:00
Aris Adamantiadis
3e314e863c More include file splitting 2009-09-26 01:15:48 +02:00
Aris Adamantiadis
adbb087221 Removed obsolete options 2009-09-26 00:36:02 +02:00
Aris Adamantiadis
3a8d839e86 More include file movings 2009-09-26 00:29:53 +02:00
Aris Adamantiadis
358647f5d9 More comment 2009-09-25 23:56:28 +02:00
Aris Adamantiadis
5e76118512 fix ssh_callbacks_init() macro + documentation
ssh_callbacks_init should not zero' the struct because
it could be used on staticaly declared structures
2009-09-25 23:50:18 +02:00
Aris Adamantiadis
e3bdc393cb callback.h should use public headers 2009-09-25 23:42:29 +02:00
Aris Adamantiadis
04b49d46c1 Fixed building with Gcrypt and arith with void* 2009-09-25 23:38:09 +02:00
Aris Adamantiadis
74b7fb7bba Add an option to let users choose libgcrypt 2009-09-25 23:31:48 +02:00
Aris Adamantiadis
c70694c594 Fix memory leaks found by tysonite 2009-09-25 18:49:26 +02:00
Aris Adamantiadis
fef87793a0 Fix openssl version usage, found by tysonite 2009-09-25 18:34:58 +02:00
Andreas Schneider
79c475c917 Fixed including of config.h.
If there is some option to modify libc behaviour (like if there was some
off_t usage to be modified by some flag to make that 64 bit) that
needs to be done before the first libc header. one could still do -D
there, though (unless cmake wants to do something automatically and puts
that in config.h)
2009-09-25 10:01:56 +02:00
Andreas Schneider
3dd03fec21 Add missing extern C. 2009-09-25 09:59:25 +02:00
Andreas Schneider
e8e07f7376 Fix typo. 2009-09-25 09:37:56 +02:00
Andreas Schneider
1c5ae7dd97 Install callbacks header file. 2009-09-25 09:33:11 +02:00
Andreas Schneider
f65e3566a2 Fixed typo in config.h.cmake.
This closes ticket #24.
2009-09-24 13:22:43 +02:00
Aris Adamantiadis
6b0a89a288 Get rid of CRYPTO 2009-09-23 23:55:07 +02:00
Aris Adamantiadis
f84ebc2e27 Moved lots of declaration out of priv.h 2009-09-23 23:51:04 +02:00
Aris Adamantiadis
b359229a2e Change #defines to enums when it makes sense 2009-09-23 22:42:29 +02:00
Aris Adamantiadis
496a8e12d9 Get rid of SSH_MESSAGE 2009-09-23 22:19:11 +02:00
Aris Adamantiadis
0e8e124d20 get rid of SSH_OPTIONS 2009-09-23 22:13:19 +02:00
Aris Adamantiadis
9a8d4cd0fd get rid of SSH_SESSION 2009-09-23 21:55:54 +02:00
Aris Adamantiadis
ffed8b03bb remove the broken setters for options,cb init macro 2009-09-23 21:40:58 +02:00
Aris Adamantiadis
5bd38a5f37 Changed the current callback sys to be scalable 2009-09-23 21:30:56 +02:00
Aris Adamantiadis
ab60d1d678 Ordered functions in libssh.h alphabeticaly 2009-09-23 20:42:59 +02:00
Aris Adamantiadis
5223fa5740 Shut up warning in libssh_scp 2009-09-23 11:43:06 +02:00
Aris Adamantiadis
95558d54b0 Fix typos in SSH_OPTIONS 2009-09-23 11:21:12 +02:00
Andreas Schneider
068a7dfc49 Fixed bindport in getop function. 2009-09-22 20:36:57 +02:00
Andreas Schneider
abd8b17a04 Fixed options used in server sample. 2009-09-22 20:34:23 +02:00
Andreas Schneider
343e6e482a Added handling of bindport in getopt. 2009-09-22 20:33:58 +02:00
Andreas Schneider
aae1df0589 Use new options interface in sample code. 2009-09-22 20:27:53 +02:00
Aris Adamantiadis
0a57ebb3a9 Fix README file which is really obsolete 2009-09-22 16:51:28 +02:00
Bernhard R. Link
9afad28255 fix copy&paste error
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-09-22 14:04:42 +02:00
Andreas Schneider
8b21b51a78 Use new ssh options interface in auth functions. 2009-09-22 13:32:06 +02:00
Andreas Schneider
2003a81b44 Use new ssh options interface in keyfiles. 2009-09-22 13:20:23 +02:00
Andreas Schneider
abe6c7c728 Use new options interface in server code. 2009-09-22 13:17:35 +02:00
Andreas Schneider
f78045dfd3 Use the new options interface in config parser. 2009-09-22 13:14:23 +02:00
Andreas Schneider
39729bd3de Use the new options function in deprecated functions. 2009-09-22 13:14:23 +02:00
Andreas Schneider
f6d2a66de2 Added a cleaned up interface for setting options. 2009-09-22 13:14:16 +02:00
Andreas Schneider
7de3122b42 Added a userdata generic pointer to the log callback function. 2009-09-22 12:28:07 +02:00
Andreas Schneider
88f4e9ea24 Added more logging output for publickey auth. 2009-09-21 15:54:49 +02:00
Andreas Schneider
4133f484ae Fixed building libssh with MSVC.
Thanks to Carlo Segato for the patch.
2009-09-21 12:23:47 +02:00
Aris Adamantiadis
041aff8060 Fix binding found by Bernhard R. Link 2009-09-19 19:35:55 +02:00
Aris Adamantiadis
7c7096d8f8 Limit the size of acceptable compressed packets 2009-09-16 22:29:22 +02:00
Andreas Schneider
fd7b7bc3b5 Added Solaris support for the build script.
Thanks to tysonite.
2009-09-16 14:47:45 +02:00
Andreas Schneider
bb034e8e1d Set package number to first beta release. 2009-09-15 23:07:24 +02:00
Andreas Schneider
d37a475816 Improve documentation of ssh_options_parse_config(). 2009-09-15 18:06:19 +02:00
Andreas Schneider
4845642611 Added support for ~/.ssh/config. 2009-09-15 17:26:13 +02:00
Andreas Schneider
de8808cb47 Fixed build with mingw. 2009-09-15 10:43:09 +02:00
Aris Adamantiadis
ca978a9e81 Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-09-14 23:19:11 +02:00
Aris Adamantiadis
ffca268bee Add warning in channel_open_forward documentation
Tell users it does not do magic (yet)
2009-09-14 23:18:07 +02:00
Andreas Schneider
6a3d31acb7 Fix a possible stack overflow in agent code. 2009-09-14 19:01:20 +02:00
Aris Adamantiadis
f28352707a Fix the security bug found by Orange Labs
Verify the length of decrypt operation is a multiple of blocksize
2009-09-13 22:07:01 +02:00
Aris Adamantiadis
4b363928f6 SCP warning request 2009-09-13 14:03:35 +03:00
Aris Adamantiadis
929f5ca25b scp recursive mode 2009-09-13 14:03:34 +03:00
Aris Adamantiadis
7ff80a2666 Add better error detection + EOF request 2009-09-13 14:03:34 +03:00
Aris Adamantiadis
480dfd9050 add scp_download.c example 2009-09-13 14:03:34 +03:00
Aris Adamantiadis
bdb32afa20 Cycle the fetchs, remove the ssh_connect function 2009-09-13 14:03:34 +03:00
Aris Adamantiadis
f90ae73b6d Refactored the connect_ssh example function
into a new file
2009-09-13 14:03:34 +03:00
Aris Adamantiadis
7fed54b1e5 Fix scp pull bug + scp logging 2009-09-13 14:03:34 +03:00
Aris Adamantiadis
d5840aa1f0 add support for local output, scp input
Still needs to be debugged and improved but the idea it there
2009-09-13 14:03:34 +03:00
Aris Adamantiadis
6f2225e8fb fix ssh_scp_string_mode() bug + debug msgs 2009-09-13 14:03:33 +03:00
Aris Adamantiadis
07a9e6b7c6 Change scp API to use integers for perms 2009-09-13 14:03:33 +03:00
Aris Adamantiadis
86e6444656 Begin of scp reading in example 2009-09-13 14:03:33 +03:00
Andreas Schneider
8ef62cf784 Fixed fstatvfs function. 2009-09-10 18:57:58 +02:00
Andreas Schneider
8051ab044c Reformat lowercase function. 2009-09-10 14:37:09 +02:00
Dmitry V. Krivenok
18bce13617 Fixed possible memory leak in lowercase function.
If user passed NULL pointer to lowercase() function, duplicated
string "new" wasn't freed before return.

Signed-off-by: Dmitry V. Krivenok <krivenok@orangesystem.ru>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-09-10 14:35:02 +02:00
Dmitry V. Krivenok
2a10019f82 Fixed "var is uninitialized" bug.
gcc-4.4.1 reported:

/home/krivenok/dev_builds/libssh/libssh/sftp.c:2700: warning: 'sftp' is used uninitialized in this function

sftp is NULL-initialized now.

Signed-off-by: Dmitry V. Krivenok <krivenok@orangesystem.ru>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-09-10 12:35:11 +02:00
Dmitry V. Krivenok
df4c62212c Support for sending signals (RFC 4254, section 6.9).
Added function
int channel_request_send_signal(ssh_channel channel, const char *signal);
which implements signals delivery (as described in RFC 4254).
Only SSH-v2 is currently supported.

Signed-off-by: Dmitry V. Krivenok <krivenok@orangesystem.ru>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-09-10 12:34:58 +02:00
Andreas Schneider
97b6036cbf Add a portable ssh_mkdir function for Windows. 2009-09-09 13:42:00 +02:00
Andreas Schneider
df4f7ed5b8 Fix the free calls and use the safe free macro. 2009-09-03 17:22:34 +02:00
Andreas Schneider
0792c015d6 Add missing NULL pointer checks to crypt_set_algorithms_server.
Thanks to Orange Labs for the report.
2009-09-03 17:20:06 +02:00
Andreas Schneider
8344598910 Fix an integer overflow in buffer_get_data().
Thanks to Orange Labs for the report.
2009-09-03 17:11:42 +02:00
Andreas Schneider
16870abed7 Add more warnings to gcc. 2009-09-01 11:03:48 +02:00
Aris Adamantiadis
65850a1bad Fix "void * ptr used in pointer arithmetic" warng 2009-08-29 19:04:53 +02:00
Aris Adamantiadis
1137f0d48c Change SSH_LOG_RARE to SSH_LOG_PACKET in packet.c 2009-08-29 18:59:13 +02:00
Andreas Schneider
d9a50f04e7 Fix ssh_write_knownhost() if ~/.ssh doesn't exist. 2009-08-26 09:39:21 +02:00
Andreas Schneider
4aa7d73b43 Fix typo. 2009-08-25 15:23:28 +02:00
Andreas Schneider
3804e72e24 Fix linking on solaris.
libresolv and librt are required.
2009-08-25 15:07:29 +02:00
Andreas Schneider
b8508020e5 Link shared libraries with --as-needed by default. 2009-08-25 15:06:56 +02:00
Andreas Schneider
324be0eabd Fix poll sturct, ISO C doesn't allow unnamed unions. 2009-08-25 14:16:41 +02:00
Andreas Schneider
cfe5f83cf8 Fix shadow compiler warning in sample code. 2009-08-25 13:59:40 +02:00
Andreas Schneider
a1ad0deb32 Set gcc to c99 standard and enable pedantic. 2009-08-25 13:58:30 +02:00
Andreas Schneider
7c575a2418 Fix typedef collisons on Solaris. 2009-08-25 13:54:46 +02:00
Aris Adamantiadis
47cac13c0a Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-08-24 16:08:17 +02:00
Aris Adamantiadis
16d1ef8933 buffer initialization change 2009-08-24 16:07:45 +02:00
Andreas Schneider
b500d76929 Add Solaris search path for libraries. 2009-08-24 14:49:07 +02:00
Aris Adamantiadis
aef9471217 fix memleak through requests 2009-08-23 23:43:07 +02:00
Aris Adamantiadis
f3454d571e ssh_scp_request_get_{filename,permissions,size} 2009-08-23 23:40:30 +02:00
Aris Adamantiadis
1df1f86f7e added ssh_scp_read 2009-08-23 23:24:46 +02:00
Aris Adamantiadis
f9db9c5a9c added ssh_scp_accept_request 2009-08-23 22:43:57 +02:00
Aris Adamantiadis
96bafeca4c corrected errors 2009-08-23 22:40:15 +02:00
Aris Adamantiadis
626d8ec637 forgot to set up state 2009-08-23 22:38:29 +02:00
Aris Adamantiadis
f3b36af50e added ssh_scp_deny_request 2009-08-23 22:36:32 +02:00
Aris Adamantiadis
385b640d1d Implementation of ssh_scp_pull_request
Still needed: code in ssh_scp_init,
implementation of ssh_scp_read
ssh_scp_request_get_filename,
ssh_scp_request_get_size,
ssh_scp_request_get_mode,
ssh_scp_deny_request
ssh_scp_accept_request
!!
2009-08-23 22:04:51 +02:00
Aris Adamantiadis
d4bc6fa954 Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh
Conflicts:
	include/libssh/priv.h
2009-08-23 16:41:29 +02:00
Aris Adamantiadis
8bae43876f experimental callback system 2009-08-23 16:33:59 +02:00
Aris Adamantiadis
fbfea94559 Pending work 2009-08-23 16:29:31 +02:00
Aris Adamantiadis
6a04b43a45 added ssh_scp_request_new,ssh_scp_request_struct 2009-08-23 15:23:48 +02:00
Aris Adamantiadis
049c62098c add ssh_scp_push_directory,ssh_scp_leave_directory
Not yet carefully tested
2009-08-23 14:57:03 +02:00
Aris Adamantiadis
6801959989 Use ssh_basename on ssh_scp_file_push'ed files 2009-08-23 14:28:38 +02:00
Andreas Schneider
8463d9d7c6 Improve header checks on windows. 2009-08-21 15:15:49 +02:00
Andreas Schneider
c497f057a0 Improve detection for required libraries on Solaris. 2009-08-21 15:15:18 +02:00
Andreas Schneider
fc0af0f0d8 Add openssl include dir on Solaris. 2009-08-21 14:54:24 +02:00
Andreas Schneider
330c2004a1 Make the functions public. 2009-08-21 10:17:58 +02:00
Andreas Schneider
0b10493e90 Added ssh_basename() and ssh_dirname(). 2009-08-21 10:16:36 +02:00
Andreas Schneider
d23e64fc52 Add a warning if wspiapi.h doesn't exist. 2009-08-20 12:32:35 +02:00
Andreas Schneider
fd83d69440 Improve the configure checks. 2009-08-20 11:50:49 +02:00
Andreas Schneider
461e46b814 Improve checks for Windows version and wspiapi.h. 2009-08-20 11:43:37 +02:00
Andreas Schneider
4f95146151 Fix build warnings on Windows. 2009-08-20 10:50:02 +02:00
Andreas Schneider
3eb21053d0 Add a portable define to print size_t. 2009-08-20 10:49:27 +02:00
Andreas Schneider
92db6f8c6d Remove DEBUG_CRYPTO variable.
You can enable it with cmake -DWITH_DEBUG_CRYPTO:BOOL=TRUE.
2009-08-20 10:44:31 +02:00
Andreas Schneider
0fd0c6d293 Don't shadow global vairables. 2009-08-19 10:52:30 +02:00
Andreas Schneider
b49973f17b Fix compile warnings. 2009-08-17 08:56:43 +02:00
Andreas Schneider
978d265da8 Build channel_accept() on Windows too. 2009-08-16 19:01:13 +02:00
Vic Lee
cf6dddce34 Fix double free pointer crash in dsa_public_to_string
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-08-16 14:40:19 +02:00
Vic Lee
2c4bbe51dd Fix return code from packet_wait in channel_request
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-08-16 14:40:18 +02:00
Andreas Schneider
756d441f8c Fix channel_accept_x11 on Windows. 2009-08-16 14:40:18 +02:00
Vic Lee
db6aa88bc4 Add forward listening feature
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-08-16 14:40:18 +02:00
Aris Adamantiadis
e707af1cd7 Fix channel_get_exit_status bug reported by VicLee
It would return -1 if the channel received the exit status
and the close message at same time.
2009-08-16 13:51:55 +02:00
Aris Adamantiadis
380a70d650 fix ssh_finalize which didn't clear the flag 2009-08-13 23:26:17 +02:00
Andreas Schneider
2dc3b5c675 Add sftp_extension_supported() function. 2009-08-12 17:13:42 +02:00
Andreas Schneider
63011c29a0 Implement an example for statvfs. 2009-08-12 17:13:42 +02:00
Andreas Schneider
e68c3b09a6 Add support for OpenSSH's statvfs and fstatvfs calls. 2009-08-12 17:13:42 +02:00
Andreas Schneider
0793bf5aa6 Set version number to 0.4.0. 2009-08-12 17:13:04 +02:00
Andreas Schneider
d9b7e4cb7a Fix compilation with visibility flags with mingw.
Thanks to Patrick Spendrin.
2009-08-12 14:05:17 +02:00
Andreas Schneider
8e6ab1809f Enable the debug calltrace by default. 2009-08-12 10:08:20 +02:00
Aris Adamantiadis
86418bfbbe Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-08-12 00:04:30 +02:00
Aris Adamantiadis
1e1c13f756 some tweaks of scp example 2009-08-12 00:04:04 +02:00
Aris Adamantiadis
8dae851836 Make the calltrace logging optional 2009-08-12 00:03:36 +02:00
Andreas Schneider
db284d60b9 Fix static build.
If you want to link against the static library you have to define
LIBSSH_STATIC and link against ssh_static.

gcc -static -DLIBSSH_STATIC -lssh_static foo.c -o foo
2009-08-11 18:16:43 +02:00
Andreas Schneider
bfc6c7e606 Remove the map file from the sources. 2009-08-11 17:11:44 +02:00
Andreas Schneider
9b13390ad0 Use gcc visibility attribute to get rid of the map file. 2009-08-11 17:10:00 +02:00
Andreas Schneider
81fe4299f7 Fix linking of the static library on Windows. 2009-08-11 16:12:53 +02:00
Andreas Schneider
5e4bc6ec79 Fix compilation with MSVC and use declspec to export functions.
Thanks to Patrick Spendrin <ps_ml@gmx.de> for all the MSVC fixes.
2009-08-11 15:38:49 +02:00
Andreas Schneider
f3612879a8 Remove InstallRequiredSystemLibraries from CPack. 2009-08-11 15:37:52 +02:00
Andreas Schneider
57088c4375 Fix libssh build and installation on MSVC. 2009-08-11 15:37:10 +02:00
Andreas Schneider
011ab7c8fe Suppress warning about "deprecated" functions in MSVC. 2009-08-11 15:36:37 +02:00
Aris Adamantiadis
e4422d6605 Fix memory leak introduced by previous bugfix 2009-08-11 13:15:23 +02:00
Andreas Schneider
14e1d015ee Fix uint8_t. 2009-08-11 09:41:52 +02:00
Andreas Schneider
3da1c17acb Add a NULL check for strdup memory allocation. 2009-08-11 09:41:07 +02:00
Aris Adamantiadis
7e9f0803c5 Latest scp code
The sample is now able to scp a file
2009-08-10 22:59:35 +02:00
Aris Adamantiadis
f989452b3e Fixed stupid "can't parse known host key" bug
due to a dangling \n in the base64 ...
2009-08-10 22:50:16 +02:00
Aris Adamantiadis
a2780d1dd4 I really really broke it
excuse me !
2009-08-10 14:34:04 +02:00
Aris Adamantiadis
ddca45804b oops I broke libssh.map 2009-08-10 14:32:50 +02:00
Aris Adamantiadis
f92e12c7b0 ssh_scp_push_file and ssh_scp_write
still needs tests
2009-08-09 22:51:03 +02:00
Aris Adamantiadis
e4da8b99fe Initial scp implementation in source tree 2009-08-09 02:01:54 +02:00
Aris Adamantiadis
b993579079 Got the scp sample to work
Problem was that the terminal was not needed, and some nul bytes were to be read.
2009-08-09 00:25:09 +02:00
Aris Adamantiadis
807cb635c1 Fixed channel_poll broken when delayed EOF recvd
Previous code returned SSH_EOF even if data was left in buffer
2009-08-09 00:20:42 +02:00
milo
3ad559cc23 Fix buffer overflow in generate_cookie()
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-08-07 12:49:55 +02:00
milo
ec02ce0ec2 Fix a typo: CHANNEL * -> ssh_channel
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-08-07 11:40:07 +02:00
milo
1b9676a0cc Fix possible memory corruption (#14)
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-08-06 10:29:36 +02:00
Andreas Schneider
f4b3ef7604 Remove ssh_fd_poll from map file. 2009-08-05 18:20:32 +02:00
Andreas Schneider
e9974c2053 Remove ssh_fd_poll which is gone. 2009-08-05 17:38:43 +02:00
Andreas Schneider
de532ee550 Move extension structure to the end. 2009-08-01 11:15:53 +02:00
Andreas Schneider
67b44e4417 Don't use the map file if the build type is debug. 2009-08-01 11:05:19 +02:00
Andreas Schneider
83f65031c0 Fixed libssh compilation without server support. 2009-07-31 12:31:46 +02:00
Vic Lee
63053541e6 Add x11 forwarding support for ssh client
Signed-off-by: Vic Lee <llyzs@163.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-07-31 11:17:51 +02:00
Andreas Schneider
a040e2e3db Cleanup the map file and oder it alphabetically. 2009-07-30 12:02:05 +02:00
Andreas Schneider
678d445075 Export public functions on Windows. 2009-07-30 12:01:39 +02:00
Andreas Schneider
3558b9e6b6 Fix Windows build. 2009-07-30 11:40:28 +02:00
Andreas Schneider
590c3e2f51 Add strange names for Windows. 2009-07-30 11:38:38 +02:00
Andreas Schneider
28a7343320 Fix project name in examples. 2009-07-30 11:11:00 +02:00
Andreas Schneider
766bae9d76 Fix build with MSVC. 2009-07-30 10:45:58 +02:00
Andreas Schneider
94a57df0c9 Compile the library with the map file again. 2009-07-30 00:46:57 +02:00
Andreas Schneider
5f93742c5e Add missing functions to map file. 2009-07-30 00:46:45 +02:00
Andreas Schneider
9457c770df Change the library so version. 2009-07-30 00:46:07 +02:00
Andreas Schneider
bccb9b16a5 Move channel_write_stderr to server.c. 2009-07-29 23:21:01 +02:00
Andreas Schneider
1355029ec9 Fix indent. 2009-07-29 23:02:12 +02:00
Andreas Schneider
5dc8d6069d Update map file and introduce a new version.
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-07-29 18:42:16 +02:00
Andreas Schneider
60837b1538 Add channel_write_stderr prototype to the right header file.
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-07-29 18:42:10 +02:00
Andreas Schneider
debfd1f3a3 Fix build errors in new messages functions.
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-07-29 18:42:05 +02:00
Preston A. Elder
4f70cc13e2 Fleshed out server interface
- Enables channel_request_open types of DIRECT_TCPIP, FORWARDED_TCPIP and X11 (ie. implemented the handling of those channel_request_open types).
- Adds functions to retrieve the extra information relating to channel_request_open messages and channel_request messages.
- Adds a channel_write_stderr method (obviously for writing to the STDERR channel from server side) - well, technically just converted the exiting channel_write to take an extra argument and created two wrapper functions.
- Actually does the invoking of message_handle() from channel_recv_request.
- Implemented the handling of the window-change and env channel_requests.
- Implemented a few functions in server.h that were declared but not defined (eg. ssh_message_channel_request_channel).

Signed-off-by: Preston A. Elder <prez@neuromancy.net>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-07-29 18:41:48 +02:00
Andreas Schneider
b4111c5c18 Add functions to get the extension count, name and data. 2009-07-28 14:13:22 +02:00
Andreas Schneider
b9b7174d85 Add support to read and store sftp extensions. 2009-07-28 13:25:35 +02:00
Andreas Schneider
69ceaae9a9 Check for OpenSSH and implement sftp_symlink correct.
When OpenSSH's sftp-server was implemented, the order of the arguments
to the SSH_FXP_SYMLINK method was inadvertently reversed. Unfortunately,
the reversal was not noticed until the server was widely deployed.
Since fixing this to follow the specification would cause
incompatibility, the current order was retained.
2009-07-28 13:25:26 +02:00
Andreas Schneider
1abdb28995 Fix SSH1 compilation. 2009-07-27 23:17:35 +02:00
Andreas Schneider
81dab99afc Fix stdint type. 2009-07-27 23:14:04 +02:00
Andreas Schneider
291522772d Fix SSH1 and stdint in SSH1 code. 2009-07-27 23:13:24 +02:00
milo
26d1ac325b Fix potential memory corruption bug 2009-07-27 20:53:01 +02:00
milo
1311d03415 Fix typo orignator_port -> originator_port 2009-07-27 20:52:36 +02:00
Andreas Schneider
549fd32574 Fix compile errors in keyfiles. 2009-07-27 20:49:38 +02:00
Andreas Schneider
9f14bbd6ad Remove double SSH2_MSG_USERAUTH_PK_OK. 2009-07-27 20:30:27 +02:00
milo
e8f7801540 Public key authentication server side 2009-07-27 20:27:07 +02:00
Andreas Schneider
cdde79418a Add ssh_file_readaccess_ok to check read access on a file. 2009-07-27 14:20:32 +02:00
Andreas Schneider
9b97da65e6 Add a function to close the socket.
This fixes ssh_connect on Windows.
2009-07-27 14:19:06 +02:00
Andreas Schneider
1dcaebe1ce Fix a typo. 2009-07-27 13:20:29 +02:00
Andreas Schneider
28b5d0f875 Switch completly to stdint types. 2009-07-25 23:19:41 +02:00
Aris Adamantiadis
ba217dec1c First implementation of a scp transfer tool
Doesn't work yet. I've got a headache and debugging doesn't help.
2009-07-25 22:29:12 +02:00
Andreas Schneider
3b8c4dc750 Fix conflicting declarations of ssh_session and ssh_kbdint. 2009-07-25 20:26:56 +02:00
Andreas Schneider
5d1fa1be24 Fix return value of sftp_tell64(). 2009-07-25 19:52:07 +02:00
Andreas Schneider
c8e82528fc Update map file for ssh_clean_pubkey_hash; 2009-07-25 18:00:36 +02:00
Andreas Schneider
104e6d39ab Add a sftp_tel64() function. 2009-07-25 17:55:58 +02:00
Andreas Schneider
3f778d9a31 Add ssh_clean_pubkey_hash() which is needed on Windows. 2009-07-25 17:52:00 +02:00
Aris Adamantiadis
a935ad1857 New example directory with the begining of a scp 2009-07-25 17:03:01 +02:00
Aris Adamantiadis
7abb3941c8 Bumped the version numbers to 0.4.0 in HEAD 2009-07-25 16:32:10 +02:00
Andreas Schneider
194880b869 Update map file. 2009-07-25 11:56:59 +02:00
Andreas Schneider
737f588b3b Fix a typo. 2009-07-25 11:55:42 +02:00
Andreas Schneider
6d5b36fb79 Add symlink and readlink test to sample. 2009-07-25 11:55:42 +02:00
Andreas Schneider
8ce6bd3459 Add sftp_readlink function. 2009-07-25 11:55:42 +02:00
Andreas Schneider
5b8338d115 Add sftp_symlink function. 2009-07-25 11:55:33 +02:00
Aris Adamantiadis
e73cbbe18c Added a threading + sftp stress testcase 2009-07-24 22:52:10 +02:00
Aris Adamantiadis
69a01b3657 move all u32,u16,u8 and u64 declarations in priv.h
And fix all headers which need u32,u8,u64
2009-07-24 22:31:39 +02:00
Aris Adamantiadis
e406b81d34 Missed something in channel_select for CHANNEL 2009-07-24 22:24:10 +02:00
Aris Adamantiadis
fdc2751952 Make the SSH_SAFE_NAMESPACE flag active 2009-07-24 22:20:41 +02:00
Aris Adamantiadis
fa11083fcb Change refs from AGENT * to ssh_agent
Fixes also a typo in ssh_agent declaration
2009-07-24 22:19:40 +02:00
Aris Adamantiadis
2bc8819e8f Changes all CHANNEL * to ssh_channel 2009-07-24 22:15:33 +02:00
Aris Adamantiadis
23b6c95e04 Change PRIVATE_KEY * to ssh_private_key 2009-07-24 22:08:04 +02:00
Aris Adamantiadis
c041bcc6d9 Forgot sample* in previous BUFFER change 2009-07-24 22:03:36 +02:00
Aris Adamantiadis
fc5dd23afa Changed all PUBLIC_KEY * to ssh_public_key 2009-07-24 22:02:32 +02:00
Aris Adamantiadis
91d0660cc3 Changed all occurences of BUFFER * to ssh_buffer 2009-07-24 21:56:11 +02:00
Aris Adamantiadis
fb5769b4be You always forget SSH1 ... 2009-07-24 21:47:23 +02:00
Aris Adamantiadis
56ee212641 Change all occurences of STRING * to ssh_string 2009-07-24 21:45:41 +02:00
Aris Adamantiadis
8f3891e968 moved try_publickey_from_file in priv.h
Had nothing to do in libssh.h. 100% sure nobody
used it since one of the structure declaration
was not public.
2009-07-24 21:23:07 +02:00
Aris Adamantiadis
958a775afa replacing keys_struct with ssh_keys_struct 2009-07-24 21:18:15 +02:00
Aris Adamantiadis
e776dc16c9 Fixed namespace problem in public structures
changed
struct string_struct to ssh_string_struct
buffer_struct to ssh_buffer_struct
and so on.

Should not break apps using the caps version of these
2009-07-24 20:49:46 +02:00
Andreas Schneider
9450a3c987 Fix a possible segfault in sftp_canonicalize_path(). 2009-07-23 18:34:25 +02:00
Andreas Schneider
1939a55c3c Fix getaddrinfo and gethostbyname build problems on Solaris. 2009-07-23 11:57:17 +02:00
Andreas Schneider
2a116bb291 Fix OpenSSL include file checks on Solaris. 2009-07-23 11:54:32 +02:00
Andreas Schneider
d01c7320f9 Fix finding OpenSSL on Solaris. 2009-07-23 09:30:14 +02:00
Andreas Schneider
ea0315ed88 Add cmake check for big endian. 2009-07-23 09:25:36 +02:00
Andreas Schneider
85a5eb9499 Fix a segfault if a NULL pointer is passed to ssh_disconnect(). 2009-07-22 16:04:41 +02:00
Andreas Schneider
3cd06a1f26 Don't segfault if the session or the answer is NULL. 2009-07-22 12:18:34 +02:00
Andreas Schneider
19c3d02805 Merge branch 'master' of git://git.libssh.org/projects/libssh/libssh 2009-07-21 14:12:25 +02:00
Andreas Schneider
b534bfc520 Fix ssh_write_knownhost() which always returned -1.
fwrite() return the the number of items written not the size of the
buffer.
2009-07-21 14:07:23 +02:00
Andreas Schneider
ef2c8d66f1 Add compile flags and test for compiler options only if we use gcc. 2009-07-21 11:14:54 +02:00
Andreas Schneider
1a6038baa5 Only add additional warnings if we have a GNU compiler. 2009-07-21 11:10:09 +02:00
Andreas Schneider
41a8fb5810 Make the ssh_userauth_kbdint functions to get the prompts const.
They shouldn't be modified or free'd by a user.
2009-07-21 10:34:21 +02:00
Andreas Schneider
8843d8b68d Fix sol8 + ss11 compile errors.
Thanks to tysonite@gmail.com.
2009-07-20 22:50:45 +02:00
Andreas Schneider
2aec79ce36 Add missing changelog entries. 2009-07-14 11:10:22 +02:00
Aris Adamantiadis
bbcbc8425c Fix doxygen to match SSH_SERVER_FILE_NOT_FOUND fix 2009-07-14 10:09:18 +02:00
Andreas Schneider
ed8178f3c3 Fix build on windows, missing include. 2009-07-13 13:33:52 +02:00
Aris Adamantiadis
933527fc77 Put #ifdef around AI_NUMERICSERV which doesn't seem std 2009-07-13 13:29:00 +02:00
Aris Adamantiadis
bf8d139b2d Enable conditional compiling for IP regex code. 2009-07-13 12:32:06 +02:00
Aris Adamantiadis
093983b804 forgot init.c in copyright updates 2009-07-13 00:25:04 +02:00
Aris Adamantiadis
103292dd99 Fixed copyright notices 2009-07-13 00:23:42 +02:00
Aris Adamantiadis
76b6b1c694 typo in sample.c 2009-07-13 00:19:47 +02:00
Aris Adamantiadis
1301864f92 Reflect the SSH_SERVER_NOT_KNOWN add-on in sample 2009-07-12 23:17:12 +02:00
Aris Adamantiadis
d5b6f6cc37 Added return code SSH_SERVER_FILE_NOT_FOUND
This error is returned by ssh_is_server_known when known_hosts
file does not exist and gives more action to the developer.
2009-07-12 23:13:21 +02:00
Aris Adamantiadis
052073c36d Set correct hint when connecting to an IP address
libssh now uses a regular expression against destination
hostnames to match numerical IP addresses and set the
appropriate hint.

Patches also add init and finalize code to compile the regexp
2009-07-12 23:01:43 +02:00
Aris Adamantiadis
60c778ad7f fix int -> socket_t in SSH_POLL 2009-07-04 14:16:13 +02:00
Aris Adamantiadis
71100dadcd Temporary move of ssh_poll_* back to priv.h
We'll see later what needs to be put back in public
functions
2009-07-04 13:52:34 +02:00
Aris Adamantiadis
5ba33438f3 Move doxygen tags into C files 2009-07-04 13:47:57 +02:00
Aris Adamantiadis
708c0d32a2 Put back the poll declarations into priv.h
That are, poll constants.
2009-07-04 13:41:16 +02:00
Aleksandar Kanchev
3659e8c04a Add a generic way to handle sockets asynchronously.
It's based on poll objects, each of which store a socket, it's events and a callback,
which gets called whenever an event is set. The poll objects are attached to a poll
context, which should be allocated on per thread basis.

Polling the poll context will poll all the attached poll objects and call their
callbacks (handlers) if any of the socket events are set. This should be done within
the main loop of an application.

This is intended as a ground work for making libssh asynchronous.

Signed-off-by: Aleksandar Kanchev <aleksandar.kanchev@googlemail.com>
2009-07-03 21:53:53 +02:00
Aris Adamantiadis
c4cf349729 Add logging of the sftp flags used to open a file
Should be used to debug weird behaviour when using libssh on windows with different compiler chains.
2009-06-30 22:35:01 +02:00
Aris Adamantiadis
2c99566697 Fixed Could not write as much data as expected msg
Bug caused by verifying the size of the buffer in the wrong place
2009-06-30 22:17:35 +02:00
Aleksandar Kanchev
42470857e2 Fixed make condition in build_make.sh.
Signed-off-by: Aleksandar Kanchev <aleksandar.kanchev@googlemail.com>
Signed-off-by: Andreas Schneider <mail@cynapses.org>
2009-06-25 18:02:57 +02:00
Aris Adamantiadis
8724f97a19 Fixed memory leak in ssh_is_server_known() 2009-06-22 23:30:50 +02:00
Aris Adamantiadis
8960992267 Fixed yet another read-after-free bug
read of a buffer len after free in sftp_write()
2009-06-21 22:30:28 +02:00
Aris Adamantiadis
730af24de8 Fixed a use-after-free in match_hashed_host() 2009-06-21 22:09:19 +02:00
Aris Adamantiadis
a3fa6f3099 fix stupid "use unallocated memory" code in sample
it confused valgrind and wasted 2 precious hours of my life
2009-06-21 21:53:12 +02:00
Aris Adamantiadis
4dafc25927 Added a macro to test buffer_struct integrity
Nothing yet in cmake and config.h.in for this
2009-06-21 20:29:29 +02:00
Aris Adamantiadis
e671ebcd99 Modified the sftp test case so it creates 0700 fil 2009-06-21 20:14:10 +02:00
Aris Adamantiadis
bab8508eba Fix doublefree bug found by Cyril 2009-06-21 19:25:51 +02:00
Andreas Schneider
77cd4795c5 Remove unneeded printf. 2009-06-19 22:46:41 +02:00
Andreas Schneider
dc83f36a00 Add a git ignore file. 2009-06-19 10:25:51 +02:00
Aris Adamantiadis
8336c91e9c Verify memory return codes in ssh_list functions 2009-06-19 10:18:24 +02:00
Aris Adamantiadis
1bea53375b added ssh_message_callback support.
Not fully working yet. User can set his ssh_message_callback, and the function ssh_execute_message_callbacks will call them when appropriate. Messages are correctly stacked (in packet_parse) but no call to ssh_execute_callbacks exists yet.
2009-06-18 23:48:55 +02:00
Aris Adamantiadis
3af55a4f49 Created general singlelinked list implementation 2009-06-18 23:01:05 +02:00
Aris Adamantiadis
cf482ae3bf Begin of asynchronous SSH message parsing 2009-06-17 23:53:00 +02:00
Aris Adamantiadis
916958a2bb Fixed potential format string attacks
Potential format string attacks on error reporting in channels.c
2009-06-17 23:42:07 +02:00
Aris Adamantiadis
e2af94289f ssh_message_retrieve + memoryleak fixed in ssh_message_free
ssh_message_retrieve parses a specific SSH message and returns a pointer to it.
Hacked ssh_message_get to use it. This is the first step to have asynchronous ssh messages callbacks.
2009-06-17 23:28:05 +02:00
Aris Adamantiadis
fa4c81cfb9 Url change in README 2009-06-16 16:45:39 +02:00
Aris Adamantiadis
7dbc66e4a3 ssh_init()
fixes in client.c and server.c for this


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@778 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-15 15:31:23 +00:00
Andreas Schneider
3873489688 Simply leave the function, this should prevent a segfault.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@777 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-10 16:05:39 +00:00
Andreas Schneider
d14a492019 Fix a infinite loop on error.
Thanks to Milo for the pointer.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@776 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-10 15:29:11 +00:00
Andreas Schneider
848984f25f Fix a possible crash bug.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@775 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-09 12:03:24 +00:00
Andreas Schneider
5a755a8219 Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@774 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-09 12:03:00 +00:00
Andreas Schneider
910689126a Fix cmake on BSD.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@773 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-09 10:54:48 +00:00
Andreas Schneider
87995db8fe Make use of poll() and add a poll-emulation for win32.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@772 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-04 07:23:55 +00:00
Laurent Bigonville
70c9da4fb0 Drop debian directory, new location: git://git.debian.org/collab-maint/libssh.git
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@771 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-06-01 16:49:46 +00:00
Andreas Schneider
1ac654ec6c Fix compilation of SSHv1.
Patch by Norbert Kiesel.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@770 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-23 08:27:31 +00:00
Andreas Schneider
fecbdff179 Set version to 0.3.0 and set release date.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@768 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-21 09:34:02 +00:00
Aris Adamantiadis
894b73abe2 updated changelog + authors
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@767 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-18 18:39:26 +00:00
Andreas Schneider
da4986e4bc Fix the homepage url and the vendor.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@766 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-14 11:20:17 +00:00
Andreas Schneider
08ab186471 Add missing vim modeline.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@765 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-13 07:59:59 +00:00
Andreas Schneider
439d995fed Fix some compiler warnings on windows.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@764 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-13 07:38:30 +00:00
Andreas Schneider
2e0b2e2e91 Fix the vim modeline and place it at the end of the file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@763 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-12 17:49:23 +00:00
Andreas Schneider
80ba62a519 Add missing changelog entry.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@762 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 15:09:23 +00:00
Andreas Schneider
a065e35e37 Improve some debug statements.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@761 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 12:38:21 +00:00
Andreas Schneider
2eaf69ee06 Fix a double free corruption.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@760 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 12:31:54 +00:00
Andreas Schneider
a15a28e698 Remove a wrong NULL check.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@759 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 12:25:06 +00:00
Andreas Schneider
646a5a2cfc Don't force the CMAKE_BUILD_TYPE or we can't overwrite it.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@758 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 11:25:55 +00:00
Andreas Schneider
9196be1a42 Initialize the return value to fix a build warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@757 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 11:12:46 +00:00
Andreas Schneider
1657d0932f Document the ssh server bind functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@756 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 10:24:37 +00:00
Andreas Schneider
f0432cc24f Update changelog.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@755 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 10:06:15 +00:00
Andreas Schneider
d008e5aeb8 Added a ssh_bind_set_fd() function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@754 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 10:05:47 +00:00
Andreas Schneider
2934765c76 Change variable names of the keys_struct to avoid conflicts.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@753 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-11 09:24:39 +00:00
Andreas Schneider
f29e119c25 Improve OpenSSL cmake checks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@752 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-07 15:11:04 +00:00
Andreas Schneider
126dcd51e5 Improve GCrypt cmake checks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@751 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-07 15:07:54 +00:00
Andreas Schneider
249e11bd2e Improve the INSTALL file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@750 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-07 08:32:50 +00:00
Andreas Schneider
cea0ac4455 Fix typos.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@749 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-07 08:27:51 +00:00
Andreas Schneider
ae81c4124e Add channel_read() changes to changelog.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@748 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-06 07:22:04 +00:00
Andreas Schneider
d75b53805d Add more changelog entries for 0.3.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@747 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 14:21:05 +00:00
Andreas Schneider
bc0491c098 Update an format ChangeLog.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@746 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 13:51:50 +00:00
Andreas Schneider
1fd0237ddb Remove empty file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@745 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 13:51:38 +00:00
Andreas Schneider
69af190acb Fix compilation on windows.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@744 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 10:03:34 +00:00
Andreas Schneider
c7806a6a16 Improve bin_to_base64() and use const for source.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@743 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:16:08 +00:00
Andreas Schneider
fdc1073e8a Format alphabet table.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@742 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:09:01 +00:00
Andreas Schneider
fb559c6ffd Fix the macros.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@741 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:08:33 +00:00
Andreas Schneider
f7d2040d5a Format _bin_to_base64().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@740 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:07:09 +00:00
Andreas Schneider
2e5f1c8955 Improve get_equals().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@739 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:05:09 +00:00
Andreas Schneider
184b711a04 Fix the prototype.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@738 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:04:10 +00:00
Andreas Schneider
5708fe1729 Improve _base64_to_bin().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@737 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:03:07 +00:00
Andreas Schneider
cc2df5487a Improve to_block4().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@736 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 09:00:29 +00:00
Andreas Schneider
fc50facaa3 Improve base64_to_bin().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@735 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:57:16 +00:00
Andreas Schneider
8f8e9a2f50 Improve channel_write1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@734 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:30:13 +00:00
Andreas Schneider
ec714ea67d Improve channel_request_exec1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@733 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:29:16 +00:00
Andreas Schneider
de138cd055 Improve channel_change_pty_size1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@732 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:28:29 +00:00
Andreas Schneider
65331f470a Improve channel_request_pty_size1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@731 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:27:30 +00:00
Andreas Schneider
d6e23b7628 Format channel_open_session1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@730 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:25:39 +00:00
Andreas Schneider
f9baa6552c Format ssh_select().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@729 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:22:06 +00:00
Andreas Schneider
4bf12aaf56 Improve ssh_connect_host().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@728 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 08:05:03 +00:00
Andreas Schneider
7568e42f4e Improve ssh_connect_ai_timeout().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@727 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:55:24 +00:00
Andreas Schneider
83b26b97b5 Improve getai().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@726 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:47:11 +00:00
Andreas Schneider
ce1a5d7578 Reorder and format socket blocking functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@725 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:42:07 +00:00
Andreas Schneider
57b7e73394 Reoder define and includes.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@724 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:38:53 +00:00
Andreas Schneider
33a640e348 Use const char * and an unsigned int in ssh_crc32().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@723 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:34:16 +00:00
Andreas Schneider
03c40ac79f Format ssh_get_error_code().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@722 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:29:36 +00:00
Andreas Schneider
53a24a4f78 Format ssh_get_error().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@721 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:27:16 +00:00
Andreas Schneider
8af13665ab Make the documentation internal.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@720 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:26:19 +00:00
Andreas Schneider
4838742a8e Improve and document ssh_set_error().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@719 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:25:07 +00:00
Andreas Schneider
8c45767d34 Fix build error.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@718 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:20:12 +00:00
Andreas Schneider
1d78b6d00e Improve ssh_log().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@717 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:19:50 +00:00
Andreas Schneider
4c78793961 Format match_hostname().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@716 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:15:06 +00:00
Andreas Schneider
5c934d0970 Reformat match_pattern_list().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@715 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:14:09 +00:00
Andreas Schneider
1a280d859d Format match_pattern().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@714 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-05 07:11:21 +00:00
Andreas Schneider
dc07d46cca Add a exec test.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@713 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 22:30:21 +00:00
Andreas Schneider
6c51183f0e Wait for the exit status before returning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@712 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 22:26:49 +00:00
Andreas Schneider
61ebfcfa5c Improve own gcrypt function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@711 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 13:52:27 +00:00
Andreas Schneider
ff60d8ce22 Remove line which was accidently commited.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@710 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:52:08 +00:00
Andreas Schneider
c4169e3c41 Fix a bug in channel_poll().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@709 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:46:52 +00:00
Andreas Schneider
0b7ae624a3 Improve channel_select().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@708 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:42:07 +00:00
Andreas Schneider
d9a0b90701 Reformat count_ptrs().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@707 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:27:37 +00:00
Andreas Schneider
503bc1b95f Remove unused variable.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@706 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:26:45 +00:00
Andreas Schneider
cd71590fe0 Reformat channel_protocol_select().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@705 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:26:30 +00:00
Andreas Schneider
1afe6b13c5 Improve the docu of channel_get_exit_status().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@704 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:20:20 +00:00
Andreas Schneider
0d17b6778b Reformat channel_get_session() and improve docu.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@703 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:18:42 +00:00
Andreas Schneider
43d881ba28 Improve channel_poll() and add a SSH_EOF return value.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@702 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:17:10 +00:00
Andreas Schneider
3d9fbe8eea Add a warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@701 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:10:15 +00:00
Andreas Schneider
152da07023 Implement channel_read() as a POSIX like function.
Create channel_read_buffer() to have the old version still available.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@700 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 10:06:49 +00:00
Andreas Schneider
dda7808851 Improve the documentation in channel_request_exec().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@699 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 07:04:53 +00:00
Andreas Schneider
f40ae74f51 Improve the docu of channel_request_env().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@698 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 07:02:33 +00:00
Andreas Schneider
5b547812eb Improve the channel_request_subsystem() docu.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@697 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 07:00:47 +00:00
Andreas Schneider
8060f51ec7 Improve channel_request_shell().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@696 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:58:32 +00:00
Andreas Schneider
0e6359c63d Improve channel_change_pty_size().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@695 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:57:15 +00:00
Andreas Schneider
3e1ed1707c Reformat channel_request_pty().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@694 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:55:25 +00:00
Andreas Schneider
2688c1a1d5 Improve channel_request_pty_size().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@693 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:54:06 +00:00
Andreas Schneider
a08c56baf4 Improve channel_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@692 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:50:16 +00:00
Andreas Schneider
137669db3f Improve channel_set_blocking().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@691 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:48:04 +00:00
Andreas Schneider
98fbe3020d Improve channel_is_* functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@690 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:36:17 +00:00
Andreas Schneider
9345ba7030 Improve channel_write().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@689 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-04 06:30:12 +00:00
Andreas Schneider
17c146391c Improve channel_close().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@688 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:35:36 +00:00
Andreas Schneider
b27e5b6785 Improve channel_send_eof().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@687 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:32:33 +00:00
Andreas Schneider
9827cac475 Reformat channel_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@686 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:31:03 +00:00
Andreas Schneider
b23c68264d Improve channel_open_forward().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@685 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:27:45 +00:00
Andreas Schneider
095775ef1b Improve channel_open().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@684 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:25:13 +00:00
Andreas Schneider
c98fce8596 Reformat some code of channel_default_bufferize().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@683 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:22:10 +00:00
Andreas Schneider
e97275c7bc Reformat channel_handle().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@682 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:20:03 +00:00
Andreas Schneider
783825254a Improve channel_rcv_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@681 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 18:04:57 +00:00
Andreas Schneider
e7fc9ab369 Improve channel_rcv_close().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@680 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 17:54:16 +00:00
Andreas Schneider
2b705786c0 Reformat channel_rcv_eof().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@679 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 17:51:09 +00:00
Andreas Schneider
e46d2d024c Improve channel_rcv_data().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@678 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-03 17:49:56 +00:00
Andreas Schneider
06eceb3204 Improve channel_rcv_change_window().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@677 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:51:57 +00:00
Andreas Schneider
a7732ebbe5 Improve channel_from_msg().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@676 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:48:59 +00:00
Andreas Schneider
6538121494 Improve grow_window().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@675 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:47:19 +00:00
Andreas Schneider
0534fee674 Improve ssh_channel_from_local().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@674 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:46:10 +00:00
Andreas Schneider
c31893d246 Improve channel_open().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@673 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:41:21 +00:00
Andreas Schneider
f0b14c7b7a Improve ssh_channel_new_id().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@672 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:30:48 +00:00
Andreas Schneider
0b4159d1ec Fix the documentation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@671 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-05-02 20:24:39 +00:00
Andreas Schneider
015b1649b1 Improve ssh_userauth_password().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@670 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:58:08 +00:00
Andreas Schneider
5b1c21593c Initialize the vars with NULL to prevent a segfault on error.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@669 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:53:42 +00:00
Andreas Schneider
2ed97906e3 Improve ssh_userauth_agent_pubkey().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@668 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:51:53 +00:00
Andreas Schneider
deb9d30f4d Improve ssh_userauth_pubkey().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@667 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:46:40 +00:00
Andreas Schneider
65d09f3268 Improve ssh_userauth_offer_pubkey().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@666 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:40:32 +00:00
Andreas Schneider
0881ba13d6 Improve ssh_userauth_none().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@665 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:34:36 +00:00
Andreas Schneider
83971c0188 Improve ssh_userauth_list().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@664 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:20:47 +00:00
Andreas Schneider
cc6199d9f0 Reformat ssh_auth_list().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@663 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:19:14 +00:00
Andreas Schneider
e8f783eb36 Improve wait_auth_status().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@662 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:18:44 +00:00
Andreas Schneider
a1802f1c32 Fix segfault.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@661 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:17:57 +00:00
Andreas Schneider
d680160500 Add a BURN_STRING macro and use it in auth.c.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@660 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:07:33 +00:00
Andreas Schneider
2317a58996 Improve ask_userauth().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@659 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 14:00:07 +00:00
Andreas Schneider
567cc5984a Improve the autopubkey authentication.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@658 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 13:58:20 +00:00
Andreas Schneider
06a0dea2ad Rename the symbol version map.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@657 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 09:47:57 +00:00
Andreas Schneider
982045bb96 Improve ssh_accept().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@656 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 09:07:12 +00:00
Andreas Schneider
c3ee07d747 Improve dh_handshake_server().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@655 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-30 09:04:15 +00:00
Andreas Schneider
fa63c0adee Improve server_set_kex().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@654 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 16:59:15 +00:00
Andreas Schneider
78ad279a43 Improve ssh_bind_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@653 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:55:43 +00:00
Andreas Schneider
e13c2871ff Improve ssh_bind_accept().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@652 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:54:32 +00:00
Andreas Schneider
f119a27bb6 Format ssh_bind options.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@651 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:49:44 +00:00
Andreas Schneider
23a55a0a0a Improve ssh_bind_listen().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@650 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:48:54 +00:00
Andreas Schneider
1cdc7c6e43 Format ssh_bind_set_options().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@649 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:47:18 +00:00
Andreas Schneider
5c662f6f6b Improve ssh_bind_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@648 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:46:51 +00:00
Andreas Schneider
afeaea318c Add more error checks to bind_socket().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@647 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:45:56 +00:00
Andreas Schneider
29035f952c Reorder the includes.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@646 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 11:40:02 +00:00
Andreas Schneider
3024e3652f Improve ssh_userauth_kbdint_getprompt.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@645 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:53:23 +00:00
Andreas Schneider
5fdcd4df7b Reformat ssh_userauth_kbdint functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@644 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:50:47 +00:00
Andreas Schneider
634a2d20b8 Improve ssh_userauth_kbdint.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@643 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:46:45 +00:00
Andreas Schneider
75fb96f740 Improve kbdauth_send.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@642 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:25:00 +00:00
Andreas Schneider
907b4075c0 Improve kbdauth_info_get.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@641 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:22:59 +00:00
Andreas Schneider
ddd1d62429 Improve kbdauth_init.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@640 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:09:16 +00:00
Andreas Schneider
84629a394e Improve kbdint_clean.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@639 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 10:04:32 +00:00
Andreas Schneider
c26fb22122 Improve kbdint_free.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@638 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 09:57:12 +00:00
Andreas Schneider
4cc2acda3a Improve kbdint_new.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@637 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-29 09:53:55 +00:00
Andreas Schneider
2c75ad7e19 Improve auto public key authentication.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@636 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-28 19:33:28 +00:00
Andreas Schneider
9f7d4d2d60 Improve ssh_write_knownhost.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@635 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-28 07:25:19 +00:00
Andreas Schneider
511213872b Improve ssh_is_server_known.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@634 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 18:21:12 +00:00
Andreas Schneider
8dbe59efde Improve match_hashed_host.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@633 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 18:08:46 +00:00
Andreas Schneider
b39fcd6470 Improve check_public_key().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@632 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 17:59:48 +00:00
Andreas Schneider
a19aebba18 Improve ssh_get_knownhost_line.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@631 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 17:52:09 +00:00
Andreas Schneider
b1e62ad22b Reformat sftp_handle_remove.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@630 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 12:01:40 +00:00
Andreas Schneider
9d270f99a7 Improve sftp_handle.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@629 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 12:00:42 +00:00
Andreas Schneider
315e5aca84 Improve sftp_handle_alloc.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@628 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:59:14 +00:00
Andreas Schneider
bf312c50a9 Improve sftp_reply_data and fix sftp_reply_status.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@627 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:54:47 +00:00
Andreas Schneider
52d20beb73 Improve sftp_reply_names.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@626 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:49:41 +00:00
Andreas Schneider
f11630ab68 Improve sftp_reply_names_add.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@625 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:46:41 +00:00
Andreas Schneider
f32e307899 Improve sftp_reply_attr.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@624 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:42:45 +00:00
Andreas Schneider
83142315da Improve sftp_reply_handle.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@623 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:41:08 +00:00
Andreas Schneider
db79fff00d Improve sftp_reply_name.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@622 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:39:25 +00:00
Andreas Schneider
5d23142599 Improve sftp_client_message_free.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@621 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:33:37 +00:00
Andreas Schneider
1f6341f549 Improve sftp_get_client_message.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@620 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:30:36 +00:00
Andreas Schneider
72aeba410f Don't set options again.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@619 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 11:00:32 +00:00
Andreas Schneider
c1c4f299ff Add option to build with or without sftp support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@618 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:58:29 +00:00
Andreas Schneider
99946c7bcc Improve sftp_fstat.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@617 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:42:39 +00:00
Andreas Schneider
0eedebd84a Reformat sftp_stat and sftp_lstat.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@616 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:38:40 +00:00
Andreas Schneider
c1cd3b2974 Improve sftp_xstat().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@615 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:37:54 +00:00
Andreas Schneider
2b4efa171e Improve sftp_canonicalize_path().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@614 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:32:13 +00:00
Andreas Schneider
367f4b999a Reformat sftp_utimes().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@613 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:25:31 +00:00
Andreas Schneider
75c3996a49 Improve sftp_setstat().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@612 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:24:53 +00:00
Andreas Schneider
320c70a170 Improve sftp_rename().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@611 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:20:54 +00:00
Andreas Schneider
387f6473f7 Improve sftp_mkdir().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@610 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:14:59 +00:00
Andreas Schneider
4d80a1559a Improve sftp_rmdir().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@609 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:06:18 +00:00
Andreas Schneider
fd79249df6 Reformat the sftp_open() function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@608 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-27 10:02:16 +00:00
Andreas Schneider
50616076c7 Improve sftp_unlink().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@607 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 12:57:11 +00:00
Andreas Schneider
4a383ab3cf Reformat sftp tell and seek functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@606 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 12:49:59 +00:00
Andreas Schneider
cefe239958 Improve the sftp seek functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@605 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 10:16:16 +00:00
Andreas Schneider
29e6f140fa Improve sftp_write().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@604 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 10:08:46 +00:00
Andreas Schneider
b0778ca169 Use a negative value for SSH_AGAIN.
This is needed for function which return the length read for example. If
we read only one byte then 1 would be returned and some function may
think that it has to read again.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@603 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 09:52:06 +00:00
Andreas Schneider
ac724eb3fb Improve the sftp async read functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@602 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 09:33:47 +00:00
Andreas Schneider
8ba57619fd Improve sftp_read().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@601 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-24 09:05:52 +00:00
Andreas Schneider
10ddf310a6 Improve sftp_closedir().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@600 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 15:15:02 +00:00
Andreas Schneider
5a84af65fa Improve sftp_close().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@599 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 15:10:59 +00:00
Andreas Schneider
5d689c2d29 Improve sftp_handle_close().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@598 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 15:08:34 +00:00
Andreas Schneider
baee8c17b5 Improve sftp_attributes_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@597 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 12:23:38 +00:00
Andreas Schneider
441929f8b8 Reformat sftp_dir_eof().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@596 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 12:21:30 +00:00
Andreas Schneider
75da135324 Reformat sftp_server_version().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@595 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 11:39:57 +00:00
Andreas Schneider
7592d9f42c Reformat sftp_parse_attr().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@594 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 11:38:55 +00:00
Andreas Schneider
62ac83a8ea Improve buffer_add_attributes() and add a return value.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@593 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 11:36:57 +00:00
Andreas Schneider
4ad9235805 Improve sftp_parse_attr_4().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@592 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 10:27:31 +00:00
Andreas Schneider
fbc6543c83 Improve sftp_parse_attr_4().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@591 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 09:37:28 +00:00
Andreas Schneider
cedc9d71c3 Improve sftp_opendir().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@590 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 09:09:36 +00:00
Andreas Schneider
39f8c7faab Map permission field to type field.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@589 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 09:07:18 +00:00
Andreas Schneider
8fecf4d74c Improve parse_handle_msg().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@588 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 07:13:25 +00:00
Andreas Schneider
b5bda67235 Fix a compile error.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@587 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 07:10:10 +00:00
Andreas Schneider
d62a43ee9d Improve status_msg_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@586 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 07:08:57 +00:00
Andreas Schneider
56e13b227f Improve parse_status_msg().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@585 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 07:06:07 +00:00
Andreas Schneider
a0b4b239fb Reformat sftp_get_new_id().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@584 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 06:59:18 +00:00
Andreas Schneider
4816afc9e8 Reformat sftp_dequeue().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@583 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-23 06:57:49 +00:00
Andreas Schneider
5be3a3c066 Improve sftp_enqueue().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@582 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:53:29 +00:00
Andreas Schneider
75eddb1ebb Improve request_queue_(new,free).
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@581 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:48:16 +00:00
Andreas Schneider
45d8248efb Improve sftp_init().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@580 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:41:14 +00:00
Andreas Schneider
47ff8d4679 Fix compile error.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@579 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:23:45 +00:00
Andreas Schneider
0f075f4d95 Improve sftp_packet_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@578 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:22:22 +00:00
Andreas Schneider
57a5c50a54 Add more error checks to sftp_read_and_dispatch().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@577 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:21:36 +00:00
Andreas Schneider
e99966772e Add more error checks to sftp_get_message().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@576 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:17:20 +00:00
Andreas Schneider
8a3c417e14 Improve sftp_message_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@575 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:09:54 +00:00
Andreas Schneider
e6c0155567 Add more error checks to sftp_message_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@574 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 15:06:28 +00:00
Andreas Schneider
ea59faaec9 Add more error checks to sftp_packet_read().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@573 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 14:52:04 +00:00
Andreas Schneider
6402559f28 Reformat sftp_packet_write().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@572 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 14:48:00 +00:00
Andreas Schneider
9766b2f8d2 Rename buffer_add_data_begin() to buffer_prepend_data().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@571 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 14:31:43 +00:00
Andreas Schneider
b875ce15e8 Add more error checks to sftp server init functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@570 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 14:05:11 +00:00
Andreas Schneider
f59630cbbc Improve sftp_new() and sftp_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@569 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-22 13:59:13 +00:00
Andreas Schneider
afe0c8b2b5 Use ctype to make alldigits simpler.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@568 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-20 14:09:21 +00:00
Andreas Schneider
e067061263 Improve publickey_from_file().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@567 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-20 09:14:35 +00:00
Andreas Schneider
9001a34cd3 Cleanup and add more error checks to _privatekey_from_file().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@566 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-20 08:58:08 +00:00
Andreas Schneider
2f51befc0f Add functions without any passphrase.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@565 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-20 08:42:42 +00:00
Andreas Schneider
03edd0ebb1 Cleanup and add more error checks to privatekey_from_file().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@564 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-20 08:11:24 +00:00
Andreas Schneider
9704df65e3 Rename privatekey_free() to be consistent with publickey_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@563 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-20 07:26:50 +00:00
Andreas Schneider
a3c820cf94 Add more error checks to read_dsa_privatekey().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@562 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-19 09:24:24 +00:00
Andreas Schneider
e6474a34c3 Add more error checks to read_rsa_privatekey().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@561 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-19 09:20:24 +00:00
Andreas Schneider
b7f93a4779 The description should be const.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@560 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-19 09:04:56 +00:00
Andreas Schneider
cc92391034 Add more error checks to privatekey_file_to_buffer().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@559 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-19 09:01:16 +00:00
Andreas Schneider
a1e154e9d5 Use POSIX return values and check them!
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@558 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-19 08:44:35 +00:00
Andreas Schneider
bfc428a0da Change back to a initialized variable and document ssh_finalize().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@557 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 16:19:24 +00:00
Andreas Schneider
44924db3e9 Add FIXME.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@556 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 15:57:23 +00:00
Andreas Schneider
ab8523a391 Fix gcrypt error if no auth callback has been set.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@555 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 15:56:36 +00:00
Andreas Schneider
460969a9ce Improve gcrypt private_key functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@554 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 15:22:59 +00:00
Andreas Schneider
5ef5841f99 Some minor improvements to passphrase_to_key().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@553 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 15:15:45 +00:00
Andreas Schneider
163fbfa44d Reformat asn1_check_sequence() and read_line().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@552 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 15:12:50 +00:00
Andreas Schneider
479744b146 Add more error checks to asn1_get_int().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@551 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 15:06:43 +00:00
Andreas Schneider
a58b7b93de Reformat some functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@550 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 14:56:56 +00:00
Andreas Schneider
c373e9bb03 Build with SSH1 and server by default.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@549 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 12:07:31 +00:00
Andreas Schneider
db2ff03392 Simplify signature_from_string() a bit.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@548 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 12:02:34 +00:00
Andreas Schneider
dc5ef34b54 Fix memleak in sample.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@547 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 11:24:35 +00:00
Andreas Schneider
f402e8d113 Add error checks to ssh_do_sign_with_agent() and fix a memleak.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@546 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 11:22:27 +00:00
Andreas Schneider
ff73826b45 Replace some strcmp with switch to make it a bit faster.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@545 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 11:18:35 +00:00
Andreas Schneider
95cd02c000 Make use of ssh_type_from_name().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@544 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 11:05:21 +00:00
Andreas Schneider
263b8d4f9c Some cleanup for publickey_to_string().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@543 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 10:59:53 +00:00
Andreas Schneider
d20ae18b00 Fix segfault with gcrypt.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@542 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 10:53:28 +00:00
Andreas Schneider
fa01372c88 Add more error checks to ssh_sign_session_id().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@541 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 09:57:20 +00:00
Andreas Schneider
9dab7771fa Fix a segfault if we try to a signature.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@540 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 09:47:22 +00:00
Andreas Schneider
038e6411da Add more error checks to RSA_do_sign().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@539 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 09:44:50 +00:00
Andreas Schneider
4308bb559c Add more error checks to signature_from_string().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@538 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 09:33:32 +00:00
Andreas Schneider
3df5a0dabe Add error checks to signature_to_string().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@537 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 09:14:44 +00:00
Andreas Schneider
192657d88c Add check for the return value of gcry_sexp_find_token().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@536 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 08:56:22 +00:00
Andreas Schneider
57a6388b82 Add more error checks to ssh_encrypt_rsa1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@535 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 08:50:40 +00:00
Andreas Schneider
b9e91ce95a Add more error checks to ssh_do_sign().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@534 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 08:31:26 +00:00
Andreas Schneider
e4c521d896 Use a reference counter for the crypto functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@533 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-18 08:07:11 +00:00
Andreas Schneider
70b422d0fb Don't leak memory in publickey_make_* functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@532 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 18:30:25 +00:00
Andreas Schneider
91afe0de8a Revert commit 530.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@531 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 18:29:31 +00:00
Andreas Schneider
e85b16ae49 Don't leak memory in error path.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@530 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 18:26:59 +00:00
Andreas Schneider
a925c266ca Revert commit 527.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@529 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 18:22:53 +00:00
Andreas Schneider
c48d04b2c7 space_tokenize should be rewritten.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@528 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 14:56:44 +00:00
Andreas Schneider
44ab293f0b Don't leak memory.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@527 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 14:53:24 +00:00
Andreas Schneider
bf4d29b963 Fix memory leak.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@526 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 14:50:05 +00:00
Andreas Schneider
25e80032ba Don't leak memory in error path.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@525 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 14:47:53 +00:00
Andreas Schneider
7e3307cb44 Fix openSSL support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@524 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 14:38:51 +00:00
Andreas Schneider
cf8e444764 Fix build with openssl.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@523 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 14:13:38 +00:00
Andreas Schneider
109c10bdfd Don't shadow a global variable.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@522 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 13:16:54 +00:00
Andreas Schneider
3216520b4c Reformat some of the code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@521 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 13:13:14 +00:00
Andreas Schneider
09fdf0e8e6 Make the cipher table more readable.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@520 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 13:01:56 +00:00
Andreas Schneider
845615cdd8 Add return values to set_encrypt_key and set_decrypt_key.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@519 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 12:52:27 +00:00
Andreas Schneider
32fd37d1ad Reformat HMAC functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@518 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 12:03:59 +00:00
Andreas Schneider
42bdb90751 Reformat MD5 functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@517 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 11:59:17 +00:00
Andreas Schneider
2ed09734eb Cleanup SHA1 functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@516 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 08:37:28 +00:00
Andreas Schneider
b15a04e463 Improve sha1_init().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@515 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-17 08:31:59 +00:00
Andreas Schneider
2b12ffc820 Fix build warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@514 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 17:38:15 +00:00
Andreas Schneider
55d42b9c53 Fix typo.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@513 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 17:21:47 +00:00
Andreas Schneider
07506763ff Reformat signature_verify() and fix match check.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@512 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 17:15:50 +00:00
Andreas Schneider
55791d1fe6 Add more error checks to sig_verify().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@511 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 17:13:07 +00:00
Andreas Schneider
a2cce56134 Add a better match() function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@510 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 16:20:32 +00:00
Andreas Schneider
59f04bfddd Add option to enable crypto debug output.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@509 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 15:47:15 +00:00
Andreas Schneider
5b2586312a Add return values to generate_session_keys() and generate_one_key().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@508 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 15:14:15 +00:00
Andreas Schneider
ac38bbc138 Free bignum_ctx in error path.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@507 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:58:40 +00:00
Andreas Schneider
a092a84139 Add return value to dh_build_k().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@506 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:55:38 +00:00
Andreas Schneider
c6eb54c39e Improve dh_import() functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@505 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:50:53 +00:00
Andreas Schneider
e8a9cb25fe Reformat some functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@504 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:46:34 +00:00
Andreas Schneider
08fcbdc97a Reformat make_string_bn().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@503 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:44:57 +00:00
Andreas Schneider
841de3439d Add memory error check to make_bignum_string().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@502 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:40:47 +00:00
Andreas Schneider
1a22d18afa Add return value to dh_generate_f().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@501 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:34:28 +00:00
Andreas Schneider
baf2eaf165 Add return value to dh_generate_e().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@500 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:31:06 +00:00
Andreas Schneider
ece047171a Add return value to dh_generate_y().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@499 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:27:50 +00:00
Andreas Schneider
5dc03728ed Add return value to dh_generate_x().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@498 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:24:13 +00:00
Andreas Schneider
50b701b4e4 Improve ssh_print_bignum().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@497 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:21:08 +00:00
Andreas Schneider
b246356ab5 Improve ssh_crypto_finalize().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@496 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:18:09 +00:00
Andreas Schneider
8f150afeeb Check return value of ssh_crypto_init().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@495 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:16:29 +00:00
Andreas Schneider
74a06555f6 Add a return value to ssh_socket_init().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@494 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:15:41 +00:00
Andreas Schneider
94021dcdb5 Add error checks to ssh_crypto_init().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@493 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:10:41 +00:00
Andreas Schneider
1ed7c90890 Revert commit 491.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@492 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 14:04:19 +00:00
Andreas Schneider
24fc1b2028 Make dh crypto functions thread safe.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@491 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 12:08:11 +00:00
Andreas Schneider
c608883205 Improve ssh_disconnect().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@490 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 08:53:57 +00:00
Andreas Schneider
c8269682fc Improve ssh_get_issue_banner().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@489 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 08:49:39 +00:00
Andreas Schneider
2bbb005980 Add more error checks to ssh_send_banner().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@488 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 08:46:46 +00:00
Andreas Schneider
a565f255f0 Add more error checks to ssh_connect().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@487 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 08:42:46 +00:00
Andreas Schneider
10dedee3ef Add more error checks to ssh_service_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@486 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 08:27:36 +00:00
Andreas Schneider
1ac6f38032 Add more error checks to dh_handshake().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@485 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 08:19:48 +00:00
Andreas Schneider
ea729492ec Reformat an document ssh_analyze_banner().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@484 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 07:56:16 +00:00
Andreas Schneider
160f6a08d0 Improve and document ssh_get_banner().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@483 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-16 07:49:44 +00:00
Andreas Schneider
1f1e9dc15b Add missing semicolon.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@482 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-15 08:13:10 +00:00
Andreas Schneider
4ca14e442c Improve packet_hmac_verify().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@481 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-15 08:11:33 +00:00
Andreas Schneider
367fd0cb35 Improve packet_encrypt().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@480 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-15 08:04:33 +00:00
Andreas Schneider
c50da458d1 Improve packet_decrypt().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@479 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-15 07:59:07 +00:00
Andreas Schneider
576187c686 Reformat packet_decrypt_len().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@478 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-15 07:56:57 +00:00
Andreas Schneider
af454c0f34 Improve ssh_get_version().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@477 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:54:20 +00:00
Andreas Schneider
317e90c1c1 Improve ssh_get_disconnect_message().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@476 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:52:50 +00:00
Andreas Schneider
8e34f0cf0c Improve ssh_get_status().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@475 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:50:11 +00:00
Andreas Schneider
16084e548e Cleanup ssh_handle_packets().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@474 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:46:04 +00:00
Andreas Schneider
118d4ee131 Add error checks to setter.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@473 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:40:50 +00:00
Andreas Schneider
c847e13c47 Only compile SSHv1 files if enabled.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@472 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:33:04 +00:00
Andreas Schneider
7f06a999e3 Reformat the remaining socket functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@471 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:30:12 +00:00
Andreas Schneider
cd5588aa75 Add more error checks to ssh_socket_blocking_flush().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@470 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:27:58 +00:00
Andreas Schneider
f6e3f1d985 Add more error checks to ssh_socket_nonblocking_flush().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@469 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:24:41 +00:00
Andreas Schneider
7eeb47ffad Reformat ssh_socket_poll().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@468 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:19:35 +00:00
Andreas Schneider
d36a208849 Add more error checks to ssh_socket_wait_for_data().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@467 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:12:50 +00:00
Andreas Schneider
fc1cba4407 Add error checks to ssh_socket_write().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@466 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:05:16 +00:00
Andreas Schneider
f2788c9866 Reformat ssh_socket_completewrite() and use const for buffer.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@465 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 14:02:37 +00:00
Andreas Schneider
e29ef25cdd Reformat socket functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@464 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 13:59:18 +00:00
Andreas Schneider
639e924ef5 Reformat some socket functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@463 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 13:50:55 +00:00
Andreas Schneider
4174577db3 Use consistend return values for packet_wait() functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@462 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 09:37:22 +00:00
Andreas Schneider
6ec84bfc2e Add more error checks to packet_parse().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@461 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 09:26:25 +00:00
Andreas Schneider
13dcfa6bfc Add more error checks to packet_send1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@460 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 09:14:09 +00:00
Andreas Schneider
02ebbfdeca Add more error checks to packet_send2().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@459 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 09:05:57 +00:00
Andreas Schneider
749e95cbf1 Format packet_write().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@458 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 08:58:11 +00:00
Andreas Schneider
68710f3967 Format packet_flush().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@457 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 08:56:44 +00:00
Andreas Schneider
22b3122c6c Use consistent return values for packet_translate().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@456 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 08:55:33 +00:00
Andreas Schneider
640cf4cc93 Add more error checks to packet_read1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@455 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-14 08:47:37 +00:00
Andreas Schneider
e0ae9635ea Add more error checks to packet_read2().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@454 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-10 09:26:18 +00:00
Andreas Schneider
e4624d6ed7 Cleanup misc functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@453 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-10 09:06:27 +00:00
Andreas Schneider
c841e984ba Add error checking to ssh message type functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@452 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-10 09:00:35 +00:00
Andreas Schneider
234844230c Add more error checks to ssh_message_get().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@451 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-10 08:55:31 +00:00
Andreas Schneider
a7b70bc9ee Add error checking to ssh_message_channel_request_reply_default().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@450 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 20:40:14 +00:00
Andreas Schneider
2a118371fa Add error checking to ssh_message_channel_request_reply_success().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@449 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 20:35:51 +00:00
Andreas Schneider
e954d54215 Add error checking to handle_channel_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@448 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 15:40:43 +00:00
Andreas Schneider
3ad76af469 Add error checking to ssh_message_channel_request_open_reply_default().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@447 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 15:29:13 +00:00
Andreas Schneider
926375e8aa Add error checking to ssh_message_channel_request_open_reply_accept().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@446 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 14:33:12 +00:00
Andreas Schneider
a8bb3024e8 Add error checking to handle_channel_request_open().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@445 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 14:28:23 +00:00
Andreas Schneider
38d8875021 Add error checking to ssh_message_auth_reply_success().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@444 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 14:24:49 +00:00
Andreas Schneider
e5b7e8fdfc Add error checks to ssh_message_auth_reply_default().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@443 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 14:22:29 +00:00
Andreas Schneider
3fab89b22f Improve ssh_message_auth* functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@442 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 11:07:31 +00:00
Andreas Schneider
61bee4c60c Add more error checks to handle_userauth_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@441 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 11:03:08 +00:00
Andreas Schneider
04ab5c1b82 Improve ssh_message_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@440 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 10:31:12 +00:00
Andreas Schneider
e9a7d98eac Add return value to handle_unimplemented().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@439 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 10:23:23 +00:00
Andreas Schneider
1715736f0f Add more error checks to handle_service_request().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@438 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 10:20:54 +00:00
Andreas Schneider
38176a753e Reformat message_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@437 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-09 10:16:49 +00:00
Andreas Schneider
89aac630ee Fix return value.
Thanks to Norbert Kiesel <nkiesel@tbdnetworks.com> for the patch.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@436 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 20:29:48 +00:00
Andreas Schneider
abf9ccdc5c Fix build error in SSHv1 channel code.
Thanks to Norbert Kiesel <nkiesel@tbdnetworks.com> for the patch.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@435 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 20:28:59 +00:00
Andreas Schneider
40ddc76e62 Add error checking to publickey to string functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@434 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 14:57:38 +00:00
Andreas Schneider
8333393470 Add error checking to publickey_from_privatekey().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@433 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 13:27:39 +00:00
Andreas Schneider
89670904c0 Add error checking to publickey_from_string().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@432 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 13:11:26 +00:00
Andreas Schneider
29c57bab33 Add error checking to publickey_make_rsa().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@431 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 13:03:50 +00:00
Andreas Schneider
da1eee8c89 Fix header functions and add return value checks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@430 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 12:56:12 +00:00
Andreas Schneider
8948bf41f1 Add error checking to publickey_make_dss().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@429 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 12:52:32 +00:00
Andreas Schneider
befca1dc8a Add return values and error checking to SSHv1 channel functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@428 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 12:40:42 +00:00
Andreas Schneider
83f481981d Add error checking to SSHv1 auth functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@427 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 10:45:30 +00:00
Andreas Schneider
4f6fd0c451 Improve SSHv1 key exchange functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@426 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 08:40:29 +00:00
Andreas Schneider
faa83b2380 Fix SSHv1 channel window problems.
Thanks to Norbert Kiesel <nkiesel@tbdnetworks.com> for the patch.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@425 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 07:19:45 +00:00
Andreas Schneider
38d86e7e17 Fix SSHv1 compile errors.
Thanks to Norbert Kiesel <nkiesel@tbdnetworks.com> for the patch.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@424 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-08 07:13:18 +00:00
Andreas Schneider
c4f65cb5dd Add error checking for make_rsa1_string().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@423 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 19:50:41 +00:00
Andreas Schneider
586ed9103f Add return value and error checks to ssh_send_kex().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@422 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 19:37:45 +00:00
Andreas Schneider
d51dc0d80e Add more error checks to ssh_get_kex().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@421 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 19:27:50 +00:00
Andreas Schneider
efc3c494cc Add error checking to all gzip functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@420 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 19:07:20 +00:00
Andreas Schneider
8c05aab03d Add return value and error checking for hash buffer cookie functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@419 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 18:46:29 +00:00
Andreas Schneider
323ee63a1d Add return value and error checks to make_sessionid().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@418 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 18:38:09 +00:00
Andreas Schneider
1e52650dbf Fix typo.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@417 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 18:37:41 +00:00
Andreas Schneider
7c6f1be5ea Add my copyright.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@416 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 15:11:24 +00:00
Andreas Schneider
f84585ea2f Check for buffer_add_* return values in channel functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@415 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 15:10:47 +00:00
Andreas Schneider
aea8587586 Add return values and error checking to channel_default_bufferize().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@414 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 14:10:45 +00:00
Andreas Schneider
8d3a43db7a Improve channel_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@413 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 14:02:24 +00:00
Andreas Schneider
7059e05a2a Check return values of buffer functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@412 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 13:57:17 +00:00
Andreas Schneider
fe2bc30984 Fix a memory leak in realloc_buffer.
If realloc fails, the original block is left untouched. So
don't overwrite it that we can free it.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@411 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 13:48:34 +00:00
Andreas Schneider
d1fefb4de3 Check return values of buffer_add_* and packet_send functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@410 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-07 13:40:40 +00:00
Andreas Schneider
cd3dd624b3 Check return values of buffer_add_* functions in agent code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@409 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 18:38:56 +00:00
Andreas Schneider
8d6d96657a Fix build warnings on x86_64.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@408 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 18:36:15 +00:00
Andreas Schneider
6c6094538f Use const where it should be used.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@407 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 11:26:34 +00:00
Andreas Schneider
db4ff30f38 Make use of const.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@406 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:59:16 +00:00
Andreas Schneider
8253e2170e Fix build warnings found with printf checking of ssh_set_error().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@405 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:43:59 +00:00
Andreas Schneider
2aeeb5a518 Add printf checking for ssh_set_error().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@404 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:39:08 +00:00
Andreas Schneider
c8265940ea Make return of ssh_get_error() const.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@403 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:38:30 +00:00
Andreas Schneider
6492e3e69c Fix build warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@402 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:34:02 +00:00
Andreas Schneider
081e81b813 Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@401 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:32:08 +00:00
Andreas Schneider
688ac9382f Don't shadow a global variable declaration in unistd.h.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@400 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:29:48 +00:00
Andreas Schneider
1dc12b9cc5 Fix varable name.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@399 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:22:46 +00:00
Andreas Schneider
01e789184a Don't shadow a global variable declaration on unistd.h.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@398 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:15:57 +00:00
Andreas Schneider
58fd38cd90 Fix a build warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@397 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:12:25 +00:00
Andreas Schneider
f8ef75c510 Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@396 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 10:00:41 +00:00
Andreas Schneider
b7c65baef3 Fix build warnings in key exchange functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@395 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 09:46:47 +00:00
Andreas Schneider
139eb4696c Fix build warnings, mostly const chars.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@394 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 09:41:54 +00:00
Andreas Schneider
ef1a41efcf Fix compile warning (const).
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@393 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 09:24:53 +00:00
Andreas Schneider
dbab7b5a18 Make service name const.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@392 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 09:18:29 +00:00
Andreas Schneider
b239fda60c Fix compile warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@391 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 09:16:15 +00:00
Andreas Schneider
f286e8c9b0 Don't shadow global variable sftp.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@390 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-05 09:10:48 +00:00
Andreas Schneider
f7959bd5eb Improve free functions of the keyfiles.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@389 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-04 14:38:39 +00:00
Andreas Schneider
226e48b4b7 Improve channel_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@388 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-04 14:27:59 +00:00
Andreas Schneider
a7fbedf8d6 Improve crypto free functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@387 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-04 14:15:14 +00:00
Andreas Schneider
b3a0c6d9cb Improve key free functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@386 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-04 13:55:32 +00:00
Andreas Schneider
1100a22e98 Improve ssh_cleanup().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@385 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 13:00:35 +00:00
Andreas Schneider
18bce1e209 Add NULL check to ssh_message_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@384 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 12:58:32 +00:00
Andreas Schneider
30d1bf863e Add NULL check to private_key_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@383 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 12:57:19 +00:00
Andreas Schneider
0e82ddbd81 Add NULL check for agent_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@382 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 12:52:34 +00:00
Andreas Schneider
b5eb33bb69 Improve ssh_socket_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@381 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 12:50:17 +00:00
Andreas Schneider
2791ce7e01 Add NULL checks to crypto free functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@380 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 12:48:45 +00:00
Andreas Schneider
8485c87cf2 Remove files which aren't in use anymore.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@379 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 09:22:05 +00:00
Andreas Schneider
5a75c0fd78 Don't leak memory in agent_new() error path.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@378 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:41:34 +00:00
Andreas Schneider
41dd2a2a3b Check return values of option setter.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@377 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:38:33 +00:00
Andreas Schneider
2aa81c0544 Add memory error checks for strdup().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@376 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:31:28 +00:00
Andreas Schneider
0856ba3008 Add memory error checks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@375 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:29:36 +00:00
Andreas Schneider
8d66a455f7 Add my copyright.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@374 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:24:33 +00:00
Andreas Schneider
a4d98b58fc Improve the documentation of ssh_options_getopt().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@373 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:23:29 +00:00
Andreas Schneider
497c31d9a0 Improve ssh_options_getopt().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@372 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 08:19:57 +00:00
Andreas Schneider
4db7fc77ff Improve and document ssh_options_set_[dsa,rsa]_server_key().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@371 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-03 07:47:50 +00:00
Andreas Schneider
3b7940d05e Improve ssh_options_set_auth_callback().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@370 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 21:37:48 +00:00
Andreas Schneider
2afc8a4f1c Improve ssh_options_set_log_verbosity().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@369 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 16:33:28 +00:00
Andreas Schneider
da65ee4dbb Improve ssh_options_set_log_function().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@368 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:42:45 +00:00
Andreas Schneider
0dee533531 Improve ssh_options_allow_ssh2().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@367 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:39:49 +00:00
Andreas Schneider
396db49a41 Improve ssh_options_allow_ssh1().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@366 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:37:45 +00:00
Andreas Schneider
94e91b73f7 Fix typo.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@365 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:35:13 +00:00
Andreas Schneider
115450ac9b Improve ssh_options_set_timeout().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@364 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:34:55 +00:00
Andreas Schneider
eb461d1dbe Improve ssh_options_set_status_callback().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@363 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:32:03 +00:00
Andreas Schneider
cfea89fb7c Improve ssh_options_default_known_hosts_file().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@362 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:26:44 +00:00
Andreas Schneider
5309651849 Improve ssh_options_default_ssh_dir().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@361 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:25:02 +00:00
Andreas Schneider
30b02325cb Improve ssh_options_default_username().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@360 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:22:28 +00:00
Andreas Schneider
1fceffa434 Improve ssh_options_set_wanted_algos().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@359 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:19:51 +00:00
Andreas Schneider
3f4c1976fd Improve ssh_options_set_banner().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@358 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:14:27 +00:00
Andreas Schneider
a459a8b4db Improve ssh_options_set_identity().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@357 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:10:50 +00:00
Andreas Schneider
4d203e8420 Fix memory leaks.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@356 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:07:06 +00:00
Andreas Schneider
5ba2acde0a Improve ssh_options_set_known_hosts_file().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@355 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:04:56 +00:00
Andreas Schneider
9ea6ea581d Improve ssh_options_set_ssh_dir().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@354 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 12:00:45 +00:00
Andreas Schneider
4373fc64e3 Improve ssh_options_set_bind().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@353 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 11:56:13 +00:00
Andreas Schneider
b6fbe97f24 Improve ssh_options_set_fd().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@352 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 11:53:24 +00:00
Andreas Schneider
d86ac9e04b Improve ssh_options_set_port().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@351 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 11:50:23 +00:00
Andreas Schneider
71913c8fea Add missing argument checks for options.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@350 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 11:47:06 +00:00
Andreas Schneider
8de3dc44ca Improve ssh_options_set_username().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@349 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 10:18:01 +00:00
Andreas Schneider
ab54736b5d Make ssh_options_free() documentation public.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@348 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 10:14:09 +00:00
Andreas Schneider
6026de4648 Improve ssh_options_set_host().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@347 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 10:13:12 +00:00
Andreas Schneider
a9ef024f10 Make ssh_options_free() public.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@346 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 10:09:23 +00:00
Andreas Schneider
595a5d9ff2 Improve ssh_options_copy() and ssh_options_free().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@345 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 09:58:59 +00:00
Andreas Schneider
356a8a7631 Add error checking for strdup.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@344 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 09:35:41 +00:00
Andreas Schneider
9f581a2809 Add error checking of strdup.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@343 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 09:32:22 +00:00
Andreas Schneider
d60783eeb7 Improve ssh_send_banner() and add error checking of strdup.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@342 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 09:31:02 +00:00
Andreas Schneider
ae4265d304 Add a return value to ssh_userauth_kbdint_setanswer().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@341 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 09:24:46 +00:00
Andreas Schneider
ee3b641fb1 Cleanup todo's.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@340 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 08:36:32 +00:00
Andreas Schneider
c195e0fa7d There is no file to close here.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@339 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 08:33:04 +00:00
Andreas Schneider
f8d5bb9785 Fix string_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@338 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 08:32:30 +00:00
Andreas Schneider
3a67aaa428 Improve the ssh_get_pubkey_hash() function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@337 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 07:31:54 +00:00
Andreas Schneider
4c84a3e0f2 Simply return 0.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@336 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-02 07:31:12 +00:00
Andreas Schneider
ff0f8b7608 Use memset cause something is wrong with the macro.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@335 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 22:33:35 +00:00
Andreas Schneider
9ff4afa523 Fix ssh connection.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@334 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 22:16:33 +00:00
Andreas Schneider
10397d44db Add one missing memory error check in crypt.c.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@333 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 21:30:53 +00:00
Andreas Schneider
fc73b0b33f Add NULL check to buffer free.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@332 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 21:29:04 +00:00
Andreas Schneider
7b464d4e15 Improve ssh_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@331 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 21:27:54 +00:00
Andreas Schneider
891539af6c Add memory error checks for crypto wrapper functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@330 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 21:24:16 +00:00
Andreas Schneider
1b627b3867 More memory error checks for ssh_socket_new().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@329 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 20:24:09 +00:00
Andreas Schneider
b06c167775 Fix memory error checking in socket functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@328 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 20:18:31 +00:00
Andreas Schneider
ace6eed6c0 Add memory error checking for sftpserver functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@327 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 20:14:43 +00:00
Andreas Schneider
cde3151634 Fix typo.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@326 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 20:14:24 +00:00
Andreas Schneider
cd4df00dff Add memory error checks for sftp functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@325 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 20:09:20 +00:00
Andreas Schneider
b2e50e8967 Add memory error checks for server functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@324 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 20:01:44 +00:00
Andreas Schneider
2c3e423480 Add memory error checking for packet functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@323 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 19:59:17 +00:00
Andreas Schneider
8bcd65193c Added memory error checks for option functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@322 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 19:54:41 +00:00
Andreas Schneider
54ce86e3b1 Added memory error checks for message functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@321 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 19:44:19 +00:00
Andreas Schneider
904a5b2f7c Fix memory error checking in key functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@320 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 19:34:26 +00:00
Andreas Schneider
ddd10236bd Add memory error checking to keyfile functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@319 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 11:03:06 +00:00
Andreas Schneider
b4c65e41f6 Fix build warning.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@318 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 10:50:12 +00:00
Andreas Schneider
79e9eb53d4 Add memory error checking to key exchange functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@317 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 10:49:27 +00:00
Andreas Schneider
10afd9818c Check for memory allocation errors.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@316 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 10:23:52 +00:00
Andreas Schneider
186667724a Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@315 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 10:22:14 +00:00
Andreas Schneider
f80efcc260 Add checks for memory errors in channel functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@314 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 10:14:26 +00:00
Andreas Schneider
2634f45e11 Check for errors of memory allocation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@313 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 10:05:15 +00:00
Andreas Schneider
98f78e1102 Add error checking to buffer functions.
We don't check arguments cause we want a segfault here.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@312 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 09:36:44 +00:00
Andreas Schneider
8758b1260b Fix segfaults in string.c.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@311 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 09:28:21 +00:00
Andreas Schneider
04d916f3aa Add arg and error checking for the string functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@310 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-04-01 08:37:26 +00:00
Andreas Schneider
15d0dc7a4e Fix sources list of libssh.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@309 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-30 16:36:28 +00:00
Andreas Schneider
ae4ef84702 Create a ssh_get_hexa function.
This function converts a buffer into a colon separated hex string.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@308 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-30 13:11:47 +00:00
Aris Adamantiadis
1fd7a875be Fixed memory leak and file descriptor leak in known host parsing
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@307 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-29 20:29:55 +00:00
Andreas Schneider
07d748ef5e Remove automake files.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@306 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-29 20:25:59 +00:00
Andreas Schneider
3441e77ddc Normalize the license in all files and add vim tab instructions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@305 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-29 20:19:18 +00:00
Andreas Schneider
84430b2277 Improve the lowercase function and free memory allocated by lowercase().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@304 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-29 15:19:45 +00:00
Aris Adamantiadis
4ab28a049f openssh Hashed host support !
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@303 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-29 00:31:36 +00:00
Aris Adamantiadis
3090d104cf Working new known_host algorithm
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@302 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 23:43:17 +00:00
Andreas Schneider
75d5bb457f Fix typos.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@301 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:34:51 +00:00
Andreas Schneider
6aff00e762 Ignore build files.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@300 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:24:26 +00:00
Andreas Schneider
2b07dcd1e3 Try to fix build file ignores.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@299 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:23:19 +00:00
Andreas Schneider
affe522b25 Ignore build, cscope and ctags files.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@298 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:22:45 +00:00
Andreas Schneider
f16cabc73e Undo the remove of the Doxyfiles.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@297 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:20:54 +00:00
Andreas Schneider
39a5b53eb5 Update INSTALL file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@296 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:06:36 +00:00
Andreas Schneider
fc8ad69f5c Remove autotools and win32 specific files.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@295 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 22:01:05 +00:00
Andreas Schneider
78b6e25ede Fix compilation of the server with option turned off.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@294 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:58:54 +00:00
Andreas Schneider
e02a6e0225 Add WITH_SERVER option.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@293 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:56:28 +00:00
Andreas Schneider
fce4840c77 Fix SSH1 support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@292 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:52:15 +00:00
Andreas Schneider
117fc43b69 Add myself to the authors file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@291 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:48:04 +00:00
Andreas Schneider
01c0877495 Fix the name of the SSH1 support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@290 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:44:36 +00:00
Andreas Schneider
33b948cab9 Add an option WITH_LIBZ to compile with zlib support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@289 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:43:53 +00:00
Andreas Schneider
d3d7f08d6a Fix zlib detection.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@288 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-28 21:14:45 +00:00
Andreas Schneider
3b38c66b3d Fix possible precedence problems.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@287 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-26 23:00:53 +00:00
Andreas Schneider
390d9e53dc Fix win32 builds.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@286 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-25 16:17:11 +00:00
Andreas Schneider
fae68cac8a Add an option to build a static library.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@285 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-25 15:01:33 +00:00
Andreas Schneider
cf89b6eb48 Change the name of the doxygen group to match the others.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@284 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-21 09:56:29 +00:00
Andreas Schneider
9249006e64 Add a ssh_version function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@283 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-21 09:29:31 +00:00
Andreas Schneider
c9818a9948 Fix doxygen generation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@282 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-21 09:11:13 +00:00
Laurent Bigonville
e4d16db116 Use my debian.org address in Uploaders and takeover the package
with Jean-Philippe permission

git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@281 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 16:24:23 +00:00
Laurent Bigonville
98711e9d0f debian/libssh-2-doc.doc-base: Fix doc-base-uses-applications-section
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@280 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 16:15:04 +00:00
Laurent Bigonville
6bda3c7466 Use my debian.org address in Uploaders
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@279 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 16:09:58 +00:00
Laurent Bigonville
139f59ec62 Add ${misc:Depends} to please lintian
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@278 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 16:05:33 +00:00
Laurent Bigonville
2ab6894132 Use debug section for -dbg package
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@277 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 16:02:53 +00:00
Andreas Schneider
63cff85b1a Fix compile warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@276 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 09:27:08 +00:00
Andreas Schneider
0151b6e170 Fix build with cmake >= 2.6.3. -D does not overwrite FORCE.
Patch by Jim McDonough <jmcd@samba.org>


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@275 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-18 09:26:51 +00:00
Andreas Schneider
ee54acb417 Don't require C++ compiler.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@274 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-17 22:04:16 +00:00
Andreas Schneider
08e2408896 Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@273 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-14 15:14:18 +00:00
Andreas Schneider
453b91903b Enable printf attribute checking on GNU systems.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@272 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-14 11:20:55 +00:00
Andreas Schneider
5681c542f6 R.I.P. ssh_say()
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@271 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-12 15:55:08 +00:00
Andreas Schneider
fe5f283c48 Get rid of ssh_say in the sample ssh client.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@270 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-12 15:52:17 +00:00
Andreas Schneider
05495a263a Use ssh_log instead of ssh_say in ssh_list_kex().
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@269 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-12 15:45:38 +00:00
Andreas Schneider
40bce93e97 Get rid of a ssh_say.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@268 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-12 15:29:34 +00:00
Andreas Schneider
4d889e0af0 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@267 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-12 15:28:57 +00:00
Andreas Schneider
49c88c2cd7 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@266 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 12:20:47 +00:00
Andreas Schneider
1d3eeda7f9 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@265 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 11:54:36 +00:00
Andreas Schneider
fe98c015e9 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@264 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 11:07:57 +00:00
Andreas Schneider
d347b7e00f Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@263 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 10:52:37 +00:00
Andreas Schneider
f99fefc587 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@262 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 10:49:04 +00:00
Andreas Schneider
eced7fb958 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@261 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 10:30:15 +00:00
Andreas Schneider
1486d844e7 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@260 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 10:22:28 +00:00
Andreas Schneider
78273fe5c5 Fix build.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@259 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 10:22:14 +00:00
Andreas Schneider
3247a7683a Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@258 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 09:56:58 +00:00
Andreas Schneider
39a8009e78 Remove ssh_say.
Aris, how should we print an error?


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@257 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 09:53:56 +00:00
Andreas Schneider
081adeb3d6 Replace ssh_say with ssh_log.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@256 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 09:52:01 +00:00
Andreas Schneider
1edc164265 Fix compiler warning about unused variable.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@255 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 09:31:50 +00:00
Andreas Schneider
acb4e37957 Fix compiler warnings in keyfile.c.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@254 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-11 09:29:21 +00:00
Andreas Schneider
02f2511985 Fix NSIS installer creation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@253 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-10 13:51:26 +00:00
Andreas Schneider
a800db80e4 Add NSIS generator for CPack.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@252 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 16:11:56 +00:00
Andreas Schneider
ec0c1ef63b Add NSIS support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@251 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 14:53:57 +00:00
Andreas Schneider
b4cebfb03d Fix compilation and installation of libssh.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@250 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 14:05:41 +00:00
Andreas Schneider
461d9413d3 Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@249 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 14:05:10 +00:00
Andreas Schneider
cf1e7fa836 Fix cross compilation errors.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@248 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 13:35:34 +00:00
Andreas Schneider
14580705d5 Set needed functions on Windows to true for now.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@247 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 13:32:28 +00:00
Andreas Schneider
6ab119d8dc Fix cross compilation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@246 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 13:31:35 +00:00
Andreas Schneider
f0b2c39d2f Fix crypto/gcrypt detection and prepare for cross compilation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@245 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 12:11:10 +00:00
Andreas Schneider
814cde9069 Find zlib of cross mingw.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@244 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 12:10:07 +00:00
Andreas Schneider
851560426f Fix build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@243 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 12:09:22 +00:00
Andreas Schneider
facc434ce4 Add missing include file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@242 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 12:06:04 +00:00
Andreas Schneider
4b8eb38586 Fix build errors.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@241 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 12:05:11 +00:00
Andreas Schneider
d3e64a744e Fix build on Windows.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@240 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 09:54:38 +00:00
Andreas Schneider
fad349fecd Fix version number.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@239 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 09:50:41 +00:00
Andreas Schneider
e1a1796783 Fix build on Windows.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@238 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-03-08 09:48:31 +00:00
Andreas Schneider
b9e6ce934d Rename function to set sftp error to be consistent.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@237 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-09 13:13:52 +00:00
Andreas Schneider
5ea8088938 Rename function to agent_is_running.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@236 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-09 12:56:58 +00:00
Andreas Schneider
7ceaf5c43a Fix the ifdefs.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@235 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-06 13:37:43 +00:00
Andreas Schneider
f4bbc45bbe Add missing ifdef for ssh-agent support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@234 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-06 12:51:37 +00:00
Andreas Schneider
ff19095415 Fix build warnings in server sample.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@233 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-06 09:59:54 +00:00
Andreas Schneider
b8c78bdb5a Fix build warnings in client sample.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@232 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-06 09:58:44 +00:00
Andreas Schneider
73cde232be Complete ssh client agent support.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@231 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-06 09:46:10 +00:00
Aris Adamantiadis
53226f98f2 exit-status should be -1 when undefined
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@230 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-04 19:21:20 +00:00
Aris Adamantiadis
22b422995f adding error status in samplessh
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@229 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-04 19:18:06 +00:00
Aris Adamantiadis
ac3d66ac69 channel_get_exit_status()
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@228 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-03 18:07:26 +00:00
Aris Adamantiadis
903e22cd11 added logging for exit-status
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@227 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-03 17:54:27 +00:00
Andreas Schneider
0679dd4fd8 Fix typo.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@226 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-03 17:24:56 +00:00
Andreas Schneider
8eaecdc7b8 Update doxygen config file for user documentation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@225 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-03 12:27:47 +00:00
Andreas Schneider
cfbc063dd3 Add a 'make doc' target to create doxygen documentation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@224 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-03 10:43:45 +00:00
Andreas Schneider
81de36e923 Moved ssh_crypto_init to priv.h file and added a note.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@223 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 17:14:38 +00:00
Andreas Schneider
a80ad5cbd3 Remove deprecated pubkey_get_hash function.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@222 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 17:08:13 +00:00
Andreas Schneider
69a1fac7a1 Fix build warnings in the crypto wrapper functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@221 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 17:00:04 +00:00
Andreas Schneider
1fd6a2e9e0 Fix build warnings in socket code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@220 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:56:31 +00:00
Andreas Schneider
9414b53bef Return count if the write was successful.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@219 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:49:05 +00:00
Andreas Schneider
5f58fc773c Fix build warnings in sftp code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@218 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:47:51 +00:00
Andreas Schneider
3991b3a3aa Fix the build.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@217 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:22:07 +00:00
Andreas Schneider
58404116bc Fix build warnings in session code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@216 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:20:55 +00:00
Andreas Schneider
8c60d864c7 Fix build warings in the server code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@215 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:17:02 +00:00
Andreas Schneider
974a160fd3 Fix several build warnings.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@214 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 16:09:38 +00:00
Andreas Schneider
5e03a95a93 Fix compiler warnings.
Aris please check if ssh_crypto_init, ssh_crypto_finalize and
pubkey_get_hash could be removed.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@213 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:45:48 +00:00
Andreas Schneider
5db7ec356b Make ssh_connect_ai_timeout static.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@212 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:41:00 +00:00
Andreas Schneider
5d798f6225 Use unsigned values for length in buffer functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@211 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:39:09 +00:00
Andreas Schneider
7250e03f97 Fix build warnings in channel code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@210 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:35:39 +00:00
Andreas Schneider
948c3f1bef The string_len function should return unsigned int.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@209 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:22:26 +00:00
Andreas Schneider
55c7cc6839 Fix compiler warning in client.c.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@208 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:19:44 +00:00
Andreas Schneider
ddf4a8e9c9 Make ssh_analyze_banner static as it is only used in this file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@207 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:16:33 +00:00
Andreas Schneider
f4d74e285e Fix compiler warnings in buffer implementation.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@206 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:14:19 +00:00
Andreas Schneider
fc0928a572 Fix build warnings of the auth code.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@205 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 15:01:18 +00:00
Andreas Schneider
ed53a70854 Make the build_make shell script executable.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@204 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 14:50:44 +00:00
Andreas Schneider
460d0b402b Add Makefiles for the CMake build system.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@203 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 14:44:46 +00:00
Andreas Schneider
2347065481 Add missing agent files.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@202 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 14:43:48 +00:00
Andreas Schneider
4259c9195c Cleanup the define check in the libssh header file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@201 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 14:42:40 +00:00
Andreas Schneider
70aa33c041 Start with ssh agent implementation.
This is work in progress.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@200 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-02-02 14:41:44 +00:00
Andreas Schneider
944084964a Add extern C declatrion to server header file.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@199 7dcaeef0-15fb-0310-b436-a5af3365683c
2009-01-08 17:48:35 +00:00
Andreas Schneider
f9f8ded7f0 Add a more generic auth callback function.
You should be able to obtain passwords or usernames with this
function.

Signed-off-by: Andreas Schneider <mail@cynapses.org>


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@198 7dcaeef0-15fb-0310-b436-a5af3365683c
2008-12-29 11:33:51 +00:00
Andreas Schneider
6ea3888054 Change version numbers to 0.3.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@197 7dcaeef0-15fb-0310-b436-a5af3365683c
2008-12-22 13:44:55 +00:00
Andreas Schneider
b11ddd23b2 Add doxygen documentation for all public sftp functions.
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@196 7dcaeef0-15fb-0310-b436-a5af3365683c
2008-12-22 09:51:31 +00:00
Andreas Schneider
c3e026c303 Create POSIX like sftp functions.
This breaks the API and will be libssh 0.3.


git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@195 7dcaeef0-15fb-0310-b436-a5af3365683c
2008-12-22 09:50:40 +00:00
251 changed files with 46978 additions and 19480 deletions

1
.clang_complete Normal file
View File

@@ -0,0 +1 @@
-Iinclude -Ibuild

6
.gitignore vendored Normal file
View File

@@ -0,0 +1,6 @@
.*
*.swp
*~$
build
cscope.*
tags

View File

@@ -1,5 +1,7 @@
Author(s):
Aris Adamantiadis <aris (at) 0xbadc0de (dot) be> (project initiator)
Aris Adamantiadis <aris@0xbadc0de.be> (project initiator)
Andreas Schneider <mail@cynapses.org> (developer)
Nick Zitzmann <seiryu (at) comcast (dot) net> (mostly client SFTP stuff)

117
CMakeLists.txt Normal file
View File

@@ -0,0 +1,117 @@
project(libssh C)
# Required cmake version
cmake_minimum_required(VERSION 2.6.0)
# global needed variables
set(APPLICATION_NAME ${PROJECT_NAME})
set(APPLICATION_VERSION_MAJOR "0")
set(APPLICATION_VERSION_MINOR "5")
set(APPLICATION_VERSION_PATCH "0")
set(APPLICATION_VERSION "${APPLICATION_VERSION_MAJOR}.${APPLICATION_VERSION_MINOR}.${APPLICATION_VERSION_PATCH}")
# SOVERSION scheme: CURRENT.AGE.REVISION
# If there was an incompatible interface change:
# Increment CURRENT. Set AGE and REVISION to 0
# If there was a compatible interface change:
# Increment AGE. Set REVISION to 0
# If the source code was changed, but there were no interface changes:
# Increment REVISION.
set(LIBRARY_VERSION "4.2.0")
set(LIBRARY_SOVERSION "4")
# where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked
set(CMAKE_MODULE_PATH
${CMAKE_SOURCE_DIR}/cmake/Modules
)
# add definitions
include(DefineCMakeDefaults)
include(DefinePlatformDefaults)
include(DefineCompilerFlags)
include(DefineInstallationPaths)
include(DefineOptions.cmake)
include(CPackConfig.cmake)
# disallow in-source build
include(MacroEnsureOutOfSourceBuild)
macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source build. Please create a separate build directory and run 'cmake /path/to/${PROJECT_NAME} [options]' there.")
# add macros
include(MacroAddPlugin)
include(MacroCopyFile)
# search for libraries
if (WITH_LIBZ)
find_package(ZLIB REQUIRED)
endif (WITH_LIBZ)
if (WITH_GCRYPT)
find_package(GCrypt REQUIRED)
if (NOT GCRYPT_FOUND)
message(FATAL_ERROR "Could not find GCrypt")
endif (NOT GCRYPT_FOUND)
else (WITH_GCRYPT)
find_package(OpenSSL)
if (NOT OPENSSL_FOUND)
find_package(GCrypt)
if (NOT GCRYPT_FOUND)
message(FATAL_ERROR "Could not find OpenSSL or GCrypt")
endif (NOT GCRYPT_FOUND)
endif (NOT OPENSSL_FOUND)
endif(WITH_GCRYPT)
# Find out if we have threading available
set(CMAKE_THREAD_PREFER_PTHREADS ON)
find_package(Threads)
# config.h checks
include(ConfigureChecks.cmake)
configure_file(config.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config.h)
# check subdirectories
add_subdirectory(doc)
add_subdirectory(include)
add_subdirectory(src)
# pkg-config file
configure_file(libssh.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libssh.pc)
install(
FILES
${CMAKE_CURRENT_BINARY_DIR}/libssh.pc
DESTINATION
${LIB_INSTALL_DIR}/pkgconfig
COMPONENT
pkgconfig
)
add_subdirectory(examples)
if (WITH_TESTING)
find_package(CMockery REQUIRED)
include(AddCMockeryTest)
add_subdirectory(tests)
endif (WITH_TESTING)
message(STATUS "********************************************")
message(STATUS "********** ${PROJECT_NAME} build options : **********")
message(STATUS "zlib support: ${WITH_LIBZ}")
message(STATUS "libgcrypt support: ${WITH_GCRYPT}")
message(STATUS "SSH-1 support: ${WITH_SSH1}")
message(STATUS "SFTP support: ${WITH_SFTP}")
message(STATUS "Server support : ${WITH_SERVER}")
message(STATUS "Pcap debugging support : ${WITH_PCAP}")
message(STATUS "Unit testing: ${WITH_TESTING}")
message(STATUS "Client code Unit testing: ${WITH_CLIENT_TESTING}")
if (WITH_INTERNAL_DOC)
message(STATUS "Internal documentation generation")
else (WITH_INTERNAL_DOC)
message(STATUS "Public API documentation generation")
endif (WITH_INTERNAL_DOC)
message(STATUS "Benchmarks: ${WITH_BENCHMARKS}")
message(STATUS "********************************************")

53
CPackConfig.cmake Normal file
View File

@@ -0,0 +1,53 @@
# For help take a look at:
# http://www.cmake.org/Wiki/CMake:CPackConfiguration
### general settings
set(CPACK_PACKAGE_NAME ${APPLICATION_NAME})
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "The SSH library")
set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/README")
set(CPACK_PACKAGE_VENDOR "The SSH Library Development Team")
set(CPACK_PACKAGE_INSTALL_DIRECTORY ${CPACK_PACKAGE_NAME})
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/COPYING")
### versions
set(CPACK_PACKAGE_VERSION_MAJOR "0")
set(CPACK_PACKAGE_VERSION_MINOR "5")
set(CPACK_PACKAGE_VERSION_PATCH "0")
set(CPACK_PACKAGE_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
### source generator
set(CPACK_SOURCE_GENERATOR "TGZ")
set(CPACK_SOURCE_IGNORE_FILES "~$;[.]swp$;/[.]svn/;/[.]git/;.gitignore;/build/;tags;cscope.*")
set(CPACK_SOURCE_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}")
if (WIN32)
set(CPACK_GENERATOR "ZIP")
### nsis generator
find_package(NSIS)
if (NSIS_MAKE)
set(CPACK_GENERATOR "${CPACK_GENERATOR};NSIS")
set(CPACK_NSIS_DISPLAY_NAME "The SSH Library")
set(CPACK_NSIS_COMPRESSOR "/SOLID zlib")
set(CPACK_NSIS_MENU_LINKS "http://www.libssh.org/" "libssh homepage")
endif (NSIS_MAKE)
endif (WIN32)
set(CPACK_PACKAGE_INSTALL_DIRECTORY "libssh")
set(CPACK_PACKAGE_FILE_NAME ${APPLICATION_NAME}-${CPACK_PACKAGE_VERSION})
set(CPACK_COMPONENT_LIBRARIES_DISPLAY_NAME "Libraries")
set(CPACK_COMPONENT_HEADERS_DISPLAY_NAME "C/C++ Headers")
set(CPACK_COMPONENT_LIBRARIES_DESCRIPTION
"Libraries used to build programs which use libssh")
set(CPACK_COMPONENT_HEADERS_DESCRIPTION
"C/C++ header files for use with libssh")
set(CPACK_COMPONENT_HEADERS_DEPENDS libraries)
#set(CPACK_COMPONENT_APPLICATIONS_GROUP "Runtime")
set(CPACK_COMPONENT_LIBRARIES_GROUP "Development")
set(CPACK_COMPONENT_HEADERS_GROUP "Development")
include(CPack)

9
CTestConfig.cmake Normal file
View File

@@ -0,0 +1,9 @@
set(UPDATE_TYPE "true")
set(CTEST_PROJECT_NAME "libssh")
set(CTEST_NIGHTLY_START_TIME "01:00:00 CET")
set(CTEST_DROP_METHOD "http")
set(CTEST_DROP_SITE "test.libssh.org")
set(CTEST_DROP_LOCATION "/submit.php?project=libssh")
set(CTEST_DROP_SITE_CDASH TRUE)

362
ChangeLog
View File

@@ -1,80 +1,290 @@
libssh-0.11-dev
-server implementation development. I won't document it before it even works.
-small bug corrected when connecting to sun ssh servers.
-channel wierdness corrected (writing huge data packets)
-channel_read_nonblocking added
-channel bug where stderr wasn't correctly read fixed.
-sftp_file_set_nonblocking added. It's now possible to have nonblocking SFTP IO
-connect_status callback.
-priv.h contains the internal functions, libssh.h the public interface
-options_set_timeout (thx marcelo) really working.
-tcp tunneling through channel_open_forward.
-channel_request_exec()
-channel_request_env()
-ssh_get_pubkey_hash()
-ssh_is_server_known()
-ssh_write_known_host()
-options_set_ssh_dir
-how could this happen ! there weren't any channel_close !
-nasty channel_free bug resolved.
-removed the unsigned long all around the code. use only u8,u32 & u64.
-it now compiles and runs under amd64 !
-channel_request_pty_size
-channel_change_pty_size
-options_copy()
-ported the doc to an HTML file.
-small bugfix in packet.c
-prefixed error constants with SSH_
-sftp_stat, sftp_lstat, sftp_fstat. thanks Michel Bardiaux for the patch.
-again channel number mismatch fixed.
-fixed a bug in ssh_select making the select fail when a signal has been caught.
-keyboard-interactive authentication working.
ChangeLog
==========
5th march 2004 : libssh-0.1
-Begining of sftp subsystem implementation. It's stable enough to be used :)
-some cleanup into channels implementation
-Now every channel functions is called by its CHANNEL handler. no any way to play again with numbers.
-added channel_poll() and channel_read(). Now, it's possible to manipulate channel streams only with channel_read() and channel_write(),
with help of channel_poll().
-changed the client so it uses the new channel_poll and channel_read interface
-small use-after-free bug with channels resolved, and a noninitialised data of SIGNATURE struct.
-changed stupidities in lot of function names.
-removed a debug output file opened by default.
-Added API.txt, the libssh programmer handbook. (I hate documentation)
-Various bug fixes from Nick Zitzmann. Thank to him, libssh now runs under macosX !
-Developed a cryptographic structure for handling protocols. Adding a custom-based cipher should be the story of thirty
minutes. It now supports aes-256,aes-192,aes-128 and blowfish-128 !
-An autoconf script which took me half of a day to set up. Respect it!
-A ssh_select wrapper has been written.
It all means the API has changed. not a lot but enough to be incompatible with anything which has been written.
version 0.5.0 (released 2011-06-01)
* Added ssh_ prefix to all functions.
* Added complete Windows support.
* Added improved server support.
* Added unit tests for a lot of functions.
* Added asynchronous service request.
* Added a multiplatform ssh_getpass() function.
* Added a tutorial.
* Added a lot of documentation.
* Fixed a lot of bugs.
* Fixed several memory leaks.
10th october 2003 : libssh-0.0.4
-some terminal code (eof handling) added
-channels bugfix (it still needs some tweaking though)
-zlib support
-added a wrapper.c file. The goal is to provide a similar API to every cryptographic functions. bignums and sha/md5 are wrapped now.
-more work than it first looks.
-Support for other crypto libs planed (lighter libs)
-Fixed stupid select() bug.
-libssh now compiles and links with openssl 0.9.6 (but you're advised to upgrade)
-RSA pubkey authentication code now works !
version 0.4.8 (released 2011-01-15)
* Fixed memory leaks in session signing.
* Fixed memory leak in ssh_print_hexa.
* Fixed problem with ssh_connect w/ timeout and fd > 1024.
* Fixed some warnings on OS/2.
* Fixed installation path for OS/2.
15th september 2003 : libssh-0.0.3
-added install target in makefile
-some cleanup in headers files and source code
-change default banner and project name to libssh.
-new file auth.c to support more and more authentication ways
-bugfix(read offbyone) in send_kex
-a base64 parser. don't read the source, it's awful. pure 0xbadc0de.
-changed the client filename to "ssh". logic isn't it ?
-dss publickey authentication ! still need to wait for the rsa one
-bugfix in packet.c : now packet are completely read (and read blocks if waiting the packet)
-new misc.c contains misc functions
version 0.4.7 (released 2010-12-28)
* Fixed a possible memory leak in ssh_get_user_home().
* Fixed a memory leak in sftp_xstat.
* Fixed uninitialized fd->revents member.
* Fixed timout value in ssh_channel_accept().
* Fixed length checks in ssh_analyze_banner().
* Fixed a possible data overread and crash bug.
* Fixed setting max_fd which breaks ssh_select().
* Fixed some pedantic build warnings.
* Fixed a memory leak with session->bindaddr.
3rd september 2003: libssh-0.0.2
initial release.
-client supports both ssh and dss hostkey verification, but doesn't compare
them to openssh's files. (~/.ssh/known_hosts)
-the only supported authentication method is password.
-compiles on linux and openbsd. freebsd and netbsd should work, too
-Lot of work which hasn't been discussed here.
version 0.4.6 (released 2010-09-03)
* Added a cleanup function to free the ws2_32 library.
* Fixed build with gcc 3.4.
* Fixed the Windows build on Vista and newer.
* Fixed the usage of WSAPoll() on Windows.
* Fixed "@deprecated" in doxygen
* Fixed some mingw warnings.
* Fixed handling of opened channels.
* Fixed keepalive problem on older openssh servers.
* Fixed testing for big endian on Windows.
* Fixed the Windows preprocessor macros and defines.
version 0.4.5 (released 2010-07-13)
* Added option to bind a client to an ip address.
* Fixed the ssh socket polling function.
* Fixed Windows related bugs in bsd_poll().
* Fixed serveral build warnings.
version 0.4.4 (released 2010-06-01)
* Fixed a bug in the expand function for escape sequences.
* Fixed a bug in the tilde expand function.
* Fixed a bug in setting the options.
version 0.4.3 (released 2010-05-18)
* Added global/keepalive responses.
* Added runtime detection of WSAPoll().
* Added a select(2) based poll-emulation if poll(2) is not available.
* Added a function to expand an escaped string.
* Added a function to expand the tilde from a path.
* Added a proxycommand support.
* Added ssh_privatekey_type public function
* Added the possibility to define _OPENSSL_DIR and _ZLIB_DIR.
* Fixed sftp_chown.
* Fixed sftp_rename on protocol version 3.
* Fixed a blocking bug in channel_poll.
* Fixed config parsing wich has overwritten user specified values.
* Fixed hashed [host]:port format in knownhosts
* Fixed Windows build.
* Fixed doublefree happening after a negociation error.
* Fixed aes*-ctr with <= OpenSSL 0.9.7b.
* Fixed some documentation.
* Fixed exec example which has broken read usage.
* Fixed broken algorithm choice for server.
* Fixed a typo that we don't export all symbols.
* Removed the unneeded dependency to doxygen.
* Build examples only on the Linux plattform.
version 0.4.2 (released 2010-03-15)
* Added owner and group information in sftp attributes.
* Added missing SSH_OPTIONS_FD option.
* Added printout of owner and group in the sftp example.
* Added a prepend function for ssh_list.
* Added send back replies to openssh's keepalives.
* Fixed documentation in scp code
* Fixed longname parsing, this only workings with readdir.
* Fixed and added support for several identity files.
* Fixed sftp_parse_longname() on Windows.
* Fixed a race condition bug in ssh_scp_close()
* Remove config support for SSHv1 Cipher variable.
* Rename ssh_list_add to ssh_list_append.
* Rename ssh_list_get_head to ssh_list_pop_head
version 0.4.1 (released 2010-02-13)
* Added support for aes128-ctr, aes192-ctr and aes256-ctr encryption.
* Added an example for exec.
* Added private key type detection feature in privatekey_from_file().
* Fixed zlib compression fallback.
* Fixed kex bug that client preference should be prioritary
* Fixed known_hosts file set by the user.
* Fixed a memleak in channel_accept().
* Fixed underflow when leave_function() are unbalanced
* Fixed memory corruption in handle_channel_request_open().
* Fixed closing of a file handle case of errors in privatekey_from_file().
* Fixed ssh_get_user_home_dir() to be thread safe.
* Fixed the doxygen documentation.
version 0.4.0 (released 2009-12-10)
* Added scp support.
* Added support for sending signals (RFC 4254, section 6.9).
* Added MSVC support.
* Added support for ~/.ssh/config.
* Added sftp extension support.
* Added X11 forwarding support for client.
* Added forward listening.
* Added support for openssh extensions (statvfs, fstatvfs).
* Added a cleaned up interface for setting options.
* Added a generic way to handle sockets asynchronously.
* Added logging of the sftp flags used to open a file.
* Added full poll() support and poll-emulation for win32.
* Added missing 64bit functions in sftp.
* Added support for ~/ and SSH_DIR/ in filenames instead of %s/.
* Fixed Fix channel_get_exit_status bug.
* Fixed calltrace logging to make it optional.
* Fixed compilation on Solaris.
* Fixed resolving of ip addresses.
* Fixed libssh compilation without server support.
* Fixed possible memory corruptions (ticket #14).
version 0.3.4 (released 2009-09-14)
* Added ssh_basename and ssh_dirname.
* Added a portable ssh_mkdir function.
* Added a sftp_tell64() function.
* Added missing NULL pointer checks to crypt_set_algorithms_server.
* Fixed ssh_write_knownhost if ~/.ssh doesn't exist.
* Fixed a possible integer overflow in buffer_get_data().
* Fixed possible security bug in packet_decrypt().
* Fixed a possible stack overflow in agent code.
version 0.3.3 (released 2009-08-18)
* Fixed double free pointer crash in dsa_public_to_string.
* Fixed channel_get_exit_status bug.
* Fixed ssh_finalize which didn't clear the flag.
* Fixed memory leak introduced by previous bugfix.
* Fixed channel_poll broken when delayed EOF recvd.
* Fixed stupid "can't parse known host key" bug.
* Fixed possible memory corruption (ticket #14).
version 0.3.2 (released 2009-08-05)
* Added ssh_init() function.
* Added sftp_readlink() function.
* Added sftp_symlink() function.
* Fixed ssh_write_knownhost().
* Fixed compilation on Solaris.
* Fixed SSHv1 compilation.
version 0.3.1 (released 2009-07-14)
* Added return code SSH_SERVER_FILE_NOT_FOUND.
* Fixed compilation of SSHv1.
* Fixed several memory leaks.
* Fixed possible infinite loops.
* Fixed a possible crash bug.
* Fixed build warnings.
* Fixed cmake on BSD.
version 0.3.1 (released 2009-07-14)
* Added return code SSH_SERVER_FILE_NOT_FOUND.
* Fixed compilation of SSHv1.
* Fixed several memory leaks.
* Fixed possible infinite loops.
* Fixed a possible crash bug.
* Fixed build warnings.
* Fixed cmake on BSD.
version 0.3 (released 2009-05-21)
* Added support for ssh-agent authentication.
* Added POSIX like sftp implementation.
* Added error checking to all functions.
* Added const to arguments where it was needed.
* Added a channel_get_exit_status() function.
* Added a channel_read_buffer() function, channel_read() is now
a POSIX like function.
* Added a more generic auth callback function.
* Added printf attribute checking for log and error functions.
* Added runtime function tracer support.
* Added NSIS build support with CPack.
* Added openssh hashed host support.
* Added API documentation for all public functions.
* Added asynchronous SFTP read function.
* Added a ssh_bind_set_fd() function.
* Fixed known_hosts parsing.
* Fixed a lot of build warnings.
* Fixed the Windows build.
* Fixed a lot of memory leaks.
* Fixed a double free corruption in the server support.
* Fixed the "ssh_accept:" bug in server support.
* Fixed important channel bugs.
* Refactored the socket handling.
* Switched to CMake build system.
* Improved performance.
version 0.2 (released 2007-11-29)
* General cleanup
* More comprehensive API
* Up-to-date Doxygen documentation of each public function
* Basic server-based support
* Libgcrypt support (alternative to openssl and its license)
* SSH1 support (disabled by default)
* Added 3des-cbc
* A lot of bugfixes
version 0.11-dev
* Server implementation development.
* Small bug corrected when connecting to sun ssh servers.
* Channel wierdness corrected (writing huge data packets)
* Channel_read_nonblocking added
* Channel bug where stderr wasn't correctly read fixed.
* Added sftp_file_set_nonblocking(), which is nonblocking SFTP IO
* Connect_status callback.
* Priv.h contains the internal functions, libssh.h the public interface
* Options_set_timeout (thx marcelo) really working.
* Tcp tunneling through channel_open_forward.
* Channel_request_exec()
* Channel_request_env()
* Ssh_get_pubkey_hash()
* Ssh_is_server_known()
* Ssh_write_known_host()
* Options_set_ssh_dir
* How could this happen ! there weren't any channel_close !
* Nasty channel_free bug resolved.
* Removed the unsigned long all around the code. use only u8,u32 & u64.
* It now compiles and runs under amd64 !
* Channel_request_pty_size
* Channel_change_pty_size
* Options_copy()
* Ported the doc to an HTML file.
* Small bugfix in packet.c
* Prefixed error constants with SSH_
* Sftp_stat, sftp_lstat, sftp_fstat. thanks Michel Bardiaux for the patch.
* Again channel number mismatch fixed.
* Fixed a bug in ssh_select making the select fail when a signal has been
caught.
* Keyboard-interactive authentication working.
version 0.1 (released 2004-03-05)
* Begining of sftp subsystem implementation.
* Some cleanup into channels implementation
* Now every channel functions is called by its CHANNEL handler.
* Added channel_poll() and channel_read().
* Changed the client so it uses the new channel_poll and channel_read interface
* Small use-after-free bug with channels resolved
* Changed stupidities in lot of function names.
* Removed a debug output file opened by default.
* Added API.txt, the libssh programmer handbook.
* Various bug fixes from Nick Zitzmann.
* Developed a cryptographic structure for handling protocols.
* An autoconf script which took me half of a day to set up.
* A ssh_select wrapper has been written.
version 0.0.4 (released 2003-10-10)
* Some terminal code (eof handling) added
* Channels bugfix (it still needs some tweaking though)
* Zlib support
* Added a wrapper.c file. The goal is to provide a similar API to every
cryptographic functions. bignums and sha/md5 are wrapped now.
* More work than it first looks.
* Support for other crypto libs planed (lighter libs)
* Fixed stupid select() bug.
* Libssh now compiles and links with openssl 0.9.6
* RSA pubkey authentication code now works !
version 0.0.3 (released 2003-09-15)
* Added install target in makefile
* Some cleanup in headers files and source code
* Change default banner and project name to libssh.
* New file auth.c to support more and more authentication ways
* Bugfix(read offbyone) in send_kex
* A base64 parser. don't read the source, it's awful. pure 0xbadc0de.
* Changed the client filename to "ssh". logic isn't it ?
* Dss publickey authentication ! still need to wait for the rsa one
* Bugfix in packet.c
* New misc.c contains misc functions
version 0.0.2 (released 2003-09-03)
* Initial release.
* Client supports both ssh and dss hostkey verification, but doesn't compare them to openssh's files. (~/.ssh/known_hosts)
* The only supported authentication method is password.
* Compiles on linux and openbsd. freebsd and netbsd should work, too
* Lot of work which hasn't been discussed here.

157
ConfigureChecks.cmake Normal file
View File

@@ -0,0 +1,157 @@
include(CheckIncludeFile)
include(CheckSymbolExists)
include(CheckFunctionExists)
include(CheckLibraryExists)
include(CheckTypeSize)
include(CheckCXXSourceCompiles)
include(TestBigEndian)
set(PACKAGE ${APPLICATION_NAME})
set(VERSION ${APPLICATION_VERSION})
set(DATADIR ${DATA_INSTALL_DIR})
set(LIBDIR ${LIB_INSTALL_DIR})
set(PLUGINDIR "${PLUGIN_INSTALL_DIR}-${LIBRARY_SOVERSION}")
set(SYSCONFDIR ${SYSCONF_INSTALL_DIR})
set(BINARYDIR ${CMAKE_BINARY_DIR})
set(SOURCEDIR ${CMAKE_SOURCE_DIR})
function(COMPILER_DUMPVERSION _OUTPUT_VERSION)
# Remove whitespaces from the argument.
# This is needed for CC="ccache gcc" cmake ..
string(REPLACE " " "" _C_COMPILER_ARG "${CMAKE_C_COMPILER_ARG1}")
execute_process(
COMMAND
${CMAKE_C_COMPILER} ${_C_COMPILER_ARG} -dumpversion
OUTPUT_VARIABLE _COMPILER_VERSION
)
string(REGEX REPLACE "([0-9])\\.([0-9])(\\.[0-9])?" "\\1\\2"
_COMPILER_VERSION "${_COMPILER_VERSION}")
set(${_OUTPUT_VERSION} ${_COMPILER_VERSION} PARENT_SCOPE)
endfunction()
if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW AND NOT OS2)
compiler_dumpversion(GNUCC_VERSION)
if (NOT GNUCC_VERSION EQUAL 34)
check_c_compiler_flag("-fvisibility=hidden" WITH_VISIBILITY_HIDDEN)
endif (NOT GNUCC_VERSION EQUAL 34)
endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW AND NOT OS2)
# HEADER FILES
check_include_file(argp.h HAVE_ARGP_H)
check_include_file(pty.h HAVE_PTY_H)
check_include_file(termios.h HAVE_TERMIOS_H)
if (WIN32)
check_include_file(wspiapi.h HAVE_WSPIAPI_H)
if (NOT HAVE_WSPIAPI_H)
message(STATUS "WARNING: Without wspiapi.h, this build will only work on Windows XP and newer versions")
endif (NOT HAVE_WSPIAPI_H)
check_include_file(ws2tcpip.h HAVE_WS2TCPIP_H)
if (HAVE_WSPIAPI_H OR HAVE_WS2TCPIP_H)
set(HAVE_GETADDRINFO TRUE)
set(HAVE_GETHOSTBYNAME TRUE)
endif (HAVE_WSPIAPI_H OR HAVE_WS2TCPIP_H)
set(HAVE_SELECT TRUE)
endif (WIN32)
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
check_include_file(openssl/aes.h HAVE_OPENSSL_AES_H)
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
check_include_file(openssl/blowfish.h HAVE_OPENSSL_BLOWFISH_H)
set(CMAKE_REQUIRED_INCLUDES ${OPENSSL_INCLUDE_DIRS})
check_include_file(openssl/des.h HAVE_OPENSSL_DES_H)
if (CMAKE_HAVE_PTHREAD_H)
set(HAVE_PTHREAD_H 1)
endif (CMAKE_HAVE_PTHREAD_H)
# FUNCTIONS
check_function_exists(strncpy HAVE_STRNCPY)
check_function_exists(vsnprintf HAVE_VSNPRINTF)
check_function_exists(snprintf HAVE_SNPRINTF)
if (WIN32)
check_function_exists(_vsnprintf_s HAVE__VSNPRINTF_S)
check_function_exists(_vsnprintf HAVE__VSNPRINTF)
check_function_exists(_snprintf HAVE__SNPRINTF)
check_function_exists(_snprintf_s HAVE__SNPRINTF_S)
endif (WIN32)
if (UNIX)
if (NOT LINUX)
# libsocket (Solaris)
check_library_exists(socket getaddrinfo "" HAVE_LIBSOCKET)
if (HAVE_LIBSOCKET)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} socket)
endif (HAVE_LIBSOCKET)
# libresolv
check_library_exists(resolv hstrerror "" HAVE_LIBRESOLV)
if (HAVE_LIBRESOLV)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} resolv)
endif (HAVE_LIBRESOLV)
# libnsl/inet_pton (Solaris)
check_library_exists(nsl inet_pton "" HAVE_LIBNSL)
if (HAVE_LIBNSL)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} nsl)
endif (HAVE_LIBNSL)
# librt
check_library_exists(rt nanosleep "" HAVE_LIBRT)
endif (NOT LINUX)
check_library_exists(rt clock_gettime "" HAVE_CLOCK_GETTIME)
if (HAVE_LIBRT OR HAVE_CLOCK_GETTIME)
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} rt)
endif (HAVE_LIBRT OR HAVE_CLOCK_GETTIME)
check_function_exists(getaddrinfo HAVE_GETADDRINFO)
check_function_exists(poll HAVE_POLL)
check_function_exists(select HAVE_SELECT)
check_function_exists(cfmakeraw HAVE_CFMAKERAW)
check_function_exists(regcomp HAVE_REGCOMP)
endif (UNIX)
set(LIBSSH_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} CACHE INTERNAL "libssh required system libraries")
# LIBRARIES
if (OPENSSL_FOUND)
set(HAVE_LIBCRYPTO 1)
endif (OPENSSL_FOUND)
if (GCRYPT_FOUND)
set(HAVE_LIBGCRYPT 1)
endif (GCRYPT_FOUND)
if (ZLIB_LIBRARY)
set(HAVE_LIBZ 1)
endif (ZLIB_LIBRARY)
if (CMAKE_HAVE_THREADS_LIBRARY)
if (CMAKE_USE_PTHREADS_INIT)
set(HAVE_PTHREAD 1)
endif (CMAKE_USE_PTHREADS_INIT)
endif (CMAKE_HAVE_THREADS_LIBRARY)
# OPTIONS
if (WITH_DEBUG_CRYPTO)
set(DEBUG_CRYPTO 1)
endif (WITH_DEBUG_CRYPTO)
if (WITH_DEBUG_CALLTRACE)
set(DEBUG_CALLTRACE 1)
endif (WITH_DEBUG_CALLTRACE)
# ENDIAN
if (NOT WIN32)
test_big_endian(WORDS_BIGENDIAN)
endif (NOT WIN32)

21
DefineOptions.cmake Normal file
View File

@@ -0,0 +1,21 @@
option(WITH_LIBZ "Build with ZLIB support" ON)
option(WITH_SSH1 "Build with SSH1 support" OFF)
option(WITH_SFTP "Build with SFTP support" ON)
option(WITH_SERVER "Build with SSH server support" ON)
option(WITH_STATIC_LIB "Build with a static library" OFF)
option(WITH_DEBUG_CRYPTO "Build with cryto debug output" OFF)
option(WITH_DEBUG_CALLTRACE "Build with calltrace debug output" ON)
option(WITH_GCRYPT "Compile against libgcrypt" OFF)
option(WITH_PCAP "Compile with Pcap generation support" ON)
option(WITH_INTERNAL_DOC "Compile doxygen internal documentation" OFF)
option(WITH_TESTING "Build with unit tests" OFF)
option(WITH_CLIENT_TESTING "Build with client tests; requires a running sshd" OFF)
option(WITH_BENCHMARKS "Build benchmarks tools" OFF)
if(WITH_BENCHMARKS)
set(WITH_TESTING ON)
endif(WITH_BENCHMARKS)
if (WITH_TESTING)
set(WITH_STATIC_LIB ON)
endif (WITH_TESTING)

260
INSTALL
View File

@@ -1,236 +1,80 @@
Installation Instructions
*************************
# How to build from source
Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
Software Foundation, Inc.
## Requirements
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
### Common requirements
Basic Installation
==================
In order to build libssh, you need to install several components:
These are generic installation instructions.
- A C compiler
- [CMake](http://www.cmake.org) >= 2.6.0.
- [openssl](http://www.openssl.org) >= 0.9.8
or
- [gcrypt](http://www.gnu.org/directory/Security/libgcrypt.html) >= 1.4
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
those values to create a `Makefile' in each directory of the package.
It may also create one or more `.h' files containing system-dependent
definitions. Finally, it creates a shell script `config.status' that
you can run in the future to recreate the current configuration, and a
file `config.log' containing compiler output (useful mainly for
debugging `configure').
optional:
- [libz](http://www.zlib.net) >= 1.2
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
cache files.)
Note that these version numbers are version we know works correctly. If you
build and run libssh successfully with an older version, please let us know.
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
diffs or instructions to the address given in the `README' so they can
be considered for the next release. If you are using the cache, and at
some point `config.cache' contains results you don't want to keep, you
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
`configure' by a program called `autoconf'. You only need
`configure.ac' if you want to change it or regenerate `configure' using
a newer version of `autoconf'.
## Building
First, you need to configure the compilation, using CMake. Go inside the
`build` dir. Create it if it doesn't exist.
The simplest way to compile this package is:
GNU/Linux and MacOS X:
1. `cd' to the directory containing the package's source code and type
`./configure' to configure the package for your system. If you're
using `csh' on an old version of System V, you might need to type
`sh ./configure' instead to prevent `csh' from trying to execute
`configure' itself.
cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug ..
make
Running `configure' takes awhile. While running, it prints some
messages telling which features it is checking for.
### CMake standard options
Here is a list of the most interesting options provided out of the box by
CMake.
2. Type `make' to compile the package.
- CMAKE_BUILD_TYPE: The type of build (can be Debug Release MinSizeRel
RelWithDebInfo)
- CMAKE_INSTALL_PREFIX: The prefix to use when running make install (Default
to /usr/local on GNU/Linux and MacOS X)
- CMAKE_C_COMPILER: The path to the C compiler
- CMAKE_CXX_COMPILER: The path to the C++ compiler
3. Optionally, type `make check' to run any self-tests that come with
the package.
### CMake options defined for libssh
4. Type `make install' to install the programs and any data files and
documentation.
Options are defined in the following files:
5. You can remove the program binaries and object files from the
source code directory by typing `make clean'. To also remove the
files that `configure' created (so you can compile the package for
a different kind of computer), type `make distclean'. There is
also a `make maintainer-clean' target, but that is intended mainly
for the package's developers. If you use it, you may have to get
all sorts of other programs in order to regenerate files that came
with the distribution.
- DefineOptions.cmake
Compilers and Options
=====================
They can be changed with the -D option:
Some systems require unusual options for compilation or linking that the
`configure' script does not know about. Run `./configure --help' for
details on some of the pertinent environment variables.
`cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DWITH_LIBZ=OFF ..`
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
### Browsing/editing CMake options
./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
In addition to passing options on the command line, you can browse and edit
CMake options using `cmakesetup` (Windows), `cmake-gui` or `ccmake` (GNU/Linux
and MacOS X).
*Note Defining Variables::, for more details.
- Go to the build dir
- On Windows: run `cmakesetup`
- On GNU/Linux and MacOS X: run `ccmake ..`
Compiling For Multiple Architectures
====================================
## Installing
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
own directory. To do this, you must use a version of `make' that
supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
If you want to install libssh after compilation run:
If you have to use a `make' that does not support the `VPATH'
variable, you have to compile the package for one architecture at a
time in the source code directory. After you have installed the
package for one architecture, use `make distclean' before reconfiguring
for another architecture.
make install
Installation Names
==================
## Running
By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
The libssh binary can be found in the `build/libssh` directory.
You can use `build/examples/samplessh` which is a sample client to
test libssh on UNIX.
You can specify separate installation prefixes for
architecture-specific files and architecture-independent files. If you
pass the option `--exec-prefix=PREFIX' to `configure', the package uses
PREFIX as the prefix for installing programs and libraries.
Documentation and other data files still use the regular prefix.
## About this document
In addition, if you use an unusual directory layout you can give
options like `--bindir=DIR' to specify different values for particular
kinds of files. Run `configure --help' for a list of the directories
you can set and what kinds of files go in them.
If the package supports it, you can cause programs to be installed
with an extra prefix or suffix on their names by giving `configure' the
option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'.
Optional Features
=================
Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
`README' should mention any `--enable-' and `--with-' options that the
package recognizes.
For packages that use the X Window System, `configure' can usually
find the X include and library files automatically, but if it doesn't,
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
Specifying the System Type
==========================
There may be some features `configure' cannot figure out automatically,
but needs to determine by the type of machine the package will run on.
Usually, assuming the package is built to be run on the _same_
architectures, `configure' can figure that out, but if it prints a
message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
CPU-COMPANY-SYSTEM
where SYSTEM can have one of these forms:
OS KERNEL-OS
See the file `config.sub' for the possible values of each field. If
`config.sub' isn't included in this package, then this package doesn't
need to know the machine type.
If you are _building_ compiler tools for cross-compiling, you should
use the option `--target=TYPE' to select the type of system they will
produce code for.
If you want to _use_ a cross compiler, that generates code for a
platform different from the build platform, you should specify the
"host" platform (i.e., that on which the generated programs will
eventually be run) with `--host=TYPE'.
Sharing Defaults
================
If you want to set default values for `configure' scripts to share, you
can create a site shell script called `config.site' that gives default
values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
A warning: not all `configure' scripts look for a site script.
Defining Variables
==================
Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
them in the `configure' command line, using `VAR=value'. For example:
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
overridden in the site shell script). Here is a another example:
/bin/bash ./configure CONFIG_SHELL=/bin/bash
Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
`configure' recognizes the following options to control how it operates.
`--help'
`-h'
Print a summary of the options to `configure', and exit.
`--version'
`-V'
Print the version of Autoconf used to generate the `configure'
script, and exit.
`--cache-file=FILE'
Enable the cache: use and save the results of the tests in FILE,
traditionally `config.cache'. FILE defaults to `/dev/null' to
disable caching.
`--config-cache'
`-C'
Alias for `--cache-file=config.cache'.
`--quiet'
`--silent'
`-q'
Do not print messages saying which checks are being made. To
suppress all normal output, redirect it to `/dev/null' (any error
messages will still be shown).
`--srcdir=DIR'
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
This document is written using [Markdown][] syntax, making it possible to
provide usable information in both plain text and HTML format. Whenever
modifying this document please use [Markdown][] syntax.
[markdown]: http://www.daringfireball.net/projects/markdown

View File

@@ -1,41 +0,0 @@
CC= gcc
DLLWRAP=dllwrap.exe
DEFFILE=libssh.def
STATICLIB=libssh.a
LIB="c:\Program files\Microsoft Visual Studio .NET 2003\vc7\bin\lib.exe"
INCS= -I. -Iinclude -Ic:/openssl/include -I"c:\Program files\gnuwin32\include"
CFLAGS= $(INCS)
LINK= -L. c:/openssl/lib/MinGW/libeay32.a "c:\program files\gnuwin32\lib\libz.a" c:\Dev-cpp\lib\libws2_32.a #-lws2_32 ##-lgdi32 -lshell32
libssh_HEADERS= config.h include/libssh/crypto.h include/libssh/libssh.h include/libssh/priv.h include/libssh/server.h include/libssh/sftp.h include/libssh/ssh1.h include/libssh/ssh2.h
libssh_OBJS = libssh/auth1.o libssh/auth.o libssh/base64.o libssh/buffer.o \
libssh/channels1.o libssh/channels.o libssh/client.o libssh/connect.o \
libssh/crc32.o libssh/crypt.o libssh/dh.o libssh/error.o libssh/gcrypt_missing.o \
libssh/gzip.o libssh/init.o libssh/kex.o libssh/keyfiles.o \
libssh/keys.o libssh/messages.o libssh/misc.o libssh/options.o \
libssh/packet.o libssh/server.o libssh/session.o libssh/sftp.o \
libssh/sftpserver.o libssh/string.o libssh/wrapper.o libssh/socket.o \
libssh/log.o
all: libssh.dll samplesshd.exe libssh.lib
config.h: config.h.win32-openssl
copy config.h.win32-openssl config.h
%.o: %.c $(libssh_HEADERS)
$(CC) -c $< -o $@ $(CFLAGS)
sample.exe: sample.o $(libssh_OBJS)
$(CC) $< -o $@ $(libssh_OBJS) $(LINK)
samplesshd.exe: samplesshd.o $(libssh_OBJS)
$(CC) $< -o $@ $(libssh_OBJS) $(LINK)
libssh.dll: $(libssh_OBJS)
# $(CC) -shared $(libssh_OBJS) -o libssh.dll $(LINK)
$(DLLWRAP) --export-all-symbols --output-def $(DEFFILE) --implib $(STATICLIB) $(libssh_OBJS) $(LINK) -o libssh.dll
libssh.lib: libssh.dll
lib.bat
clean:
rm -f $(libssh_OBJS) samplesshd.exe sample.exe samplesshd.o sample.o libssh.dll config.h

View File

@@ -1,44 +0,0 @@
SUBDIRS = libssh include
AM_CPPFLAGS = -I$(srcdir)/include
LDADD = $(top_builddir)/libssh/libssh.la
noinst_PROGRAMS = samplesshd samplessh
noinst_DATA = samplesftp doxygen
samplessh_SOURCES = sample.c
samplesshd_SOURCES = samplesshd.c
samplesftp: samplessh
$(LN_S) -f samplessh samplesftp
if HAS_DOXYGEN
install-doc: doxygen
$(INSTALL) -d $(DESTDIR)$(docdir)/html
$(INSTALL) --mode=644 doxygen/html/* $(DESTDIR)$(docdir)/html
$(INSTALL) -d $(DESTDIR)$(docdir)/examples
$(INSTALL) --mode=644 sample.c samplesshd.c $(DESTDIR)$(docdir)/examples
$(INSTALL) -d $(DESTDIR)$(mandir)/man3
$(INSTALL) --mode=644 doxygen/man/man3/* $(DESTDIR)$(mandir)/man3
doxygen: clean-local
@echo "Running doxygen..."
doxygen $(srcdir)/Doxyfile
doxygen-dev: clean-local
@echo "Running internal doxygen"
doxygen $(srcdir)/Doxyfile.internal
else
doxygen:
doxygen-dev:
install-doc: doxygen
endif
clean-local:
-rm -rf doxygen
EXTRA_DIST = Doxyfile Doxyfile.internal
CLEANFILES = samplesftp

0
NEWS
View File

72
README
View File

@@ -1,14 +1,14 @@
The libSSH and its client
~~~~~~~~~~~~~~~~~~~~~~~~~
-Aris Adamantiadis
libssh: the SSH library
~~~~~~~~~~~~~~~~~~~~~~~
1* Why ?
-_-_-_-_-_
Why not ? :) I've began to work on my own implementation of the ssh protocol
because i didn't like the currently public ones.
Not any allow you to import and use the functions as a library, and so i
worked on a library-based SSH implementation.
Not any allowed you to import and use the functions as a powerful library,
and so i worked on a library-based SSH implementation which was non-existing
in the free and open source software world.
2* How/Who ?
@@ -16,24 +16,56 @@ worked on a library-based SSH implementation.
If you downloaded this file, you must know what it is : a library for
accessing ssh client services through C libraries calls in a simple manner.
The client is there as a programming example and isn't at all doing its job
correctly (doesn't verify public key hashes with the ones in ~/.ssh/
and doesn't handle TERM - yet)
Everybody can use this software under the terms of the LGPL - see the COPYING
file
3* What ?
-_-_-_-_-_
If you ask yourself how to compile libssh, please read INSTALL before anything.
The SSH library features :
-Full C library functions for manipulating a client-side SSH connection
-Fully configurable sessions
-Support for AES-128,AES-192,AES-256,blowfish, in cbc mode
-use multiple SSH connections in a same process, at same time.
-usable SFTP implementation
-Public key and password authentication
4* Where ?
3* Where ?
-_-_-_-_-_-_
http://0xbadc0de.be/?part=libssh
http://www.libssh.org
4* API Changes !
-_-_-_-_-_-_-_-_-_
Changes between 0.4 and 0.5
---------------------------
We use the ssh_ prefix as namespace for every function now. There is a legacy.h
which could be used to get the old function names.
Changes between 0.3 and 0.4
---------------------------
We changed libssh to be typesafe now:
SSH_SESSION *session -> ssh_session session
SFTP_SESSION *sftp -> sftp_session sftp
CHANNEL *channel -> ssh_channel channel
STRING *string -> ssh_string string
...
The options structure has been removed and there is a new function. This
function can set all available options now. You can find the enum in the
header file and it is documented. Example:
ssh_options_set(session, SSH_OPTIONS_HOST, "localhost");
5* Copyright policy
-_-_-_-_-_-_-_-_-_-_
The developers of libssh have a policy of asking for contributions to be made
under the personal copyright of the contributor, instead of a corporate
copyright.
There are some reasons for the establishment of this policy:
* Individual copyrights make copyright registration in the US a simpler
process.
* If libssh is copyrighted by individuals rather than corporations,
decisions regarding enforcement and protection of copyright will, more
likely, be made in the interests of the project, and not in the interests
of any corporations shareholders.
* If we ever need to relicense a portion of the code contacting individuals
for permission to do so is much easier than contacting a company.

View File

@@ -1,8 +0,0 @@
#!/bin/sh -e
aclocal
libtoolize --force --copy
autoheader
autoconf
automake --add-missing --copy --gnu
./configure $@

197
build/build_make.sh Executable file
View File

@@ -0,0 +1,197 @@
#!/bin/bash
#
# Last Change: 2008-06-18 14:13:46
#
# Script to build libssh on UNIX.
#
# Copyright (c) 2006-2007 Andreas Schneider <mail@cynapses.org>
#
SOURCE_DIR=".."
LANG=C
export LANG
SCRIPT="$0"
COUNT=0
while [ -L "${SCRIPT}" ]
do
SCRIPT=$(readlink ${SCRIPT})
COUNT=$(expr ${COUNT} + 1)
if [ ${COUNT} -gt 100 ]; then
echo "Too many symbolic links"
exit 1
fi
done
BUILDDIR=$(dirname ${SCRIPT})
cleanup_and_exit () {
if test "$1" = 0 -o -z "$1" ; then
exit 0
else
exit $1
fi
}
function configure() {
if [ -n "${CMAKEDIR}" ]; then
${CMAKEDIR}/bin/cmake "$@" ${SOURCE_DIR} || cleanup_and_exit $?
else
cmake "$@" ${SOURCE_DIR} || cleanup_and_exit $?
fi
}
function compile() {
if [ -f /proc/cpuinfo ]; then
CPUCOUNT=$(grep -c processor /proc/cpuinfo)
elif test `uname` = "SunOS" ; then
CPUCOUNT=$(psrinfo -p)
else
CPUCOUNT="1"
fi
if [ "${CPUCOUNT}" -gt "1" ]; then
${MAKE} -j${CPUCOUNT} $1 || cleanup_and_exit $?
else
${MAKE} $1 || exit $?
fi
}
function clean_build_dir() {
find ! -path "*.svn*" ! -name "*.bat" ! -name "*.sh" ! -name "." -print0 | xargs -0 rm -rf
}
function usage () {
echo "Usage: `basename $0` [--prefix /install_prefix|--build [debug|final]|--clean|--verbose|--libsuffix (32|64)|--help|--clang|--cmakedir /directory|--make
(gmake|make)|--ccompiler (gcc|cc)|--withstaticlib|--unittesting|--clientunittesting|--withssh1|--withserver]"
cleanup_and_exit
}
cd ${BUILDDIR}
# the default CMake options:
OPTIONS="--graphviz=${BUILDDIR}/libssh.dot"
# the default 'make' utility:
MAKE="make"
while test -n "$1"; do
PARAM="$1"
ARG="$2"
shift
case ${PARAM} in
*-*=*)
ARG=${PARAM#*=}
PARAM=${PARAM%%=*}
set -- "----noarg=${PARAM}" "$@"
esac
case ${PARAM} in
*-help|-h)
#echo_help
usage
cleanup_and_exit
;;
*-build)
DOMAKE="1"
BUILD_TYPE="${ARG}"
test -n "${BUILD_TYPE}" && shift
;;
*-clean)
clean_build_dir
cleanup_and_exit
;;
*-clang)
OPTIONS="${OPTIONS} -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++"
;;
*-verbose)
DOVERBOSE="1"
;;
*-memtest)
OPTIONS="${OPTIONS} -DMEM_NULL_TESTS=ON"
;;
*-libsuffix)
OPTIONS="${OPTIONS} -DLIB_SUFFIX=${ARG}"
shift
;;
*-prefix)
OPTIONS="${OPTIONS} -DCMAKE_INSTALL_PREFIX=${ARG}"
shift
;;
*-sysconfdir)
OPTIONS="${OPTIONS} -DSYSCONF_INSTALL_DIR=${ARG}"
shift
;;
*-cmakedir)
CMAKEDIR="${ARG}"
shift
;;
*-make)
MAKE="${ARG}"
shift
;;
*-ccompiler)
OPTIONS="${OPTIONS} -DCMAKE_C_COMPILER=${ARG}"
shift
;;
*-withstaticlib)
OPTIONS="${OPTIONS} -DWITH_STATIC_LIB=ON"
;;
*-unittesting)
OPTIONS="${OPTIONS} -DWITH_TESTING=ON"
;;
*-clientunittesting)
OPTIONS="${OPTIONS} -DWITH_CLIENT_TESTING=ON"
;;
*-withssh1)
OPTIONS="${OPTIONS} -DWITH_SSH1=ON"
;;
*-withserver)
OPTIONS="${OPTIONS} -DWITH_SERVER=ON"
;;
----noarg)
echo "$ARG does not take an argument"
cleanup_and_exit
;;
-*)
echo Unknown Option "$PARAM". Exit.
cleanup_and_exit 1
;;
*)
usage
;;
esac
done
if [ "${DOMAKE}" == "1" ]; then
OPTIONS="${OPTIONS} -DCMAKE_BUILD_TYPE=${BUILD_TYPE}"
fi
if [ -n "${DOVERBOSE}" ]; then
OPTIONS="${OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=1"
else
OPTIONS="${OPTIONS} -DCMAKE_VERBOSE_MAKEFILE=0"
fi
test -f "${BUILDDIR}/.build.log" && rm -f ${BUILDDIR}/.build.log
touch ${BUILDDIR}/.build.log
# log everything from here to .build.log
exec 1> >(exec -a 'build logging tee' tee -a ${BUILDDIR}/.build.log) 2>&1
echo "${HOST} started build at $(date)."
echo
configure ${OPTIONS} "$@"
if [ -n "${DOMAKE}" ]; then
test -n "${DOVERBOSE}" && compile VERBOSE=1 || compile
fi
DOT=$(which dot 2>/dev/null)
if [ -n "${DOT}" ]; then
${DOT} -Tpng -o${BUILDDIR}/libssh.png ${BUILDDIR}/libssh.dot
${DOT} -Tsvg -o${BUILDDIR}/libssh.svg ${BUILDDIR}/libssh.dot
fi
exec >&0 2>&0 # so that the logging tee finishes
sleep 1 # wait till tee terminates
cleanup_and_exit 0

View File

@@ -0,0 +1,23 @@
# - ADD_CHECK_TEST(test_name test_source linklib1 ... linklibN)
# Copyright (c) 2007 Daniel Gollub <dgollub@suse.de>
# Copyright (c) 2007-2010 Andreas Schneider <asn@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
enable_testing()
include(CTest)
if(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
set(CMAKE_C_FLAGS_PROFILING "-g -O0 -Wall -W -Wshadow -Wunused-variable -Wunused-parameter -Wunused-function -Wunused -Wno-system-headers -Wwrite-strings -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Compiler Flags")
set(CMAKE_SHARED_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
set(CMAKE_MODULE_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
set(CMAKE_EXEC_LINKER_FLAGS_PROFILING " -fprofile-arcs -ftest-coverage" CACHE STRING "Profiling Linker Flags")
endif(CMAKE_COMPILER_IS_GNUCC AND NOT MINGW)
function (ADD_CMOCKERY_TEST _testName _testSource)
add_executable(${_testName} ${_testSource})
target_link_libraries(${_testName} ${ARGN})
add_test(${_testName} ${CMAKE_CURRENT_BINARY_DIR}/${_testName})
endfunction (ADD_CMOCKERY_TEST)

View File

@@ -0,0 +1,22 @@
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
1. Redistributions of source code must retain the copyright
notice, this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
3. The name of the author may not be used to endorse or promote products
derived from this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

View File

@@ -0,0 +1,27 @@
# Always include srcdir and builddir in include path
# This saves typing ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY} in
# about every subdir
# since cmake 2.4.0
set(CMAKE_INCLUDE_CURRENT_DIR ON)
# Put the include dirs which are in the source or build tree
# before all other include dirs, so the headers in the sources
# are prefered over the already installed ones
# since cmake 2.4.1
set(CMAKE_INCLUDE_DIRECTORIES_PROJECT_BEFORE ON)
# Use colored output
# since cmake 2.4.0
set(CMAKE_COLOR_MAKEFILE ON)
# Define the generic version of the libraries here
set(GENERIC_LIB_VERSION "0.1.0")
set(GENERIC_LIB_SOVERSION "0")
# Set the default build type to release with debug info
if (NOT CMAKE_BUILD_TYPE)
set(CMAKE_BUILD_TYPE RelWithDebInfo
CACHE STRING
"Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel."
)
endif (NOT CMAKE_BUILD_TYPE)

View File

@@ -0,0 +1,71 @@
# define system dependent compiler flags
include(CheckCCompilerFlag)
include(MacroCheckCCompilerFlagSSP)
if (UNIX AND NOT WIN32)
#
# Define GNUCC compiler flags
#
if (${CMAKE_C_COMPILER_ID} MATCHES GNU)
# add -Wconversion ?
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wunused -Wfloat-equal -Wpointer-arith -Wwrite-strings -Wformat-security")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wmissing-format-attribute")
# with -fPIC
check_c_compiler_flag("-fPIC" WITH_FPIC)
if (WITH_FPIC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
endif (WITH_FPIC)
check_c_compiler_flag_ssp("-fstack-protector" WITH_STACK_PROTECTOR)
if (WITH_STACK_PROTECTOR)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstack-protector")
endif (WITH_STACK_PROTECTOR)
check_c_compiler_flag("-D_FORTIFY_SOURCE=2" WITH_FORTIFY_SOURCE)
if (WITH_FORTIFY_SOURCE)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_FORTIFY_SOURCE=2")
endif (WITH_FORTIFY_SOURCE)
endif (${CMAKE_C_COMPILER_ID} MATCHES GNU)
#
# Check for large filesystem support
#
if (CMAKE_SIZEOF_VOID_P MATCHES "8")
# with large file support
execute_process(
COMMAND
getconf LFS64_CFLAGS
OUTPUT_VARIABLE
_lfs_CFLAGS
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
else (CMAKE_SIZEOF_VOID_P MATCHES "8")
# with large file support
execute_process(
COMMAND
getconf LFS_CFLAGS
OUTPUT_VARIABLE
_lfs_CFLAGS
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
endif (CMAKE_SIZEOF_VOID_P MATCHES "8")
if (_lfs_CFLAGS)
string(REGEX REPLACE "[\r\n]" " " "${_lfs_CFLAGS}" "${${_lfs_CFLAGS}}")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${_lfs_CFLAGS}")
endif (_lfs_CFLAGS)
endif (UNIX AND NOT WIN32)
if (MSVC)
# Use secure functions by defaualt and suppress warnings about
#"deprecated" functions
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES=1")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_SECURE_CPP_OVERLOAD_STANDARD_NAMES_COUNT=1")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /D _CRT_NONSTDC_NO_WARNINGS=1 /D _CRT_SECURE_NO_WARNINGS=1")
endif (MSVC)

View File

@@ -0,0 +1,104 @@
if (WIN32)
# Same same
set(BIN_INSTALL_DIR "bin" CACHE PATH "-")
set(SBIN_INSTALL_DIR "." CACHE PATH "-")
set(LIB_INSTALL_DIR "lib" CACHE PATH "-")
set(INCLUDE_INSTALL_DIR "include" CACHE PATH "-")
set(PLUGIN_INSTALL_DIR "plugins" CACHE PATH "-")
set(HTML_INSTALL_DIR "doc/HTML" CACHE PATH "-")
set(ICON_INSTALL_DIR "." CACHE PATH "-")
set(SOUND_INSTALL_DIR "." CACHE PATH "-")
set(LOCALE_INSTALL_DIR "lang" CACHE PATH "-")
elseif (UNIX OR OS2)
IF (NOT APPLICATION_NAME)
MESSAGE(STATUS "${PROJECT_NAME} is used as APPLICATION_NAME")
SET(APPLICATION_NAME ${PROJECT_NAME})
ENDIF (NOT APPLICATION_NAME)
# Suffix for Linux
SET(LIB_SUFFIX
CACHE STRING "Define suffix of directory name (32/64)"
)
SET(EXEC_INSTALL_PREFIX
"${CMAKE_INSTALL_PREFIX}"
CACHE PATH "Base directory for executables and libraries"
)
SET(SHARE_INSTALL_PREFIX
"${CMAKE_INSTALL_PREFIX}/share"
CACHE PATH "Base directory for files which go to share/"
)
SET(DATA_INSTALL_PREFIX
"${SHARE_INSTALL_PREFIX}/${APPLICATION_NAME}"
CACHE PATH "The parent directory where applications can install their data")
# The following are directories where stuff will be installed to
SET(BIN_INSTALL_DIR
"${EXEC_INSTALL_PREFIX}/bin"
CACHE PATH "The ${APPLICATION_NAME} binary install dir (default prefix/bin)"
)
SET(SBIN_INSTALL_DIR
"${EXEC_INSTALL_PREFIX}/sbin"
CACHE PATH "The ${APPLICATION_NAME} sbin install dir (default prefix/sbin)"
)
SET(LIB_INSTALL_DIR
"${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}"
CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/lib)"
)
SET(LIBEXEC_INSTALL_DIR
"${EXEC_INSTALL_PREFIX}/libexec"
CACHE PATH "The subdirectory relative to the install prefix where libraries will be installed (default is prefix/libexec)"
)
SET(PLUGIN_INSTALL_DIR
"${LIB_INSTALL_DIR}/${APPLICATION_NAME}"
CACHE PATH "The subdirectory relative to the install prefix where plugins will be installed (default is prefix/lib/${APPLICATION_NAME})"
)
SET(INCLUDE_INSTALL_DIR
"${CMAKE_INSTALL_PREFIX}/include"
CACHE PATH "The subdirectory to the header prefix (default prefix/include)"
)
SET(DATA_INSTALL_DIR
"${DATA_INSTALL_PREFIX}"
CACHE PATH "The parent directory where applications can install their data (default prefix/share/${APPLICATION_NAME})"
)
SET(HTML_INSTALL_DIR
"${DATA_INSTALL_PREFIX}/doc/HTML"
CACHE PATH "The HTML install dir for documentation (default data/doc/html)"
)
SET(ICON_INSTALL_DIR
"${DATA_INSTALL_PREFIX}/icons"
CACHE PATH "The icon install dir (default data/icons/)"
)
SET(SOUND_INSTALL_DIR
"${DATA_INSTALL_PREFIX}/sounds"
CACHE PATH "The install dir for sound files (default data/sounds)"
)
SET(LOCALE_INSTALL_DIR
"${SHARE_INSTALL_PREFIX}/locale"
CACHE PATH "The install dir for translations (default prefix/share/locale)"
)
SET(XDG_APPS_DIR
"${SHARE_INSTALL_PREFIX}/applications/"
CACHE PATH "The XDG apps dir"
)
SET(XDG_DIRECTORY_DIR
"${SHARE_INSTALL_PREFIX}/desktop-directories"
CACHE PATH "The XDG directory"
)
SET(SYSCONF_INSTALL_DIR
"${EXEC_INSTALL_PREFIX}/etc"
CACHE PATH "The ${APPLICATION_NAME} sysconfig install dir (default prefix/etc)"
)
SET(MAN_INSTALL_DIR
"${SHARE_INSTALL_PREFIX}/man"
CACHE PATH "The ${APPLICATION_NAME} man install dir (default prefix/man)"
)
SET(INFO_INSTALL_DIR
"${SHARE_INSTALL_PREFIX}/info"
CACHE PATH "The ${APPLICATION_NAME} info install dir (default prefix/info)"
)
endif ()

View File

@@ -0,0 +1,28 @@
# Set system vars
if (CMAKE_SYSTEM_NAME MATCHES "Linux")
set(LINUX TRUE)
endif(CMAKE_SYSTEM_NAME MATCHES "Linux")
if (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
set(FREEBSD TRUE)
set(BSD TRUE)
endif (CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
if (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
set(OPENBSD TRUE)
set(BSD TRUE)
endif (CMAKE_SYSTEM_NAME MATCHES "OpenBSD")
if (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
set(NETBSD TRUE)
set(BSD TRUE)
endif (CMAKE_SYSTEM_NAME MATCHES "NetBSD")
if (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
set(SOLARIS TRUE)
endif (CMAKE_SYSTEM_NAME MATCHES "(Solaris|SunOS)")
if (CMAKE_SYSTEM_NAME MATCHES "OS2")
set(OS2 TRUE)
endif (CMAKE_SYSTEM_NAME MATCHES "OS2")

View File

@@ -0,0 +1,60 @@
# - Try to find Argp
# Once done this will define
#
# ARGP_FOUND - system has Argp
# ARGP_INCLUDE_DIRS - the Argp include directory
# ARGP_LIBRARIES - Link these to use Argp
# ARGP_DEFINITIONS - Compiler switches required for using Argp
#
# Copyright (c) 2010 Andreas Schneider <asn@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (ARGP_LIBRARIES AND ARGP_INCLUDE_DIRS)
# in cache already
set(ARGP_FOUND TRUE)
else (ARGP_LIBRARIES AND ARGP_INCLUDE_DIRS)
find_path(ARGP_INCLUDE_DIR
NAMES
argp.h
PATHS
/usr/include
/usr/local/include
/opt/local/include
/sw/include
)
find_library(ARGP_LIBRARY
NAMES
argp
PATHS
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
)
set(ARGP_INCLUDE_DIRS
${ARGP_INCLUDE_DIR}
)
if (ARGP_LIBRARY)
set(ARGP_LIBRARIES
${ARGP_LIBRARIES}
${ARGP_LIBRARY}
)
endif (ARGP_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(Argp DEFAULT_MSG ARGP_LIBRARIES ARGP_INCLUDE_DIRS)
# show the ARGP_INCLUDE_DIRS and ARGP_LIBRARIES variables only in the advanced view
mark_as_advanced(ARGP_INCLUDE_DIRS ARGP_LIBRARIES)
endif (ARGP_LIBRARIES AND ARGP_INCLUDE_DIRS)

View File

@@ -0,0 +1,63 @@
# - Try to find CMockery
# Once done this will define
#
# CMOCKERY_FOUND - system has CMockery
# CMOCKERY_INCLUDE_DIRS - the CMockery include directory
# CMOCKERY_LIBRARIES - Link these to use CMockery
# CMOCKERY_DEFINITIONS - Compiler switches required for using CMockery
#
# Copyright (c) 2010 Andreas Schneider <asn@cryptomilk.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
if (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
# in cache already
set(CMOCKERY_FOUND TRUE)
else (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)
find_path(CMOCKERY_INCLUDE_DIR
NAMES
google/cmockery.h
PATHS
${_CMOCKERY_DIR}/include
/usr/include
/usr/local/include
/opt/local/include
/sw/include
$ENV{PROGRAMFILES}/cmockery/include
)
find_library(CMOCKERY_LIBRARY
NAMES
cmockery
PATHS
${_CMOCKERY_DIR}/lib
/usr/lib
/usr/local/lib
/opt/local/lib
/sw/lib
$ENV{PROGRAMFILES}/cmockery/lib
)
set(CMOCKERY_INCLUDE_DIRS
${CMOCKERY_INCLUDE_DIR}
)
if (CMOCKERY_LIBRARY)
set(CMOCKERY_LIBRARIES
${CMOCKERY_LIBRARIES}
${CMOCKERY_LIBRARY}
)
endif (CMOCKERY_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(CMockery DEFAULT_MSG CMOCKERY_LIBRARIES CMOCKERY_INCLUDE_DIRS)
# show the CMOCKERY_INCLUDE_DIRS and CMOCKERY_LIBRARIES variables only in the advanced view
mark_as_advanced(CMOCKERY_INCLUDE_DIRS CMOCKERY_LIBRARIES)
endif (CMOCKERY_LIBRARIES AND CMOCKERY_INCLUDE_DIRS)

View File

@@ -0,0 +1,70 @@
# - Try to find GCrypt
# Once done this will define
#
# GCRYPT_FOUND - system has GCrypt
# GCRYPT_INCLUDE_DIRS - the GCrypt include directory
# GCRYPT_LIBRARIES - Link these to use GCrypt
# GCRYPT_DEFINITIONS - Compiler switches required for using GCrypt
#
#=============================================================================
# Copyright (c) 2009-2011 Andreas Schneider <asn@cryptomilk.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
#
if (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
# in cache already
# set(GCRYPT_FOUND TRUE)
else (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)
set(_GCRYPT_ROOT_PATHS
"$ENV{PROGRAMFILES}/libgcrypt"
)
find_path(GCRYPT_ROOT_DIR
NAMES
include/gcrypt.h
PATHS
${_GCRYPT_ROOT_PATHS}
)
mark_as_advanced(ZLIB_ROOT_DIR)
find_path(GCRYPT_INCLUDE_DIR
NAMES
gcrypt.h
PATHS
/usr/local/include
/opt/local/include
/sw/include
/usr/lib/sfw/include
${GCRYPT_ROOT_DIR}/include
)
set(GCRYPT_INCLUDE_DIRS ${GCRYPT_INCLUDE_DIR})
find_library(GCRYPT_LIBRARY
NAMES
gcrypt
gcrypt11
libgcrypt-11
PATHS
/opt/local/lib
/sw/lib
/usr/sfw/lib/64
/usr/sfw/lib
${GCRYPT_ROOT_DIR}/lib
)
set(GCRYPT_LIBRARIES ${GCRYPT_LIBRARY})
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(GCrypt DEFAULT_MSG GCRYPT_LIBRARIES GCRYPT_INCLUDE_DIRS)
# show the GCRYPT_INCLUDE_DIRS and GCRYPT_LIBRARIES variables only in the advanced view
mark_as_advanced(GCRYPT_INCLUDE_DIRS GCRYPT_LIBRARIES)
endif (GCRYPT_LIBRARIES AND GCRYPT_INCLUDE_DIRS)

View File

@@ -0,0 +1,39 @@
# - Try to find NSIS
# Once done this will define
#
# NSIS_ROOT_DIR - Set this variable to the root installation of ZLIB
#
# Read-Only variables:
# NSIS_FOUND - system has NSIS
# NSIS_MAKE - NSIS creator executable
#
#=============================================================================
# Copyright (c) 2010-2011 Andreas Schneider <asn@cryptomilk.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
#
set(_NSIS_ROOT_PATHS
C:/NSIS/Bin
"$ENV{PROGRAMFILES}/NSIS"
)
find_program(NSIS_MAKE
NAMES
makensis
PATHS
${NSIS_ROOT_PATH}
${NSIS_ROOT_PATH}/Bin
${_NSIS_ROOT_PATHS}
)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(NSIS DEFAULT_MSG NSIS_MAKE)
mark_as_advanced(NSIS_MAKE)

View File

@@ -0,0 +1,208 @@
# - Try to find OpenSSL
# Once done this will define
#
# OPENSSL_ROOT_DIR - Set this variable to the root installation of OpenSSL
#
# Read-Only variables:
# OPENSSL_FOUND - system has OpenSSL
# OPENSSL_INCLUDE_DIRS - the OpenSSL include directory
# OPENSSL_LIBRARIES - Link these to use OpenSSL
# OPENSSL_DEFINITIONS - Compiler switches required for using OpenSSL
#
#=============================================================================
# Copyright (c) 2006-2009 Kitware, Inc.
# Copyright (c) 2006 Alexander Neundorf <neundorf@kde.org>
# Copyright (c) 2009-2010 Mathieu Malaterre <mathieu.malaterre@gmail.com>
# Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
#
if (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
# in cache already
set(OPENSSL_FOUND TRUE)
else (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)
if (UNIX)
find_package(PkgConfig)
if (PKG_CONFIG_FOUND)
pkg_check_modules(_OPENSSL openssl)
endif (PKG_CONFIG_FOUND)
endif (UNIX)
# http://www.slproweb.com/products/Win32OpenSSL.html
set(_OPENSSL_ROOT_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (32-bit)_is1;Inno Setup: App Path]"
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\OpenSSL (64-bit)_is1;Inno Setup: App Path]"
)
set(_OPENSSL_ROOT_PATHS
"C:/OpenSSL/"
"C:/OpenSSL-Win32/"
"C:/OpenSSL-Win64/"
"$ENV{PROGRAMFILES}/OpenSSL"
"$ENV{PROGRAMFILES}/OpenSSL-Win32"
"$ENV{PROGRAMFILES}/OpenSSL-Win64"
)
find_path(OPENSSL_ROOT_DIR
NAMES
include/openssl/ssl.h
HINTS
${_OPENSSL_ROOT_HINTS}
PATHS
${_OPENSSL_ROOT_PATHS}
)
mark_as_advanced(OPENSSL_ROOT_DIR)
find_path(OPENSSL_INCLUDE_DIR
NAMES
openssl/ssl.h
PATHS
/usr/local/include
/opt/local/include
/sw/include
/usr/lib/sfw/include
${OPENSSL_ROOT_DIR}/include
)
set(OPENSSL_INCLUDE_DIRS ${OPENSSL_INCLUDE_DIR})
mark_as_advanced(OPENSSL_INCLUDE_DIRS)
if (WIN32 AND NOT CYGWIN)
# MINGW should go here too
if (MSVC)
# /MD and /MDd are the standard values - if someone wants to use
# others, the libnames have to change here too
# use also ssl and ssleay32 in debug as fallback for openssl < 0.9.8b
# TODO: handle /MT and static lib
# In Visual C++ naming convention each of these four kinds of Windows libraries has it's standard suffix:
# * MD for dynamic-release
# * MDd for dynamic-debug
# * MT for static-release
# * MTd for static-debug
# Implementation details:
# We are using the libraries located in the VC subdir instead of the parent directory eventhough :
# libeay32MD.lib is identical to ../libeay32.lib, and
# ssleay32MD.lib is identical to ../ssleay32.lib
find_library(LIB_EAY_DEBUG
NAMES
libeay32MDd
libeay32
PATHS
${OPENSSL_ROOT_DIR}/lib/VC
)
find_library(LIB_EAY_RELEASE
NAMES
libeay32MD
libeay32
PATHS
${OPENSSL_ROOT_DIR}/lib/VC
)
find_library(SSL_EAY_DEBUG
NAMES
ssleay32MDd
ssleay32
ssl
PATHS ${OPENSSL_ROOT_DIR}/lib/VC
)
find_library(SSL_EAY_RELEASE
NAMES
ssleay32MD
ssleay32
ssl
PATHS
${OPENSSL_ROOT_DIR}/lib/VC
)
if (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
set(OPENSSL_LIBRARIES
optimized ${SSL_EAY_RELEASE} debug ${SSL_EAY_DEBUG}
optimized ${LIB_EAY_RELEASE} debug ${LIB_EAY_DEBUG}
)
else (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
set( OPENSSL_LIBRARIES ${SSL_EAY_RELEASE} ${LIB_EAY_RELEASE} )
endif (CMAKE_CONFIGURATION_TYPES OR CMAKE_BUILD_TYPE)
mark_as_advanced(SSL_EAY_DEBUG SSL_EAY_RELEASE)
mark_as_advanced(LIB_EAY_DEBUG LIB_EAY_RELEASE)
elseif (MINGW)
# same player, for MingW
find_library(LIB_EAY
NAMES
libeay32
PATHS
${OPENSSL_ROOT_DIR}/lib/MinGW
)
find_library(SSL_EAY
NAMES
ssleay32
PATHS
${OPENSSL_ROOT_DIR}/lib/MinGW
)
mark_as_advanced(SSL_EAY LIB_EAY)
set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY})
else(MSVC)
# Not sure what to pick for -say- intel, let's use the toplevel ones and hope someone report issues:
find_library(LIB_EAY
NAMES
libeay32
PATHS
${OPENSSL_ROOT_DIR}/lib
)
find_library(SSL_EAY
NAMES
ssleay32
PATHS
${OPENSSL_ROOT_DIR}/lib
)
mark_as_advanced(SSL_EAY LIB_EAY)
set(OPENSSL_LIBRARIES ${SSL_EAY} ${LIB_EAY})
endif(MSVC)
else (WIN32 AND NOT CYGWIN)
find_library(OPENSSL_SSL_LIBRARIES
NAMES
ssl
ssleay32
ssleay32MD
PATHS
${_OPENSSL_LIBDIR}
/opt/local/lib
/sw/lib
/usr/sfw/lib/64
/usr/sfw/lib
)
find_library(OPENSSL_CRYPTO_LIBRARIES
NAMES
crypto
PATHS
${_OPENSSL_LIBDIR}
/opt/local/lib
/sw/lib
/usr/sfw/lib/64
/usr/sfw/lib
)
mark_as_advanced(OPENSSL_CRYPTO_LIBRARIES OPENSSL_SSL_LIBRARIES)
set(OPENSSL_LIBRARIES ${OPENSSL_SSL_LIBRARIES} ${OPENSSL_CRYPTO_LIBRARIES})
endif (WIN32 AND NOT CYGWIN)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(OpenSSL DEFAULT_MSG OPENSSL_LIBRARIES OPENSSL_INCLUDE_DIRS)
endif (OPENSSL_LIBRARIES AND OPENSSL_INCLUDE_DIRS)

View File

@@ -0,0 +1,119 @@
# - Try to find ZLIB
# Once done this will define
#
# ZLIB_ROOT_DIR - Set this variable to the root installation of ZLIB
#
# Read-Only variables:
# ZLIB_FOUND - system has ZLIB
# ZLIB_INCLUDE_DIRS - the ZLIB include directory
# ZLIB_LIBRARIES - Link these to use ZLIB
#
# ZLIB_VERSION_STRING - The version of zlib found (x.y.z)
# ZLIB_VERSION_MAJOR - The major version of zlib
# ZLIB_VERSION_MINOR - The minor version of zlib
# ZLIB_VERSION_PATCH - The patch version of zlib
# ZLIB_VERSION_TWEAK - The tweak version of zlib
#
# The following variable are provided for backward compatibility
#
# ZLIB_MAJOR_VERSION - The major version of zlib
# ZLIB_MINOR_VERSION - The minor version of zlib
# ZLIB_PATCH_VERSION - The patch version of zlib
#
#=============================================================================
# Copyright (c) 2001-2009 Kitware, Inc.
# Copyright (c) 2011 Andreas Schneider <asn@cryptomilk.org>
#
# Distributed under the OSI-approved BSD License (the "License");
# see accompanying file Copyright.txt for details.
#
# This software is distributed WITHOUT ANY WARRANTY; without even the
# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# See the License for more information.
#=============================================================================
#
if (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
# in cache already
set(ZLIB_FOUND TRUE)
else (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)
set(_ZLIB_ROOT_HINTS
"[HKEY_LOCAL_MACHINE\\SOFTWARE\\GnuWin32\\Zlib;InstallPath]/include"
)
set(_ZLIB_ROOT_PATHS
"$ENV{PROGRAMFILES}/zlib"
)
find_path(ZLIB_ROOT_DIR
NAMES
include/zlib.h
HINTS
${_ZLIB_ROOT_HINTS}
PATHS
${_ZLIB_ROOT_PATHS}
)
mark_as_advanced(ZLIB_ROOT_DIR)
# check for header file
find_path(ZLIB_INCLUDE_DIR
NAMES
zlib.h
PATHS
/usr/local/include
/opt/local/include
/sw/include
/usr/lib/sfw/include
${ZLIB_ROOT_DIR}/include
)
mark_as_advanced(ZLIB_INCLUDE_DIR)
# check version number
if (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
file(STRINGS "${ZLIB_INCLUDE_DIR}/zlib.h" ZLIB_H REGEX "^#define ZLIB_VERSION \"[^\"]*\"$")
string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1" ZLIB_VERSION_MAJOR "${ZLIB_H}")
string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_MINOR "${ZLIB_H}")
string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$" "\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
# only append a TWEAK version if it exists:
set(ZLIB_VERSION_TWEAK "")
if ("${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
set(ZLIB_VERSION_TWEAK "${CMAKE_MATCH_1}")
set(ZLIB_VERSION_STRING "${ZLIB_VERSION_STRING}.${ZLIB_VERSION_TWEAK}")
endif ("${ZLIB_H}" MATCHES "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+).*$")
set(ZLIB_MAJOR_VERSION "${ZLIB_VERSION_MAJOR}")
set(ZLIB_MINOR_VERSION "${ZLIB_VERSION_MINOR}")
set(ZLIB_PATCH_VERSION "${ZLIB_VERSION_PATCH}")
endif (ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_INCLUDE_DIR}/zlib.h")
find_library(ZLIB_LIBRARY
NAMES
z
zdll
zlib
zlib1
PATHS
/usr/local/lib
/opt/local/lib
/sw/lib
/usr/sfw/lib/64
/usr/sfw/lib
${ZLIB_ROOT_DIR}/lib
)
mark_as_advanced(ZLIB_LIBRARY)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(ZLIB DEFAULT_MSG ZLIB_INCLUDE_DIR ZLIB_LIBRARY)
#find_package_handle_standard_args(ZLIB REQUIRED_VARS ZLIB_INCLUDE_DIR ZLIB_LIBRARY
# VERSION_VAR ZLIB_VERSION_STRING)
if (ZLIB_FOUND)
set(ZLIB_INCLUDE_DIRS ${ZLIB_INCLUDE_DIR})
set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
endif (ZLIB_FOUND)
endif (ZLIB_LIBRARIES AND ZLIB_INCLUDE_DIRS)

View File

@@ -0,0 +1,21 @@
# - MACRO_ADD_COMPILE_FLAGS(target_name flag1 ... flagN)
# Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
# Copyright (c) 2006, Andreas Schneider, <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
macro (MACRO_ADD_COMPILE_FLAGS _target)
get_target_property(_flags ${_target} COMPILE_FLAGS)
if (_flags)
set(_flags ${_flags} ${ARGN})
else (_flags)
set(_flags ${ARGN})
endif (_flags)
set_target_properties(${_target} PROPERTIES COMPILE_FLAGS ${_flags})
endmacro (MACRO_ADD_COMPILE_FLAGS)

View File

@@ -0,0 +1,20 @@
# - MACRO_ADD_LINK_FLAGS(target_name flag1 ... flagN)
# Copyright (c) 2006, Oswald Buddenhagen, <ossi@kde.org>
# Copyright (c) 2006, Andreas Schneider, <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
macro (MACRO_ADD_LINK_FLAGS _target)
get_target_property(_flags ${_target} LINK_FLAGS)
if (_flags)
set(_flags "${_flags} ${ARGN}")
else (_flags)
set(_flags "${ARGN}")
endif (_flags)
set_target_properties(${_target} PROPERTIES LINK_FLAGS "${_flags}")
endmacro (MACRO_ADD_LINK_FLAGS)

View File

@@ -0,0 +1,30 @@
# - MACRO_ADD_PLUGIN(name [WITH_PREFIX] file1 .. fileN)
#
# Create a plugin from the given source files.
# If WITH_PREFIX is given, the resulting plugin will have the
# prefix "lib", otherwise it won't.
#
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
# Copyright (c) 2006, Laurent Montel, <montel@kde.org>
# Copyright (c) 2006, Andreas Schneider, <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
macro (MACRO_ADD_PLUGIN _target_NAME _with_PREFIX)
if (${_with_PREFIX} STREQUAL "WITH_PREFIX")
set(_first_SRC)
else (${_with_PREFIX} STREQUAL "WITH_PREFIX")
set(_first_SRC ${_with_PREFIX})
endif (${_with_PREFIX} STREQUAL "WITH_PREFIX")
add_library(${_target_NAME} MODULE ${_first_SRC} ${ARGN})
if (_first_SRC)
set_target_properties(${_target_NAME} PROPERTIES PREFIX "")
endif (_first_SRC)
endmacro (MACRO_ADD_PLUGIN _name _sources)

View File

@@ -0,0 +1,26 @@
# - Check whether the C compiler supports a given flag in the
# context of a stack checking compiler option.
# CHECK_C_COMPILER_FLAG_SSP(FLAG VARIABLE)
#
# FLAG - the compiler flag
# VARIABLE - variable to store the result
#
# This actually calls the check_c_source_compiles macro.
# See help for CheckCSourceCompiles for a listing of variables
# that can modify the build.
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
INCLUDE(CheckCSourceCompiles)
MACRO (CHECK_C_COMPILER_FLAG_SSP _FLAG _RESULT)
SET(SAFE_CMAKE_REQUIRED_DEFINITIONS "${CMAKE_REQUIRED_DEFINITIONS}")
SET(CMAKE_REQUIRED_DEFINITIONS "${_FLAG}")
CHECK_C_SOURCE_COMPILES("int main(int argc, char **argv) { char buffer[256]; return buffer[argc]=0;}" ${_RESULT})
SET (CMAKE_REQUIRED_DEFINITIONS "${SAFE_CMAKE_REQUIRED_DEFINITIONS}")
ENDMACRO (CHECK_C_COMPILER_FLAG_SSP)

View File

@@ -0,0 +1,33 @@
# - macro_copy_file(_src _dst)
# Copies a file to ${_dst} only if ${_src} is different (newer) than ${_dst}
#
# Example:
# macro_copy_file(${CMAKE_CURRENT_SOURCE_DIR}/icon.png ${CMAKE_CURRENT_BINARY_DIR}/.)
# Copies file icon.png to ${CMAKE_CURRENT_BINARY_DIR} directory
#
# Copyright (c) 2006-2007 Wengo
# Copyright (c) 2006-2008 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING file.
macro (macro_copy_file _src _dst)
# Removes all path containing .svn or CVS or CMakeLists.txt during the copy
if (NOT ${_src} MATCHES ".*\\.svn|CVS|CMakeLists\\.txt.*")
if (CMAKE_VERBOSE_MAKEFILE)
message(STATUS "Copy file from ${_src} to ${_dst}")
endif (CMAKE_VERBOSE_MAKEFILE)
# Creates directory if necessary
get_filename_component(_path ${_dst} PATH)
file(MAKE_DIRECTORY ${_path})
execute_process(
COMMAND
${CMAKE_COMMAND} -E copy_if_different ${_src} ${_dst}
OUTPUT_QUIET
)
endif (NOT ${_src} MATCHES ".*\\.svn|CVS|CMakeLists\\.txt.*")
endmacro (macro_copy_file)

View File

@@ -0,0 +1,17 @@
# - MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
# MACRO_ENSURE_OUT_OF_SOURCE_BUILD(<errorMessage>)
# Copyright (c) 2006, Alexander Neundorf, <neundorf@kde.org>
#
# Redistribution and use is allowed according to the terms of the BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
macro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD _errorMessage)
string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_BINARY_DIR}" _insource)
if (_insource)
message(SEND_ERROR "${_errorMessage}")
message(FATAL_ERROR "Remove the file CMakeCache.txt in ${CMAKE_SOURCE_DIR} first.")
endif (_insource)
endmacro (MACRO_ENSURE_OUT_OF_SOURCE_BUILD)

View File

@@ -0,0 +1,100 @@
# - Run Doxygen
#
# Adds a doxygen target that runs doxygen to generate the html
# and optionally the LaTeX API documentation.
# The doxygen target is added to the doc target as dependency.
# i.e.: the API documentation is built with:
# make doc
#
# USAGE: INCLUDE IN PROJECT
#
# set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
# include(UseDoxygen)
# Add the Doxyfile.in and UseDoxygen.cmake files to the projects source directory.
#
#
# Variables you may define are:
# DOXYFILE_OUTPUT_DIR - Path where the Doxygen output is stored. Defaults to "doc".
#
# DOXYFILE_LATEX_DIR - Directory where the Doxygen LaTeX output is stored. Defaults to "latex".
#
# DOXYFILE_HTML_DIR - Directory where the Doxygen html output is stored. Defaults to "html".
#
#
# Copyright (c) 2009-2010 Tobias Rautenkranz <tobias@rautenkranz.ch>
# Copyright (c) 2010 Andreas Schneider <mail@cynapses.org>
#
# Redistribution and use is allowed according to the terms of the New
# BSD license.
# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
#
macro(usedoxygen_set_default name value)
if(NOT DEFINED "${name}")
set("${name}" "${value}")
endif()
endmacro()
find_package(Doxygen)
if(DOXYGEN_FOUND)
find_file(DOXYFILE_IN
NAMES
doxy.config.in
PATHS
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_ROOT}/Modules/
NO_DEFAULT_PATH)
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(DOXYFILE_IN DEFAULT_MSG "DOXYFILE_IN")
endif()
if(DOXYGEN_FOUND AND DOXYFILE_IN_FOUND)
add_custom_target(doxygen ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config)
usedoxygen_set_default(DOXYFILE_OUTPUT_DIR "${CMAKE_CURRENT_BINARY_DIR}")
usedoxygen_set_default(DOXYFILE_HTML_DIR "html")
set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_HTML_DIR}")
set(DOXYFILE_LATEX FALSE)
set(DOXYFILE_PDFLATEX FALSE)
set(DOXYFILE_DOT FALSE)
find_package(LATEX)
if(LATEX_COMPILER AND MAKEINDEX_COMPILER)
set(DOXYFILE_LATEX TRUE)
usedoxygen_set_default(DOXYFILE_LATEX_DIR "latex")
set_property(DIRECTORY APPEND PROPERTY
ADDITIONAL_MAKE_CLEAN_FILES
"${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
if(PDFLATEX_COMPILER)
set(DOXYFILE_PDFLATEX TRUE)
endif()
if(DOXYGEN_DOT_EXECUTABLE)
set(DOXYFILE_DOT TRUE)
endif()
add_custom_command(TARGET doxygen
POST_BUILD
COMMAND ${CMAKE_MAKE_PROGRAM}
WORKING_DIRECTORY "${DOXYFILE_OUTPUT_DIR}/${DOXYFILE_LATEX_DIR}")
endif()
configure_file(${DOXYFILE_IN} ${CMAKE_CURRENT_BINARY_DIR}/doxy.config ESCAPE_QUOTES IMMEDIATE @ONLY)
if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in)
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/doxy.trac.in ${CMAKE_CURRENT_BINARY_DIR}/doxy.trac ESCAPE_QUOTES IMMEDIATE @ONLY)
add_custom_target(doxygen-trac ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/doxy.trac)
endif()
get_target_property(DOC_TARGET doc TYPE)
if(NOT DOC_TARGET)
add_custom_target(doc)
endif()
add_dependencies(doc doxygen)
endif()

125
config.h.cmake Normal file
View File

@@ -0,0 +1,125 @@
/* Name of package */
#cmakedefine PACKAGE "${APPLICATION_NAME}"
/* Version number of package */
#cmakedefine VERSION "${APPLICATION_VERSION}"
#cmakedefine LOCALEDIR "${LOCALE_INSTALL_DIR}"
#cmakedefine DATADIR "${DATADIR}"
#cmakedefine LIBDIR "${LIBDIR}"
#cmakedefine PLUGINDIR "${PLUGINDIR}"
#cmakedefine SYSCONFDIR "${SYSCONFDIR}"
#cmakedefine BINARYDIR "${BINARYDIR}"
#cmakedefine SOURCEDIR "${SOURCEDIR}"
/************************** HEADER FILES *************************/
/* Define to 1 if you have the <argp.h> header file. */
#cmakedefine HAVE_ARGP_H 1
/* Define to 1 if you have the <pty.h> header file. */
#cmakedefine HAVE_PTY_H 1
/* Define to 1 if you have the <termios.h> header file. */
#cmakedefine HAVE_TERMIOS_H 1
/* Define to 1 if you have the <openssl/aes.h> header file. */
#cmakedefine HAVE_OPENSSL_AES_H 1
/* Define to 1 if you have the <wspiapi.h> header file. */
#cmakedefine HAVE_WSPIAPI_H 1
/* Define to 1 if you have the <openssl/blowfish.h> header file. */
#cmakedefine HAVE_OPENSSL_BLOWFISH_H 1
/* Define to 1 if you have the <openssl/des.h> header file. */
#cmakedefine HAVE_OPENSSL_DES_H 1
/* Define to 1 if you have the <pthread.h> header file. */
#cmakedefine HAVE_PTHREAD_H 1
/*************************** FUNCTIONS ***************************/
/* Define to 1 if you have the `snprintf' function. */
#cmakedefine HAVE_SNPRINTF 1
/* Define to 1 if you have the `_snprintf' function. */
#cmakedefine HAVE__SNPRINTF 1
/* Define to 1 if you have the `_snprintf_s' function. */
#cmakedefine HAVE__SNPRINTF_S 1
/* Define to 1 if you have the `vsnprintf' function. */
#cmakedefine HAVE_VSNPRINTF 1
/* Define to 1 if you have the `_vsnprintf' function. */
#cmakedefine HAVE__VSNPRINTF 1
/* Define to 1 if you have the `_vsnprintf_s' function. */
#cmakedefine HAVE__VSNPRINTF_S 1
/* Define to 1 if you have the `strncpy' function. */
#cmakedefine HAVE_STRNCPY 1
/* Define to 1 if you have the `cfmakeraw' function. */
#cmakedefine HAVE_CFMAKERAW 1
/* Define to 1 if you have the `getaddrinfo' function. */
#cmakedefine HAVE_GETADDRINFO 1
/* Define to 1 if you have the `poll' function. */
#cmakedefine HAVE_POLL 1
/* Define to 1 if you have the `select' function. */
#cmakedefine HAVE_SELECT 1
/* Define to 1 if you have the `regcomp' function. */
#cmakedefine HAVE_REGCOMP 1
/* Define to 1 if you have the `clock_gettime' function. */
#cmakedefine HAVE_CLOCK_GETTIME 1
/*************************** LIBRARIES ***************************/
/* Define to 1 if you have the `crypto' library (-lcrypto). */
#cmakedefine HAVE_LIBCRYPTO 1
/* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
#cmakedefine HAVE_LIBGCRYPT 1
/* Define to 1 if you have the `z' library (-lz). */
#cmakedefine HAVE_LIBZ 1
/* Define to 1 if you have the `pthread' library (-lpthread). */
#cmakedefine HAVE_PTHREAD 1
/**************************** OPTIONS ****************************/
/* Define to 1 if you want to enable ZLIB */
#cmakedefine WITH_LIBZ 1
/* Define to 1 if you want to enable SFTP */
#cmakedefine WITH_SFTP 1
/* Define to 1 if you want to enable SSH1 */
#cmakedefine WITH_SSH1 1
/* Define to 1 if you want to enable server support */
#cmakedefine WITH_SERVER 1
/* Define to 1 if you want to enable debug output for crypto functions */
#cmakedefine DEBUG_CRYPTO 1
/* Define to 1 if you want to enable pcap output support (experimental) */
#cmakedefine WITH_PCAP 1
/* Define to 1 if you want to enable calltrace debug output */
#cmakedefine DEBUG_CALLTRACE 1
/*************************** ENDIAN *****************************/
/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
significant byte first (like Motorola and SPARC, unlike Intel). */
#cmakedefine WORDS_BIGENDIAN 1

View File

@@ -1,193 +0,0 @@
/* config.h. Manually tweaked for Windows. */
/* Define to 1 if you have the `cfmakeraw' function. */
#define HAVE_CFMAKERAW 1
/* Define to 1 if you have the <dlfcn.h> header file. */
#define HAVE_DLFCN_H 1
/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */
/* #undef HAVE_DOPRNT */
/* Define to 1 if you have the `endpwent' function. */
/* #undef HAVE_ENDPWENT */
/* Define to 1 if you have the <fcntl.h> header file. */
#define HAVE_FCNTL_H 1
/* Define to 1 if you have the <gcrypt.h> header file. */
/* #undef HAVE_GCRYPT_H */
/* Define to 1 if you have the `getaddrinfo' function. */
#define HAVE_GETADDRINFO 1
/* Define to 1 if you have the `gethostbyname' function. */
#define HAVE_GETHOSTBYNAME 1
/* Define to 1 if you have the `getpass' function. */
/* #undef HAVE_GETPASS */
/* Define to 1 if you have the <inttypes.h> header file. */
#define HAVE_INTTYPES_H 1
/* Define to 1 if you have the `crypto' library (-lcrypto). */
#define HAVE_LIBCRYPTO 1
/* Define to 1 if you have the `gcrypt' library (-lgcrypt). */
/* #undef HAVE_LIBGCRYPT */
/* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1
/* Define to 1 if your system has a GNU libc compatible `malloc' function, and
to 0 otherwise. */
#define HAVE_MALLOC 1
/* Define to 1 if you have the `memmove' function. */
#define HAVE_MEMMOVE 1
/* Define to 1 if you have the <memory.h> header file. */
#define HAVE_MEMORY_H 1
/* Define to 1 if you have the `memset' function. */
#define HAVE_MEMSET 1
/* Define to 1 if you have the <netdb.h> header file. */
/* #undef HAVE_NETDB_H */
/* Define to 1 if you have the <netinet/in.h> header file. */
/* #undef HAVE_NETINET_IN_H */
/* Define to 1 if you have the <openssl/aes.h> header file. */
#define HAVE_OPENSSL_AES_H 1
/* Define to 1 if you have the <openssl/blowfish.h> header file. */
#define HAVE_OPENSSL_BLOWFISH_H 1
/* Define to 1 if you have the <openssl/des.h> header file. */
#define HAVE_OPENSSL_DES_H 1
/* Define to 1 if you have the `poll' function. */
/* #undef HAVE_POLL */
/* Define to 1 if you have the <pty.h> header file. */
/* #undef HAVE_PTY_H */
/* Define to 1 if your system has a GNU libc compatible `realloc' function,
and to 0 otherwise. */
#define HAVE_REALLOC 1
/* Define to 1 if you have the `select' function. */
#define HAVE_SELECT 1
/* Define to 1 if you have the `socket' function. */
#define HAVE_SOCKET 1
/* Define to 1 if you want to enable SSH1 */
/* #undef HAVE_SSH1 */
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <stdlib.h> header file. */
#define HAVE_STDLIB_H 1
/* Define to 1 if you have the `strchr' function. */
#define HAVE_STRCHR 1
/* Define to 1 if you have the `strdup' function. */
#define HAVE_STRDUP 1
/* Define to 1 if you have the `strerror' function. */
#define HAVE_STRERROR 1
/* Define to 1 if you have the <strings.h> header file. */
#define HAVE_STRINGS_H 1
/* Define to 1 if you have the <string.h> header file. */
#define HAVE_STRING_H 1
/* Define to 1 if you have the `strstr' function. */
#define HAVE_STRSTR 1
/* Define to 1 if you have the <sys/poll.h> header file. */
/* #undef HAVE_SYS_POLL_H */
/* Define to 1 if you have the <sys/select.h> header file. */
#define HAVE_SYS_SELECT_H 1
/* Define to 1 if you have the <sys/socket.h> header file. */
/* #undef HAVE_SYS_SOCKET_H */
/* Define to 1 if you have the <sys/stat.h> header file. */
#define HAVE_SYS_STAT_H 1
/* Define to 1 if you have the <sys/time.h> header file. */
#define HAVE_SYS_TIME_H 1
/* Define to 1 if you have the <sys/types.h> header file. */
#define HAVE_SYS_TYPES_H 1
/* Define to 1 if you have the <termios.h> header file. */
/* #undef HAVE_TERMIOS_H */
/* Define to 1 if you have the <unistd.h> header file. */
#define HAVE_UNISTD_H 1
/* Define to 1 if you have the `vprintf' function. */
#define HAVE_VPRINTF 1
/* Define to 1 if you have the <zlib.h> header file. */
#define HAVE_ZLIB_H 1
/* Name of package */
#define PACKAGE "libssh"
/* Define to the address where bug reports for this package should be sent. */
#define PACKAGE_BUGREPORT "aris@0xbadc0de.be"
/* Define to the full name of this package. */
#define PACKAGE_NAME "libssh"
/* Define to the full name and version of this package. */
#define PACKAGE_STRING "libssh 0.2"
/* Define to the one symbol short name of this package. */
#define PACKAGE_TARNAME "libssh"
/* Define to the version of this package. */
#define PACKAGE_VERSION "0.2.1-win-svn"
/* Define as the return type of signal handlers (`int' or `void'). */
#define RETSIGTYPE void
/* Define to the type of arg 1 for `select'. */
#define SELECT_TYPE_ARG1 int
/* Define to the type of args 2, 3 and 4 for `select'. */
#define SELECT_TYPE_ARG234 (fd_set *)
/* Define to the type of arg 5 for `select'. */
#define SELECT_TYPE_ARG5 (struct timeval *)
/* Define to 1 if you have the ANSI C header files. */
#define STDC_HEADERS 1
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#define TIME_WITH_SYS_TIME 1
/* Version number of package */
#define VERSION "0.2.1-win-svn"
/* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */
/* #undef WORDS_BIGENDIAN */
/* Define to empty if `const' does not conform to ANSI C. */
/* #undef const */
/* Define to rpl_malloc if the replacement function should be used. */
/* #undef malloc */
/* Define to rpl_realloc if the replacement function should be used. */
/* #undef realloc */

View File

@@ -1,135 +0,0 @@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
AC_INIT([libssh], 0.2.1-svn, [aris@0xbadc0de.be])
AM_INIT_AUTOMAKE(1.9)
AC_CONFIG_SRCDIR([sample.c])
AC_CONFIG_HEADER([config.h])
AM_MAINTAINER_MODE
# LT Version numbers, remember to change them just *before* a release.
# (Interfaces removed: CURRENT++, AGE=0, REVISION=0)
# (Interfaces added: CURRENT++, AGE++, REVISION=0)
# (No interfaces changed: REVISION++)
LIBSSH_CURRENT=3
LIBSSH_AGE=1
LIBSSH_REVISION=0
AC_SUBST(LIBSSH_CURRENT)
AC_SUBST(LIBSSH_AGE)
AC_SUBST(LIBSSH_REVISION)
# Check for the OS.
AC_CANONICAL_HOST
case "$host" in
*-apple*)
LIBSSH_LDFLAGS="-prebind -seg1addr 0x3a000000 -headerpad_max_install_names"
;;
*)
LIBSSH_LDFLAGS=""
;;
esac
AC_SUBST(LIBSSH_LDFLAGS)
AC_MSG_CHECKING([version script options])
case "$host" in
*-*-linux*)
LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,libssh.vers"
;;
*-*-gnu*)
LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,libssh.vers"
;;
esac
AC_ARG_WITH([versioned-symbol],
AC_HELP_STRING([--with-versioned-symbol],[Use versioned symbols]),
[if test "$withval" = "yes"; then
LIBSSH_VERS="$LIBSSH_LDFLAGS -Wl,--version-script,libssh.vers"
else
LIBSSH_VERS=""
fi], [ : ])
AC_SUBST(LIBSSH_VERS)
enable_ssh1=${enable_ssh1:-"no"}
AC_ARG_ENABLE(ssh1, AC_HELP_STRING([--enable-ssh1], [enable SSH1 support]))
AC_MSG_CHECKING([for SSH1 support])
if test "$enable_ssh1" = "yes" ; then
AC_DEFINE(HAVE_SSH1,1,[Define to 1 if you want to enable SSH1])
fi
AC_MSG_RESULT([$enable_ssh1])
# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
AC_PROG_LIBTOOL
AC_C_BIGENDIAN
AC_CHECK_PROG([DOXYGEN], [doxygen], [yes], [no])
AM_CONDITIONAL([HAS_DOXYGEN], [test x"$DOXYGEN" = xyes])
# Checks for libraries.
with_gcrypt=${with_gcrypt:-"no"}
AC_ARG_WITH([libgcrypt],
AC_HELP_STRING([--with-libgcrypt],[Use libgcrypt instead of libcrypto]),
[if test "$withval" = "yes"; then
with_gcrypt="yes"
AC_CHECK_LIB([gcrypt], [gcry_md_open])
fi], [ : ])
if test "$with_gcrypt" = "no"; then
AC_CHECK_LIB([crypto], [BN_init])
fi
AC_CHECK_LIB([z], [deflateInit_])
AC_SEARCH_LIBS([hstrerror],[nsl resolv])
AC_SEARCH_LIBS([getaddrinfo],[nsl socket])
AC_SEARCH_LIBS([gethostbyname],[nsl resolv])
# Checks for header files.
AC_HEADER_STDC
AC_CHECK_HEADERS([fcntl.h netdb.h netinet/in.h stdlib.h string.h sys/socket.h \
sys/time.h termios.h unistd.h openssl/aes.h openssl/blowfish.h \
openssl/des.h zlib.h sys/poll.h stdint.h pty.h gcrypt.h])
#Warn user when no openssl available
if test "$with_gcrypt" = "no" && (test "$ac_cv_header_openssl_aes_h" != "yes" ||
test "$ac_cv_header_openssl_blowfish_h" != "yes"); then
echo "Can't find valid openssl files [e.g openssl/aes.h]"
echo "Please install Openssl-devel"
exit
fi
#Warn user when no libgcrypt available
if test "$with_gcrypt" = "yes" && test "$ac_cv_header_gcrypt_h" != "yes"; then
echo "Can't find valid libgcrypt files [e.g gcrypt.h]"
echo "Please install libgcrypt-devel"
exit
fi
#if ! test x"$ac_cv_header_zlib_h" != x"yes"; then
# echo "Can't find zlib.h"
# echo "Compression support won't be compiled in"
#fi
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_HEADER_TIME
# Checks for library functions.
AC_FUNC_MALLOC
AC_FUNC_MEMCMP
AC_FUNC_REALLOC
AC_FUNC_SELECT_ARGTYPES
AC_TYPE_SIGNAL
AC_FUNC_VPRINTF
AC_CHECK_FUNCS([endpwent getaddrinfo gethostbyname getpass memmove memset \
cfmakeraw select socket strchr strdup strerror strstr poll])
AC_CONFIG_FILES([Makefile
libssh/Makefile
include/Makefile
include/libssh/Makefile])
AC_OUTPUT

View File

@@ -1,7 +0,0 @@
libssh for Debian
----------------------
This is a package for the library libssh with the soname 2.
There are some other projects which have nearly the same name, so be careful.
-- Laurent Bigonville <bigon@bigon.be> Fri, 27 Jul 2007 14:59:00 +0200

50
debian/changelog vendored
View File

@@ -1,50 +0,0 @@
libssh (0.2+svn20070321-5) UNRELEASED; urgency=low
* NOT RELEASED YET
* Use now official Vcs-* field
* Use new Homepage field instead of old pseudo-field
* BumpStandards-Version to 3.7.3 (no further changes)
* debian/libssh-2-doc.doc-base: fix doc-base-unknown-section
-- Laurent Bigonville <bigon@bigon.be> Thu, 08 Nov 2007 05:59:18 +0100
libssh (0.2+svn20070321-4) unstable; urgency=low
* debian/control:
- Add XS-Vcs-Svn and XS-Vcs-Browser fields.
- Change to ${binary:Version} for versionized dependencies.
* Add debian/README.Debian to disambiguate the package name
-- Laurent Bigonville <bigon@bigon.be> Fri, 27 Jul 2007 15:00:06 +0200
libssh (0.2+svn20070321-3) unstable; urgency=low
* Fix wrong versionized Replaces for -doc package
-- Laurent Bigonville <bigon@bigon.be> Thu, 5 Apr 2007 17:58:27 +0200
libssh (0.2+svn20070321-2) unstable; urgency=low
* Split devel package into devel and documentation packages
-- Laurent Bigonville <bigon@bigon.be> Mon, 26 Mar 2007 15:29:51 +0200
libssh (0.2+svn20070321-1) unstable; urgency=low
* New svn snapshot:
- Fix broken include in include/libssh/server.h (Closes: #410020)
- Fix nasty bug in server side code
-- Laurent Bigonville <bigon@bigon.be> Mon, 26 Mar 2007 15:06:40 +0200
libssh (0.2-1) unstable; urgency=low
* New upstream release.
-- Laurent Bigonville <bigon@bigon.be> Fri, 29 Dec 2006 07:40:20 +0100
libssh (0.2~rc-1) unstable; urgency=low
* Initial release (Closes: #316872)
-- Jean-Philippe Garcia Ballester <giga@le-pec.org> Wed, 20 Dec 2006 23:56:50 +0100

1
debian/compat vendored
View File

@@ -1 +0,0 @@
5

65
debian/control vendored
View File

@@ -1,65 +0,0 @@
Source: libssh
Section: libs
Priority: optional
Maintainer: Jean-Philippe Garcia Ballester <giga@le-pec.org>
Uploaders: Laurent Bigonville <bigon@bigon.be>
Build-Depends: cdbs, debhelper (>= 5), libgcrypt11-dev, libz-dev, doxygen
Standards-Version: 3.7.3
Vcs-Svn: svn://svn.berlios.de/libssh/trunk
Vcs-Browser: http://svn.berlios.de/wsvn/libssh/trunk/
Homepage: http://0xbadc0de.be/wiki/doku.php?id=libssh:libssh
Package: libssh-2
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: A tiny C SSH library
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
is made by the programmer. With libssh, you can remotely execute programs,
transfer files, use a secure and transparent tunnel for your remote programs.
With its SFTP implementation, you can play with remote files easily.
Package: libssh-2-dev
Provides: libssh-dev
Section: libdevel
Architecture: any
Depends: libssh-2 (= ${binary:Version}), libgcrypt11-dev, zlib1g-dev
Suggests: libssh-2-doc
Conflicts: libssh-dev
Description: A tiny C SSH library. Development files
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
is made by the programmer. With libssh, you can remotely execute programs,
transfer files, use a secure and transparent tunnel for your remote programs.
With its SFTP implementation, you can play with remote files easily.
.
This package contains development files.
Package: libssh-2-dbg
Priority: extra
Section: libdevel
Architecture: any
Depends: libssh-2 (= ${binary:Version})
Description: A tiny C SSH library. Debug symbols
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
is made by the programmer. With libssh, you can remotely execute programs,
transfer files, use a secure and transparent tunnel for your remote programs.
With its SFTP implementation, you can play with remote files easily.
.
This package contains debug symbols.
Package: libssh-2-doc
Section: doc
Architecture: all
Suggests: doc-base
Replaces: libssh-2-dev (<< 0.2+svn20070321-2)
Description: A tiny C SSH library. Documentation files
The ssh library was designed to be used by programmers needing a working SSH
implementation by the mean of a library. The complete control of the client
is made by the programmer. With libssh, you can remotely execute programs,
transfer files, use a secure and transparent tunnel for your remote programs.
With its SFTP implementation, you can play with remote files easily.
.
This package contains documentation files.

33
debian/copyright vendored
View File

@@ -1,33 +0,0 @@
This package was debianized by Laurent Bigonville <bigon@bigon.be> on
Thu, 16 Nov 2006 20:34:01 +0100.
It was downloaded from http://www.0xbadc0de.be/
Upstream Author: Aris Adamantiadis (aka spacewalker) <aris@0xbadc0de.be>
Copyright: 2003 Aris Adamantiadis
License:
This package is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This package is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this package; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
On Debian systems, the complete text of the GNU Lesser General
Public License can be found in `/usr/share/common-licenses/LGPL'.
The Debian packaging is
(C) 2005-2006, Jean-Philippe Garcia Ballester <giga@le-pec.org>,
(C) 2006-2007, Laurent Bigonville <bigon@bigon.be> and
is licensed under the GPL, see `/usr/share/common-licenses/GPL'.

View File

@@ -1,2 +0,0 @@
debian/tmp/usr/include/*
debian/tmp/usr/lib/libssh.{a,la,so}

View File

@@ -1,9 +0,0 @@
Document: libssh
Title: Debian libssh Manual
Author: Aris Adamantiadis <aris@0xbadc0de.be>
Abstract: This manual describes libssh API.
Section: Apps/Programming
Format: HTML
Index: /usr/share/doc/libssh-2-doc/html/index.html
Files: /usr/share/doc/libssh-2-doc/html/*

View File

@@ -1 +0,0 @@
debian/tmp/usr/share/doc/libssh/html

View File

@@ -1 +0,0 @@
debian/tmp/usr/share/doc/libssh/examples/*

View File

@@ -1 +0,0 @@
doxygen/man/man3/ssh_*

View File

@@ -1 +0,0 @@
debian/tmp/usr/lib/libssh.so.*

View File

@@ -1,2 +0,0 @@
# We use libssh-2 name to avoid name clash with libssh2 package.
libssh-2: package-name-doesnt-match-sonames libssh2

21
debian/rules vendored
View File

@@ -1,21 +0,0 @@
#!/usr/bin/make -f
# Sample debian/rules that uses cdbs. Originaly written by Robert Millan.
# This file is public domain.
DEB_AUTO_CLEANUP_RCS := yes
# Add here any variable or target overrides you need
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/debhelper.mk
#include /usr/share/cdbs/1/rules/simple-patchsys.mk
DEB_CONFIGURE_EXTRA_FLAGS = --with-libgcrypt --enable-ssh1
DEB_DBG_PACKAGE_libssh-2 = libssh-2-dbg
install/libssh-2::
install -D -m 644 debian/libssh-2.lintian-overrides debian/libssh-2/usr/share/lintian/overrides/libssh-2
install/libssh-2-doc::
make install-doc DESTDIR=debian/tmp

2
debian/watch vendored
View File

@@ -1,2 +0,0 @@
version=3
http://0xbadc0de.be/libssh/libssh-(.*)\.tgz

View File

@@ -1,886 +0,0 @@
<!DOCTYPE HTML SYSTEM>
<META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=ISO-8859-1">
<head>
<title>
Libssh's Documentation
</title>
<link href="style.css" rel="stylesheet" type="text/css">
</head>
<div id="titre">
<div align="center">
LIBSSH API GUIDE <br>
Or everything you ever wanted to know about a simple and fast ssh library.
</div>
</div>
<h2> 0 Introduction</h2>
<div class="tout">
Before inserting ssh hooks into your programs, you must know some basics about
the ssh protocol, and understand why the ssh library must implement them. <br>
Lot of the protocols specifications are hidden by the ssh library API (of
course !) but some still needs an attention from the end-user programmer.<br>
Note that libssh is still an alpha product, and the API may vary from one
version to another. The only guess I can make is that the API won't radically
change. <br>
The SSH protocol was designed for some goals which I resume here : <br>
-Privacy of data<br>
-Security<br>
-Authentication of the server<br>
-Authentication of the client.<br>
The client MUST be sure who's speaking to before entering into any
authentication way. That's where the end programmer must ensure the given
fingerprints *are* from the legitimate server. A ssh connection must follow
the following steps:<br>
<br>
1- Before connecting the socket, you can set up if you wish one or other
server public key authentication ie. DSA or RSA.
You can choose cryptographic algorithms you trust and compression algorithms
if any.<br>
2- The connection is made. A secure handshake is made, and resulting from it,
a public key from the server is gained.
You MUST verify that the public key is legitimate.<br>
3- The client must authenticate : the two implemented ways are password, and
public keys (from dsa and rsa key-pairs generated by openssh). It is
harmless to authenticate to a fake server with these keys because the
protocol ensures the data you sign can't be used twice. It just avoids
man-in-the-middle attacks.<br>
4- Now that the user has been authenticated, you must open one or several
channels. channels are different subways for information into a single ssh
connection. Each channel has a standard stream (stdout) and an error
stream (stderr). You can theoretically open an infinity of channel.<br>
5- With the channel you opened, you can do several things :<br>
-Open a shell. You may want to request a pseudo virtual terminal before <br>
-Execute a command. The virtual terminal is usable, too<br>
-Invoke the sftp subsystem. (look at chapter 6)<br>
-invoke your own subsystem. This is out the scope of this
document but it is easy to do.<br>
6- When everything is finished, just close the channels, and then the
connection.<br>
<br>
At every place, a function which returns an error code (typically -1 for int
values, NULL for pointers) also sets an error message and an error code.
I high-lined the main steps, now that's you to follow them :)
<br>
</div>
<h2> 1- Setting the options </h2>
<div class="tout">
The options mechanism will change during updates of the library, but the
functions which exists now will certainly be kept.
<br><br>
The ssh system needs to know the preferences of the user, the trust into one
or another algorithm and such. More important informations have to be given
before connecting : the host name of the server, the port (if non default),
the binding address, the default username, ... <br>
The options structure is given to a ssh_connect function, then this option
structure is used again and again by the ssh implementation. you shall not
free it manually, and you shall not share it with multiple sessions.<br>
Two ways are given for setting the options : the easy one (of course !) and
the long-but-accurate one.<br><br>
</div>
<h3>a) the easy way</h3><br>
<div class="tout">
Lot of ssh options in fact come from the command line of the program... <br>
you could parse them and then use the long way for every argument, but libssh
has a mechanism to do that for you, automatically.<br>
<br>
<div class="prot">
SSH_OPTIONS *ssh_getopt(int *argcptr, char **argv);
</div>
this function will return you a new options pointer based on the arguments
you give in parameters. <br> better, they clean the argv array from used parameters
so you can use them after in your own program<br>
<div class="ex">
int main(int argc, char **argv){<br>
SSH_OPTIONS *opt;<br>
opt=ssh_getopt(&argc, argv);<br>
if(!opt){<br>
...<br>
}<br>
</div>
the function will return NULL if some problem is appearing.<br>
As a matter of portability for you own programs, the hostname isn't always<br>
the first argument from the command line, so the single arguments (not
preceded by a -something) won't be parsed.<br>
<div class="ex">
example: <br>
user@host:~$ myssh -u aris localhost <br>
-u aris will be caught, localhost will not.<br>
</div>
cfr the options_set_user() function in the next part for more informations
about it.<br>
</div>
<h3>b) the long way</h3>
<div class="tout">
<div class="prot">
SSH_OPTIONS *options_new();
</div>
This function returns an empty but initialized option structure pointer.<br>
The structure is freed by ssh_disconnect described later, so don't use the
existing function options_free() (it's an internal function).<br>
So : use it only for <b>one</b> ssh_connect(), <b>never</b> free it.<br>
<br>
<div class="prot">
SSH_OPTIONS *options_copy(SSH_OPTIONS *opt);
</div>
If you need to replicate an option object before using it, use this function.
<br><br>
The following functions are all of the following form : <br>
<div class="prot">
int options_set_something(SSH_OPTIONS *opt, something);
</div>
the something parameters are always internaly copied, so you don't have to
strdup them.<br>
some return eather 0 or -1, in which case an error message appears in the
error functions, others never fail (return void)<br>
the error codes and descriptions for these functions are recoverable throught <i>ssh_get_error(NULL);</i>
<br>
<div class="prot">
int options_set_wanted_method(SSH_OPTIONS *opt,int method, char *list);
</div>
Passing an option structure, a ssh macro for the method, and a list of allowed
parameters indicates libssh you want to use these.<br>
The macros are :<br>
KEX_ALGO<br>
KEX_HOSTKEY Server public key type expected<br>
KEX_CRYPT_C_S 2 Cryptographic algorithm client->server<br>
KEX_CRYPT_S_C 3 Cryptographic algorithm server->client<br>
KEX_MAC_C_S 4<br>
KEX_MAC_S_C 5<br>
KEX_COMP_C_S 6 Compression method for the stream ("zlib" or "none"), client to server<br>
KEX_COMP_S_C 7 Compression method for the stream ("zlib" or "none"), server to client<br>
KEX_LANG_C_S 8<br>
KEX_LANG_S_C 9<br>
<br>
Currently, only KEX_HOSTKEY and ,KEX_CRYPT_C_S,S_C, KEX_COMP_C_S and S_C work
as expected. the list is a comma separated string of prefered
algorithms/methods, in order of preference.<br>
<br>
<div class="ex">
example : this sets the ssh stream to be compressed in client->server mode only
<br>
ret = option_set_wanted_method(options,KEX_COMP_C_S,"zlib");
</div>
<div class="ex">
example: this will set the cryptographic algorithms wanted from server to
client to aes128-cbc and then aes192-cbc if the first one isn't supported by
server:<br>
ret = option_set_wanted_method(options,KEX_CRYPT_S_C,"aes128-cbc,aes192-cbc");
</div>
<div class="ex">
if you prefer getting the Dss key from a server instead of rsa, but you still
accept rsa if dss isn't available :<br>
options_set_wanted_method(options,KEX_HOSTKEY,"ssh-dss,ssh-rsa");
</div>
return value: <br>0 if the option is valid, -1 else.<br> An error is set in that case.
<br><br>
<div class="prot">
void options_set_port(SSH_OPTIONS *opt, unsigned int port);
</div>
this function sets the server port.
<div class="prot">
void options_set_host(SSH_OPTIONS *opt, const char *hostname);
</div>
this function sets the hostname of the server. It also supports
"user@hostname" syntax in which case the user options is set too.
<div class="prot">
void options_set_fd(SSH_OPTIONS *opt, int fd);
</div>
permits you to specify an opened file descriptor you've opened yourself.
<br>
It's a good way of bypassing the internal FD opening in libssh, but there are things you should take care of : <br>
-The file descriptor should be returned to libssh without nonblocking settings<br>
-If you wish to use <i>is_server_known()</i> You should also set <i>options_set_host</i>... Otherwise libssh won't have any mean of certifying the server is known or not.<br><br>
<div class="prot">
void options_set_bindaddr(SSH_OPTIONS *opt, char *bindaddr);
</div>
this function allows you to set the binding address, in case your computer has
multiple IP or interfaces. it supports both hostnames and IP's
<br><br>
<div class="prot">
void options_set_username(SSH_OPTIONS *opt,char *username);
</div>
sets username for authenticating in this session.
<br><br>
<div class="prot">
void option_set_timeout(SSH_OPTIONS *opt,long seconds, long usec);
</div>
sets the timeout for connecting to the socket. It does not include a timeout for the name resolving or handshake.
<br>
<br>
<div class="prot">
void options_set_ssh_dir(SSH_OPTIONS *opt, char *dir);
</div>
this function sets the .ssh/ directory used by libssh. You may use a %s
which will be replaced by the home directory of the user.
NEVER accept parameters others than the user's one, they may contain
format strings which are a security hole if a malicious agent gives it.
<br><br>
<div class="prot">
void options_set_known_hosts_file(SSH_OPTIONS *opt, char *dir);
</div>
same than <i>options_set_ssh_dir()</i> for known_hosts file.
<br><br>
<div class="prot">
void options_set_identity(SSH_OPTIONS *opt, char *identity);
</div>
same than upper for the identity file (they come by pair, the one asked is the file without the .pub suffix)
<br><br>
<div class="prot">
void options_set_status_callback(SSH_OPTIONS *opt, void (*callback)(void *arg, float status), void *arg);
</div>
Because more and more developpers use libssh with GUI, I've added this function to make the ssh_connect function more
interactive. This permits to set a callback of the form
<div class="prot">void function(void *userarg, float status);</div> with status going from 0 to 1 during ssh_connect. The callback won't ever be called after the connection is made.
<br><br>
</div>
<h2>
2- Connecting the ssh server
</H2>
<div class="tout">
The API provides an abstract data type, SSH_SESSION, which describes the
connection to one particular server. You can make several connections to
different servers under the same process because of this structure.
<br>
<br>
<div class="prot">
SSH_SESSION *ssh_connect(SSH_OPTIONS *options);
</div>
This function returns a handle on the newly connection. This function expects
to have a pre-set options structure.
<br>
It returns NULL in case of error, in which case you can look at error messages
for more informations.
<br><br>
<div class="prot">
void ssh_disconnect(SSH_SESSION *session);
</div>
This function sends a polite disconnect message, and does clean the session.<br>
This is the proper way of finishing a ssh connection.<br>
<br>
<div class="prot">
int ssh_get_pubkey_hash(SSH_SESSION *session, char hash[MD5_DIGEST_LEN]);
</div>
This function places the MD5 hash of the server public key into the hash array.<br>
It's IMPORTANT to verify it matches the previous known value. One server always
have the same hash. No other server/attacker can emulate it (or it'd be caught
by the public key verification procedure automatically made by libssh).
<br>
You can skip this step if you correctly handle <i>is_server_known()</i>
<br><br>
<div class="prot">
int ssh_is_server_known(SSH_SESSION *session);
</div>
Checks the user's known host file to look for a previous connection to the specified server. Return values:<br>
SSH_SERVER_KNOWN_OK : the host is known and the key has not changed<br>
SSH_SERVER_KNOWN_CHANGED : The host's key has changed. Either you are under
an active attack or the key changed. The API doesn't give any way to modify the key in known hosts yet. I Urge end developers to WARN the user about the possibility of an attack.<br>
SSH_SERVER_FOUND_OTHER: The host gave us a public key of one type, which does
not exist yet in our known host file, but there is an other type of key which is know.<br>
IE server sent a DSA key and we had a RSA key.<br>
Be carreful it's a possible attack (coder should use option_set_wanted_method() to specify
which key to use).<br>
SSH_SERVER_NOT_KNOWN: the server is unknown in known hosts. Possible reasons :
case not matching, alias, ... In any case the user MUST confirm the Md5 hash is correct.<br>
SSH_SERVER_ERROR : Some error happened while opening known host file.<br>
<br>
<div class="prot">
int ssh_write_knownhost(SSH_SESSION *session);
</div>
write the current connected host as known in the known host file. returns a negative value if something went wrong. You generaly use it when ssh_is_server_known returned SSH_SERVER_NOT_KNOWN.
<br><br>
<div class="prot">
int pubkey_get_hash(SSH_SESSION *session,char hash[MD5_DIGEST_LEN]);
</div>
deprecated but left for binary compatibility (will be removed in newer versions).
</div>
<h2>3- Authenticating to server</h2>
<div class="tout">
The ssh library supports the two most used authentication methods from SSH.
In every function, there is a "username" argument. If null is given instead,
the server will use the default username (which is guessed from what you gave
to options_set_user or options_set_hostname or even the local user running the code).
<br>
Authentication methods :<br>
<h3>A) Public keys</h3><br>
The public key is the only method which does not compromise your key if the
remote host has been compromised (the server can't do anything more than
getting your public key). This is not the case of a password authentication
(the server can get your plaintext password).<br>
Libssh is obviously fully compatible with the openssh public and private keys.<br>
The things go this way : you scan a list of files which contain public keys.<br>
For each key, you send it to ssh server until the server acknowledges a key
(a key it knows). Then, you get the private key for this key and send a
message proving you own that private key.<br>
Here again, two ways for the public key authentication... the easy and the
complicated one.<br>
<br>
<h4> easy way:</h4>
<div class="prot">
int ssh_userauth_autopubkey(SSH_SESSION *session);
</div>
This function will try the most common places for finding the public and
private keys (your home directory) or eventualy the identity files asked by
the <i>options_set_identity()</i> function.<br>
The return values are :<br>
SSH_AUTH_ERROR : some serious error happened during authentication<br>
SSH_AUTH_DENIED : no key matched<br>
SSH_AUTH_SUCCESS : you are now authenticated<br>
SSH_AUTH_PARTIAL : some key matched but you still have to give an other mean
of authentication (like password).<br>
<br>
<h4> peanful way:</h4>
there are three steps : you get a public key, you ask the server if the key
matches a known one, if true, you get the private key and authenticate with
it.<br>
<div class="prot">
STRING *publickey_from_file(char *filename,int *_type);
</div>
will return an handle on a public key. if you give a pointer to an int,
a symbolic value will be placed there. Do it because you need it in next
step.<br><br>
<div class="prot">
int ssh_userauth_offer_pubkey(SSH_SESSION *session, char *username,
int type, STRING *publickey);
</div>
this function will offer a public key to the server. SSH_AUTH_SUCCESS is
returned if the key is accepted (in which case you'll want to get the
private key), SSH_AUTH_DENIED otherwise.<br>
Still watch for SSH_AUTH_ERROR as connection problems might happen.
<br>
in case of SSH_AUTH_SUCCESS,
<br>
<div class="prot">
PRIVATE_KEY *privatekey_from_file(SSH_SESSION *session,char *filename,
int type,char *passphrase);
</div>
will get the privatekey from the filename previously set by
publickey_from_next_file(). You can call it with a passphrase for
unlocking the key. If passphrase==NULL, the default prompt will be used.<br>
The function returns NULL if the private key wasn't opened
(ie bad passphrase or missing file).<br>
<br>
<div class="prot">
int ssh_userauth_pubkey(SSH_SESSION *session, char *username,
STRING *publickey, PRIVATE_KEY *privatekey);
</div>
Will try to authenticate using the public and private key. It shall return
SSH_AUTH_SUCCESS if you are authenticated, SSH_AUTH_ERROR, SSH_AUTH_DENIED or
SSH_AUTH_PARTIAL depending of return condition.<br>
each public key (of type STRING) must be freed with the libc "free" function.<br>
The private key must be freed with private_key_free(PRIVATE_KEY *) which
will clean the memory before (don't worry about passphrase leaking).<br>
<br>
<h3> B) Password</h3><br>
<div class="prot">
int ssh_userauth_password(SSH_SESSION *session,char *username,char *password);
</div>
Will return SSH_AUTH_SUCCESS if the password matched, one of other constants
otherwise. It's your work to ask the password and to free it in a secure
manner.<br><br>
<h3> C) Keyboard-interactive</h3><br>
<div class="prot">
int ssh_userauth_kbdint(SSH_SESSION *session, char *user, char *submethods);
</div>
This is the main keyboard-interactive function. It will return SSH_AUTH_SUCCESS,SSH_AUTH_DENIED, SSH_AUTH_PARTIAL, SSH_AUTH_ERROR depending on the result of the request.<br>
The keyboard-interactive authentication method of SSH2 is a feature which permits the server to ask a certain number of questions in an interactive manner to the client, until it decides to accept or deny the login.<br>
To begin, you call this function (you can omit user if it was set previously and omit submethods - instead you know what you do - just put them to NULL) and store the answer.
If the answer is SSH_AUTH_INFO, it means the server has sent a few questions to ask your user, which you can retrieve with the following functions. Then, set the answers and call back ssh_userauth_kbdint with same arguments. It may again ask a few other questions etc. until you get an other SSH_AUTH code than SSH_AUTH_INFO.<br>
Few remarks :<br>
-Even the first call can return SSH_AUTH_DENIED or SSH_AUTH_SUCCESS.<br>
-The server can send an empty question set (this is the default behavior on my system) after you have sent the answers to the first questions.
you must still parse the answer, it might contain some message from the server saying hello or such things. Just call ssh_userauth_kbdint() once more<br>
<br>
<div class="prot">
int ssh_userauth_kbdint_getnprompts(SSH_SESSION *session);
</div>
After you called ssh_userauth_kbdint and got SSH_AUTH_INFO, the session contains a few questions (or prompts) from the server. This function returns the number of prompts and answers.<br>
It could be zero, in which case you must act as said previously.<br>
<div class="prot">
char *ssh_userauth_kbdint_getname(SSH_SESSION *session);
</div>
this functions returns the "name" of the message block. The meaning is explained later.<br>
This function returns a pointer that stays valid until the next ssh_userauth_kbdint() call and must not be freed.<br>
<div class="prot">
char *ssh_userauth_kbdint_getinstruction(SSH_SESSION *session);
</div>
this functions returns the "instruction" of the message block. The meaning is explained later.<br>
This function returns a pointer that stays valid until the next ssh_userauth_kbdint() call and must not be freed.<br>
<div class="prot">
char *ssh_userauth_kbdint_getprompt(SSH_SESSION *session,int i, char *echo);
</div>
This functions returns a pointer to the nth prompt. The character pointed by echo, if different from null, will contain a boolean value after the call, which means that the user prompt must be echoed or not.<br>
zero means that the echo is Off (like for a password prompt).<br>
any other value means the echo is on.<br>
This function returns a pointer that stays valid until the next ssh_userauth_kbdint() call and must not be freed.<br>
<div class="prot">
void ssh_userauth_kbdint_setanswer(SSH_SESSION *session, unsigned int i, char *a
nswer);
</div>
This function sets the ith answer. The string you give will be duplicated, and this copy will be discarded once it is no longer necessary.<br>
care must be taken so you discard the content of the original string after this function call.<br>
<h3> A little note about how to use the informations from keyboard-interactive authentication</h3>
<br>
The words from the original drafts explain everything
<div class="prot">
3.3 User Interface
Upon receiving a request message, the client SHOULD prompt the user
as follows:<br>
A command line interface (CLI) client SHOULD print the name and
instruction (if non-empty), adding newlines. Then for each prompt in
turn, the client SHOULD display the prompt and read the user input.<br>
<br>
A graphical user interface (GUI) client has many choices on how to
prompt the user. One possibility is to use the name field (possibly
prefixed with the application's name) as the title of a dialog window
in which the prompt(s) are presented. In that dialog window, the
instruction field would be a text message, and the prompts would be
labels for text entry fields. All fields SHOULD be presented to the
user, for example an implementation SHOULD NOT discard the name field
because its windows lack titles; it SHOULD instead find another way
to display this information. If prompts are presented in a dialog
window, then the client SHOULD NOT present each prompt in a separate
window.<br>
<br>
All clients MUST properly handle an instruction field with embedded
newlines. They SHOULD also be able to display at least 30 characters
for the name and prompts. If the server presents names or prompts
longer than 30 characters, the client MAY truncate these fields to
the length it can display. If the client does truncate any fields,
there MUST be an obvious indication that such truncation has occured.<br>
The instruction field SHOULD NOT be truncated.<br>
Clients SHOULD use control character filtering as discussed in
[SSH-ARCH] to avoid attacks by including terminal control characters
in the fields to be displayed.<br>
<br>
For each prompt, the corresponding echo field indicates whether or
not the user input should be echoed as characters are typed. Clients
SHOULD correctly echo/mask user input for each prompt independently
of other prompts in the request message. If a client does not honor
the echo field for whatever reason, then the client MUST err on the
side of masking input. A GUI client might like to have a checkbox
toggling echo/mask. Clients SHOULD NOT add any additional characters
to the prompt such as ": " (colon-space); the server is responsible
for supplying all text to be displayed to the user. Clients MUST
also accept empty responses from the user and pass them on as empty
strings.<br>
</div>
<br>
<h3> D) "none"</h3><br>
In fact this mode only serve to get the list of supported authentications.<br>
however, it also serves to get the banner message from the server, if any.<br>
You should firstly try this method, at least for getting the banner, then to enter if there is no password at all.<br>
<div class="prot">
int ssh_userauth_none(SSH_SESSION *session, char *username);
</div>
if the account has no password (and the server is configured to let you
pass), the function might answer SSH_AUTH_SUCCESS. That's why
ssh_auth_autopubkey already calls it for you.
<br><br>
<div class="prot">
char *ssh_get_issue_banner(SSH_SESSION *session);
</div>
if during authentication, the server has given a banner, you can get it
this way. the function returns NULL if no banner exists, and you have to
free the returned pointer.<br><br>
</div>
<h2>4- Opening a channel</h2>
<div class="tout">
Maybe you want to use the sftp subsystem : all this is done for you, you
better read at the end of the paper how to use the sftp functions.<br>
You probably want to open one or more shells, or call one or more programs.<br>
So you need a channel.<br>
<div class="prot">
CHANNEL *channel;
</div>
This is an handler to a channel object. it describes your channel.
<br>
<div class="prot">
CHANNEL *channel_open_session(SSH_SESSION *session);
</div>
This will open a channel for use into a session (which can be used for executing
a command or a shell. Not for tcp forwarding).<br>
The function returns NULL if for a reason or another the channel can't be
opened.<br>
<i>
CHANNEL *open_session_channel(...)</i> is deprecated and should not be used in future
applications.<br><br>
<div class="prot">
CHANNEL *channel_open_forward(SSH_SESSION *session, char *remotehost,
int remoteport, char *sourcehost, int localport);
</div>
Ask the server to tunnel a TCP connection. The server will connect to
remotehost:remoteport and libssh will return an handle to the channel if it is allowed.<br>
Otherwise, NULL will be returned. sourcehost and localport are generaly
used in message debugging purpose and have no effect on the result.<br>
<br>
When you've finished with your channel, you may send an EOF message and
then close it :<br>
<div class="prot">
void channel_send_eof(CHANNEL *channel);
</div>
sends an end of file into channel. It doesn't close the channel and you can still read it.<br><br>
<div class="prot">
void channel_free(CHANNEL *channel);
</div>
closes and destroy the channel.
<br>
<div class="prot">
void channel_close(CHANNEL *channel);
</div>
sends an EOF and close the channel. (if you don't know what to do, use channel_free). It doesn't free the channel.
</div>
<h2>5- The shell</h2>
<div class="tout">
<div class="prot">
int channel_request_env(CHANNEL *channel, char *name, char *value);
</div>
Ask the server to set the "name" environment variable to "value". For security
reasons, some variables won't be accepted by the server. It returns 0 otherwise.<br><br>
<div class="prot">
int channel_request_pty(CHANNEL *channel);
</div>
ask the server to allocate a pseudo terminal for the current channel.<br>
the function returns 0 on success.<br><br>
<div class="prot">
int channel_request_pty_size(CHANNEL *channel, char *terminal, int cols, int rows);
</div>
ask the server to allocate a pty. The terminal parameter is the type of pty
(vt100,xterm,...), cols and rows are the size of the new terminal (80x24 by example).<br><br>
<div class="prot">
int channel_change_pty_size(CHANNEL *channel, int cols,int rows);
</div>
changes the window size (terminal) of the current session;<br><br>
<div class="prot">
int channel_request_shell(CHANNEL *channel);
</div>
This function requests a shell. After its success, a shell is running at the other side of the channel.<br><br>
<div class="prot">
int channel_request_exec(CHANNEL *channel, char *cmd);
</div>
run a shell command without an interactive shell, ie $SHELL -c "command".<br>
returns 0 on success.<br><br>
You might ask the server to open a subsystem for you. this is done this way :
<div class="prot">
int channel_request_subsystem(CHANNEL *channel, char *subsystem);
</div>
There are some functions used to manipulate the channels :
<br><br>
<div class="prot">
int channel_write(CHANNEL *channel,void *data,int len);
</div>
writes len bytes of data into the channel. It returns the number of bytes written. The current implementation is a blocking write
of the complete data buffer, but it may vary.<br><br>
<div class="prot">
int channel_read(CHANNEL *channel, BUFFER *buffer,int bytes,int is_stderr);
</div>
It makes a blocking read on the channel, of "bytes" bytes and returns the
result into an allocated buffer you passed in. (with <i>buffer_new()</i>).<br>
it will read on stderr, if is_stderr is set.<br>
The function might read less bytes than "bytes" variable if an End of File
happened. Otherwise, the function will always block reading until "bytes"
bytes are read.<br>
with "bytes"=0, <i>channel_read()</i> will read the current state of the read buffer, but will read at least one byte (and block if nothing is available, except EOF case).<br>
You don't need to free and allocate a new buffer each time you call this function, just pass the same object each time.<br>
look at the <i>buffer_</i> functions further for the correct way of retrieving the data.<br><br>
<div class="prot">
int channel_read_nonblocking (CHANNEL *channel, char *dest, int len, int is_stderr);
</div>
Non-blocking read on channel, at most len bytes of data are read. Returns 0 if EOF or if no data available.
<br><br>
<div class="prot">
int channel_is_open(CHANNEL *channel);
</div>
returns 0 if the channel has been closed by remote host, something else otherwise.<br><br>
<div class="prot">
int channel_poll(CHANNEL *channel, int is_stderr);
</div>
This nonblocking function returns the number of bytes immediatly available for
reading on the channel and stdin/stderr.<br><br>
More interesting, if you are going to do channel multiplexing, this function
is for you :<br><br>
<div class="prot">
int ssh_select(CHANNEL **channels,CHANNEL **outchannels, int maxfd,
fd_set *readfds, struct timeval *timeout);
</div>
channels is an array of channel pointers, finished by a NULL pointer.<br>
It can be used ever and ever, as it is never written.<br>
outchannels is an array of size at least greater or equal to "channels".<br>
It hasn't to be initialized.<br>
maxfd is the maximum file descriptor from your own filedescriptors.<br>
readfds is a pointer to a fd_set structure, like in the original
select implementation (man select).<br>
the struct timeval *timeout has the same meaning than in
select(2) (man select).<br>
There is no support for writing or special events as in <i>select(2)</i> yet.<br>
The function returns -1 if an error occured, or SSH_EINTR if select was interrupted by a syscall. This is not an error, you may restart the function.<br>
<b>note about signals:</b> libssh is not threadsafe, and most functions are not
reetrant when using the same data structures : it means you *cannot* do anything
with a channel from a ssh session passed to <i>ssh_select</i> during a signal.
<br>take a look at sample.c on how to bypass that limitation.<br>
the function works this way : it returns in the readfds the filedescriptors which have data ready for reading (the given filedescriptors have a greatest priority).<br>
Then, if no file descriptor can be read, the function looks for every
channel from the array to get a channel with data bufferized. If nothing is
available, it waits for activity on any channel/file descriptor and returns
immediatly, or waits until timeout.<br>
You will find the channels that can be read in the outchannels array (finished by NULL) and the filedescriptors in your fd_set (man FD_ISSET).<br>
this is the "heart" of your main loop.<br>
<br>
<h3>The BUFFER object.</h3>
Reading is done through the BUFFER object. here is the public interface :
<br>
<div class="prot">
BUFFER *buffer_new();
</div>
creates a buffer object.
<br><br>
<div class="prot">
void *buffer_get(BUFFER *buffer);
</div>
returns a pointer to the begining of buffer.
<br><br>
<div class="prot">
int buffer_get_len(BUFFER *buffer);
</div>
returns buffer's data size.
<br><br>
<div class="prot">
void buffer_free(BUFFER *buffer);
</div>
destoys the buffer.
<br>
<br>
How to use the buffer system when you've read something:<br>
I've seen people doing such code:<br>
<div class="prot">
char buffer[256];<br>
channel_read(channel,buf,1234,0);<br>
strcpy(buffer,buf.data);<br>
</div>
The correct way of doing this:
<div class="prot">
char buffer[256];<br>
int i;<br>
i=channel_read(channel,buf,1234,0);<br>
if(i<=0)<br>
&nbsp;&nbsp;&nbsp;&nbsp;go_out()...<br>
if(i>=256)<br>
&nbsp;&nbsp;&nbsp;&nbsp;i=255;<br>
memcpy(buffer,buffer_get(buf),i);<br>
buffer[i]=0;
</div>
Do not expect the buffer to be null-terminated. Don't access the internal structure of buffer. Check the sizes before copying.<br>
</div>
<h2>6- The SFTP subsystem</h2>
<div class="tout">
SFTP is a secure implementation of a file transfer protocol. The current
implemented version is 3. All functions aren't implemented yet but the most
important are.<br>
<br>
<h3>A) Opening the session</h3>
<div class="prot">
SFTP_SESSION *sftp_new(SSH_SESSION *session);
int sftp_init(SFTP_SESSION *sftp);
</div>
The former returns a SFTP_SESSION handle. It returns NULL if things didn't
work as expected.<br>
sftp_init makes some initialisation work. It returns 0 if things went right.
Both of them must be called.<br>
<h3>B) Opening and reading a directory</h3>
<div class="prot">
SFTP_DIR *sftp_opendir(SFTP_SESSION *session, char *path);
</div>
opens a directory for file listing. Returns NULL in error case.
<br><br>
<div class="prot">
SFTP_ATTRIBUTES *sftp_readdir(SFTP_SESSION *session, SFTP_DIR *dir);
</div>
This function reads one file attribute from an opened directory. It
returns NULL if the directory is EOF, or if something wrong happened.
<br><br>
<div class="prot">
int sftp_dir_eof(SFTP_DIR *dir);
</div>
When a <i>sftp_readdir()</i> returned NULL, you can use this function to
tell if an EOF occured. the function returns 0 if no EOF occured.
<br><br>
<div class="prot">
void sftp_attributes_free(SFTP_ATTRIBUTES *file);
</div>
You have to free any SFTP_ATTRIBUTE structure given by an other function
with it.<br><br>
<div class="prot">
int sftp_dir_close(SFTP_DIR *dir);
</div>
closes an opened directory. returns 0 when no error occured.
<br><br>
<h3>C) Opening, reading, writing files</h3>
<div class="prot">
SFTP_FILE *sftp_open(SFTP_SESSION *session, char *file, int access,
SFTP_ATTRIBUTES *attr);
</div>
Opens a file. The access flags are the same than the stdio flags.<br>
see open(2) for more details.<br>
attr are the wanted attributes for the new file. If you supply NULL,
default values will be used.<br>
rem: more work is going on parsing/making the attributes structure
<br><br>
<div class="prot">
int sftp_read(SFTP_FILE *file, void *dest, int len);
</div>
read on a file. Works as the fread() function. It is blocking by default but you can change the default behaviour with <i>sftp_file_set_nonblocking()</i>.
<br><br>
<div class="prot">
void sftp_file_set_nonblocking(SFTP_FILE *file);
</div>
sets the file non blocking. reads on this file won't ever block. You can't detect end of files this way.<br>
*** TODO more work going there for EOF ****
<br><br>
<div class="prot">
void sftp_file_set_blocking(SFTP_FILE *file);
</div>
restore the default setting of sftp_read.
<br><br>
<div class="prot">
int sftp_write(SFTP_FILE *file, void *source, int len);
</div>
works as fwrite() function. It is a blocking write.<br>
<br>
<div class="prot">
void sftp_seek(SFTP_FILE *file, int new_offset);
</div>
seek into the file for reading/writing at an other place.
<br><br>
<div class="prot">
unsigned long sftp_tell(SFTP_FILE *file);
</div>
returns the current offset (both writing and reading) into the opened file.
<br><br>
<div class="prot">
void sftp_rewind(SFTP_FILE *file);
</div>
same as sftp_seek(file,0);
<br><br>
<div class="prot">
int sftp_file_close(SFTP_FILE *file);
</div>
closes a file handle. returns 0 in no error case.
<br><br>
<div class="prot">
int sftp_rm(SFTP_SESSION *sftp, char *file);
</div>
deletes a file.
<br><br>
<div class="prot">
int sftp_rmdir(SFTP_SESSION *sftp, char *directory);
</div>
<br>
deletes a directory.
<br><br>
<div class="prot">
int sftp_mkdir(SFTP_SESSION *sftp, char *directory, SFTP_ATTRIBUTES *attr);
</div>
makes a directory, with the given attributes. You can't pass NULL for attr and hope it works.
<br><br>
<div class="prot">
int sftp_rename(SFTP_SESSION *sftp, char *original, char *newname);
</div>
changes the name of a file or directory.
<br><br>
<div class="prot">
int sftp_setstat(SFTP_SESSION *sftp, char *file, SFTP_ATTRIBUTES *attr);
</div>
changes the attributes of a file or directory.
<br><br>
<div class="prot">
char *sftp_canonicalize_path(SFTP_SESSION *sftp, char *path);
</div>
gives the canonicalized form of some path. You have to
free the pointer given in return.<br>
(returns NULL if error).
<br><br>
(a function to make proper SFTP_ATTRIBUTES structures is on the way )
<h3>D) Closing the session</h3>
<div class="prot">
void sftp_free(SFTP_SESSION *sftp);
</div>
it closes the sftp channel and subsystem.
</div>
<h2>7- Handling the errors</h2>
<div class="tout">
When some function returns an error code, it's allways possible to get an
english message describing the problem. the function ssh_get_error()
returns a pointer to the static error buffer.<br>
ssh_error_code() returns the error code number. it's declared as an enum:<br>
SSH_NO_ERROR, SSH_REQUEST_DENIED, SSH_INVALID_REQUEST, SSH_CONNECTION_LOST,
SSH_FATAL, SSH_INVALID_DATA.<br><br>
SSH_REQUEST_DENIED means the ssh server refused your request but the situation is
recoverable. the others mean something happened to the connection (some
encryption problems, server problems, library bug, ...).<br>
SSH_INVALID_REQUEST means the library got some garbage from server. (But might be
recoverable).<br>
SSH_FATAL means the connection has an important problem and isn't probably
recoverable.<br>
<br>
Most of time, the error returned are SSH_FATAL, but some functions (generaly the
<i>ssh_request_*</i> ones) may fail because of server denying request. In these cases, SSH_REQUEST_DENIED is returned.<br><br>
You'll see in the prototype SSH_SESSION *session. That's because for thread
safety, error messages that can be attached to a session aren't static
anymore. So, any error that could happen during ssh_getopt(), options_* or
ssh_connect() will be retreavable giving NULL as argument.<br>
<br>
<div class="prot">
char *ssh_get_error(SSH_SESSION *session);
</div>
returns a pointer to a static message error from the given session. No
message freeing is needed.<br><br>
<div class="prot">
enum ssh_error ssh_get_error_code(SSH_SESSION *session);
</div>
returns the error code that last happened along with the message.
<br><br>
</div>
<h2>8- Final word</h2>
<div class="tout">
I made this library because nothing in the Open source or free software community was existing yet. This project is a very personnal one as it's the first "useful" thing I ever wrote.
I hope it fits your needs, but remember the experimental state of libssh : if
something doesn't work, please mail me. If something lacks, please ask for it.
If something stinks, please write a patch and send it !
</div>
</body>
</html>

5
doc/CMakeLists.txt Normal file
View File

@@ -0,0 +1,5 @@
#
# Build the documentation
#
include(UseDoxygen OPTIONAL)

1
doc/TracFooter.html Normal file
View File

@@ -0,0 +1 @@
<!-- Doxygen TracFooter -->

4
doc/TracHeader.html Normal file
View File

@@ -0,0 +1,4 @@
<!-- Doxygen TracHeader -->
<style>@import url(/chrome/site/doxygen.css);</style>
<style>@import url(/chrome/site/tabs.css);</style>
<!-- /Doxygen TracHeader -->

373
doc/authentication.dox Normal file
View File

@@ -0,0 +1,373 @@
/**
@page libssh_tutor_authentication Chapter 2: A deeper insight on authentication
@section authentication_details A deeper insight on authentication
In our guided tour, we merely mentioned that the user needed to authenticate.
We didn't explain much in detail how that was supposed to happen.
This chapter explains better the four authentication methods: with public keys,
with a password, with challenges and responses (keyboard-interactive), and with
no authentication at all.
If your software is supposed to connect to an arbitrary server, then you
might need to support all authentication methods. If your software will
connect only to a given server, then it might be enough for your software
to support only the authentication methods used by that server. If you are
the administrator of the server, it might be your call to choose those
authentication methods.
It is not the purpose of this document to review in detail the advantages
and drawbacks of each authentication method. You are therefore invited
to read the abundant documentation on this topic to fully understand the
advantages and security risks linked to each method.
@subsection pubkeys Authenticating with public keys
libssh is fully compatible with the openssh public and private keys. You
can either use the automatic public key authentication method provided by
libssh, or roll your own using the public key functions.
The process of authenticating by public key to a server is the following:
- you scan a list of files that contain public keys. each key is sent to
the SSH server, until the server acknowledges a key (a key it knows can be
used to authenticate the user).
- then, you retrieve the private key for this key and send a message
proving that you know that private key.
The function ssh_userauth_autopubkey() does this using the available keys in
"~/.ssh/". The return values are the following:
- SSH_AUTH_ERROR: some serious error happened during authentication
- SSH_AUTH_DENIED: no key matched
- SSH_AUTH_SUCCESS: you are now authenticated
- SSH_AUTH_PARTIAL: some key matched but you still have to provide an other
mean of authentication (like a password).
The ssh_userauth_autopubkey() function also tries to authenticate using the
SSH agent, if you have one running, or the "none" method otherwise.
If you wish to authenticate with public key by your own, follow these steps:
- Retrieve the public key in a ssh_string using publickey_from_file().
- Offer the public key to the SSH server using ssh_userauth_offer_pubkey().
If the return value is SSH_AUTH_SUCCESS, the SSH server accepts to
authenticate using the public key and you can go to the next step.
- Retrieve the private key, using the privatekey_from_file() function. If
a passphrase is needed, either the passphrase specified as argument or
a callback (see callbacks section) will be used.
- Authenticate using ssh_userauth_pubkey() with your public key string
and private key.
- Do not forget cleaning up memory using string_free() and privatekey_free().
Here is a minimalistic example of public key authentication:
@code
int authenticate_pubkey(ssh_session session)
{
int rc;
rc = ssh_userauth_autopubkey(session, NULL);
if (rc == SSH_AUTH_ERROR)
{
fprintf(stderr, "Authentication failed: %s\n",
ssh_get_error(session));
return SSH_AUTH_ERROR;
}
return rc;
}
@endcode
@see ssh_userauth_autopubkey
@see ssh_userauth_offer_pubkey
@see ssh_userauth_pubkey
@see publickey_from_file
@see publickey_from_privatekey
@see string_free
@see privatekey_from_file
@see privatekey_free
@subsection password Authenticating with a password
The function ssh_userauth_password() serves the purpose of authenticating
using a password. It will return SSH_AUTH_SUCCESS if the password worked,
or one of other constants otherwise. It's your work to ask the password
and to deallocate it in a secure manner.
If your server complains that the password is wrong, but you can still
authenticate using openssh's client (issuing password), it's probably
because openssh only accept keyboard-interactive. Switch to
keyboard-interactive authentication, or try to configure plain text passwords
on the SSH server.
Here is a small example of password authentication:
@code
int authenticate_password(ssh_session session)
{
char *password;
int rc;
password = getpass("Enter your password: ");
rc = ssh_userauth_password(session, NULL, password);
if (rc == SSH_AUTH_ERROR)
{
fprintf(stderr, "Authentication failed: %s\n",
ssh_get_error(session));
return SSH_AUTH_ERROR;
}
return rc;
}
@endcode
@see ssh_userauth_password
@subsection keyb_int The keyboard-interactive authentication method
The keyboard-interactive method is, as its name tells, interactive. The
server will issue one or more challenges that the user has to answer,
until the server takes an authentication decision.
ssh_userauth_kbdint() is the the main keyboard-interactive function.
It will return SSH_AUTH_SUCCESS,SSH_AUTH_DENIED, SSH_AUTH_PARTIAL,
SSH_AUTH_ERROR, or SSH_AUTH_INFO, depending on the result of the request.
The keyboard-interactive authentication method of SSH2 is a feature that
permits the server to ask a certain number of questions in an interactive
manner to the client, until it decides to accept or deny the login.
To begin, you call ssh_userauth_kbdint() (just set user and submethods to
NULL) and store the answer.
If the answer is SSH_AUTH_INFO, it means that the server has sent a few
questions that you should ask the user. You can retrieve these questions
with the following functions: ssh_userauth_kbdint_getnprompts(),
ssh_userauth_kbdint_getname(), ssh_userauth_kbdint_getinstruction(), and
ssh_userauth_kbdint_getprompt().
Set the answer for each question in the challenge using
ssh_userauth_kbdint_setanswer().
Then, call again ssh_userauth_kbdint() and start the process again until
these functions returns something else than SSH_AUTH_INFO.
Here are a few remarks:
- Even the first call can return SSH_AUTH_DENIED or SSH_AUTH_SUCCESS.
- The server can send an empty question set (this is the default behavior
on my system) after you have sent the answers to the first questions.
You must still parse the answer, it might contain some
message from the server saying hello or such things. Just call
ssh_userauth_kbdint() until needed.
- The meaning of "name", "prompt", "instruction" may be a little
confusing. An explanation is given in the RFC section that follows.
Here is a little note about how to use the information from
keyboard-interactive authentication, coming from the RFC itself (rfc4256):
@verbatim
3.3 User Interface Upon receiving a request message, the client SHOULD
prompt the user as follows: A command line interface (CLI) client SHOULD
print the name and instruction (if non-empty), adding newlines. Then for
each prompt in turn, the client SHOULD display the prompt and read the
user input.
A graphical user interface (GUI) client has many choices on how to prompt
the user. One possibility is to use the name field (possibly prefixed
with the application's name) as the title of a dialog window in which
the prompt(s) are presented. In that dialog window, the instruction field
would be a text message, and the prompts would be labels for text entry
fields. All fields SHOULD be presented to the user, for example an
implementation SHOULD NOT discard the name field because its windows lack
titles; it SHOULD instead find another way to display this information. If
prompts are presented in a dialog window, then the client SHOULD NOT
present each prompt in a separate window.
All clients MUST properly handle an instruction field with embedded
newlines. They SHOULD also be able to display at least 30 characters for
the name and prompts. If the server presents names or prompts longer than 30
characters, the client MAY truncate these fields to the length it can
display. If the client does truncate any fields, there MUST be an obvious
indication that such truncation has occured.
The instruction field SHOULD NOT be truncated. Clients SHOULD use control
character filtering as discussed in [SSH-ARCH] to avoid attacks by
including terminal control characters in the fields to be displayed.
For each prompt, the corresponding echo field indicates whether or not
the user input should be echoed as characters are typed. Clients SHOULD
correctly echo/mask user input for each prompt independently of other
prompts in the request message. If a client does not honor the echo field
for whatever reason, then the client MUST err on the side of
masking input. A GUI client might like to have a checkbox toggling
echo/mask. Clients SHOULD NOT add any additional characters to the prompt
such as ": " (colon-space); the server is responsible for supplying all
text to be displayed to the user. Clients MUST also accept empty responses
from the user and pass them on as empty strings.
@endverbatim
The following example shows how to perform keyboard-interactive authentication:
@code
int authenticate_kbdint(ssh_session session)
{
int rc;
rc = ssh_userauth_kbdint(session, NULL, NULL);
while (rc == SSH_AUTH_INFO)
{
const char *name, *instruction;
int nprompts, iprompt;
name = ssh_userauth_kbdint_getname(session);
instruction = ssh_userauth_kbdint_getinstruction(session);
nprompts = ssh_userauth_kbdint_getnprompts(session);
if (strlen(name) > 0)
printf("%s\n", name);
if (strlen(instruction) > 0)
printf("%s\n", instruction);
for (iprompt = 0; iprompt < nprompts; iprompt++)
{
const char *prompt;
char echo;
prompt = ssh_userauth_kbdint_getprompt(session, iprompt, &echo);
if (echo)
{
char buffer[128], *ptr;
printf("%s", prompt);
if (fgets(buffer, sizeof(buffer), stdin) == NULL)
return SSH_AUTH_ERROR;
buffer[sizeof(buffer) - 1] = '\0';
if ((ptr = strchr(buffer, '\n')) != NULL)
*ptr = '\0';
if (ssh_userauth_kbdint_setanswer(session, iprompt, buffer) < 0)
return SSH_AUTH_ERROR;
memset(buffer, 0, strlen(buffer));
}
else
{
char *ptr;
ptr = getpass(prompt);
if (ssh_userauth_kbdint_setanswer(session, iprompt, ptr) < 0)
return SSH_AUTH_ERROR;
}
}
rc = ssh_userauth_kbdint(session, NULL, NULL);
}
return rc;
}
@endcode
@see ssh_userauth_kbdint()
@see ssh_userauth_kbdint_getnprompts
@see ssh_userauth_kbdint_getname
@see ssh_userauth_kbdint_getinstruction
@see ssh_userauth_kbdint_getprompt
@see ssh_userauth_kbdint_setanswer()
@subsection none Authenticating with "none" method
The primary purpose of the "none" method is to get authenticated **without**
any credential. Don't do that, use one of the other authentication methods,
unless you really want to grant anonymous access.
If the account has no password, and if the server is configured to let you
pass, ssh_userauth_none() might answer SSH_AUTH_SUCCESS.
The following example shows how to perform "none" authentication:
@code
int authenticate_kbdint(ssh_session session)
{
int rc;
rc = ssh_userauth_none(session, NULL, NULL);
return rc;
}
@endcode
@subsection auth_list Getting the list of supported authentications
You are not meant to choose a given authentication method, you can
let the server tell you which methods are available. Once you know them,
you try them one after the other.
The following example shows how to get the list of available authentication
methods with ssh_userauth_list() and how to use the result:
@code
int test_several_auth_methods(ssh_session session)
{
int method, rc;
method = ssh_userauth_list(session, NULL);
if (method & SSH_AUTH_METHOD_NONE)
{ // For the source code of function authenticate_none(),
// refer to the corresponding example
rc = authenticate_none(session);
if (rc == SSH_AUTH_SUCCESS) return rc;
}
if (method & SSH_AUTH_METHOD_PUBLICKEY)
{ // For the source code of function authenticate_pubkey(),
// refer to the corresponding example
rc = authenticate_pubkey(session);
if (rc == SSH_AUTH_SUCCESS) return rc;
}
if (method & SSH_AUTH_METHOD_INTERACTIVE)
{ // For the source code of function authenticate_kbdint(),
// refer to the corresponding example
rc = authenticate_kbdint(session);
if (rc == SSH_AUTH_SUCCESS) return rc;
}
if (method & SSH_AUTH_METHOD_PASSWORD)
{ // For the source code of function authenticate_password(),
// refer to the corresponding example
rc = authenticate_password(session);
if (rc == SSH_AUTH_SUCCESS) return rc;
}
return SSH_AUTH_ERROR;
}
@endcode
@subsection banner Getting the banner
The SSH server might send a banner, which you can retrieve with
ssh_get_issue_banner(), then display to the user.
The following example shows how to retrieve and dispose the issue banner:
@code
int display_banner(ssh_session session)
{
int rc;
char *banner;
/*
*** Does not work without calling ssh_userauth_none() first ***
*** That will be fixed ***
*/
rc = ssh_userauth_none(session, NULL);
if (rc == SSH_AUTH_ERROR)
return rc;
banner = ssh_get_issue_banner(session);
if (banner)
{
printf("%s\n", banner);
free(banner);
}
return rc;
}
@endcode
*/

94
doc/command.dox Normal file
View File

@@ -0,0 +1,94 @@
/**
@page libssh_tutor_command Chapter 4: Passing a remote command
@section remote_command Passing a remote command
Previous chapter has shown how to open a full shell session, with an attached
terminal or not. If you only need to execute a command on the remote end,
you don't need all that complexity.
The method described here is suited for executing only one remote command.
If you need to issue several commands in a row, you should consider using
a non-interactive remote shell, as explained in previous chapter.
@see shell
@subsection exec_remote Executing a remote command
The first steps for executing a remote command are identical to those
for opening remote shells. You first need a SSH channel, and then
a SSH session that uses this channel:
@code
int show_remote_files(ssh_session session)
{
ssh_channel channel;
int rc;
channel = ssh_channel_new(session);
if (channel == NULL) return SSH_ERROR;
rc = ssh_channel_open_session(channel);
if (rc != SSH_OK)
{
ssh_channel_free(channel);
return rc;
}
@endcode
Once a session is open, you can start the remote command with
ssh_channel_request_exec():
@code
rc = ssh_channel_request_exec(channel, "ls -l");
if (rc != SSH_OK)
{
ssh_channel_close(channel);
ssh_channel_free(channel);
return rc;
}
@endcode
If the remote command displays data, you get them with ssh_channel_read().
This function returns the number of bytes read. If there is no more
data to read on the channel, this function returns 0, and you can go to next step.
If an error has been encountered, it returns a negative value:
@code
char buffer[256];
unsigned int nbytes;
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
while (nbytes > 0)
{
if (fwrite(buffer, 1, nbytes, stdout) != nbytes)
{
ssh_channel_close(channel);
ssh_channel_free(channel);
return SSH_ERROR;
}
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
}
if (nbytes < 0)
{
ssh_channel_close(channel);
ssh_channel_free(channel);
return SSH_ERROR;
}
@endcode
Once you read the result of the remote command, you send an
end-of-file to the channel, close it, and free the memory
that it used:
@code
ssh_channel_send_eof(channel);
ssh_channel_close(channel);
ssh_channel_free(channel);
return SSH_OK;
}
@endcode
*/

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

221
doc/forwarding.dox Normal file
View File

@@ -0,0 +1,221 @@
/**
@page libssh_tutor_forwarding Chapter 7: Forwarding connections (tunnel)
@section forwarding_connections Forwarding connections
Port forwarding comes in SSH protocol in two different flavours:
direct or reverse port forwarding. Direct port forwarding is also
named local port forwardind, and reverse port forwarding is also called
remote port forwarding. SSH also allows X11 tunnels.
@subsection forwarding_direct Direct port forwarding
Direct port forwarding is from client to server. The client opens a tunnel,
and forwards whatever data to the server. Then, the server connects to an
end point. The end point can reside on another machine or on the SSH
server itself.
Example of use of direct port forwarding:
@verbatim
Mail client application Google Mail
| ^
5555 (arbitrary) |
| 143 (IMAP2)
V |
SSH client =====> SSH server
Legend:
--P-->: port connexion through port P
=====>: SSH tunnel
@endverbatim
A mail client connects to port 5555 of a client. An encrypted tunnel is
established to the server. The server connects to port 143 of Google Mail (the
end point). Now the local mail client can retreive mail.
@subsection forwarding_reverse Reverse port forwarding
The reverse forwarding is slightly different. It goes from server to client,
even though the client has the initiative of establishing the tunnel.
Once the tunnel is established, the server will listen on a port. Whenever
a connection to this port is made, the server forwards the data to the client.
Example of use of reverse port forwarding:
@verbatim
Local mail server Mail client application
^ |
| 5555 (arbitrary)
143 (IMAP2) |
| V
SSH client <===== SSH server
Legend:
--P-->: port connexion through port P
=====>: SSH tunnel
@endverbatim
In this example, the SSH client establishes the tunnel,
but it is used to forward the connections established at
the server to the client.
@subsection forwarding_x11 X11 tunnels
X11 tunnels allow a remote application to display locally.
Example of use of X11 tunnels:
@verbatim
Local display Graphical application
(X11 server) (X11 client)
^ |
| V
SSH client <===== SSH server
Legend:
----->: X11 connection through X11 display number
=====>: SSH tunnel
@endverbatim
The SSH tunnel is established by the client.
How to establish X11 tunnels with libssh has already been described in
this tutorial.
@see x11
@subsection libssh_direct Doing direct port forwarding with libssh
To do direct port forwarding, call function channel_open_forward():
- you need a separate channel for the tunnel as first parameter;
- second and third parameters are the remote endpoint;
- fourth and fifth parameters are sent to the remote server
so that they can be logged on that server.
If you don't plan to forward the data you will receive to any local port,
just put fake values like "localhost" and 5555 as your local host and port.
The example below shows how to open a direct channel that would be
used to retrieve google's home page from the remote SSH server.
@code
int direct_forwarding(ssh_session session)
{
ssh_channel forwarding_channel;
int rc;
char *http_get = "GET / HTTP/1.1\nHost: www.google.com\n\n";
int nbytes, nwritten;
forwarding_channel = ssh_channel_new(session);
if (rc != SSH_OK) return rc;
rc = channel_open_forward(forwarding_channel,
"www.google.com", 80,
"localhost", 5555);
if (rc != SSH_OK)
{
ssh_channel_free(forwarding_channel);
return rc;
}
nbytes = strlen(http_get);
nwritten = channel_write(forwarding_channel, http_get, nbytes);
if (nbytes != nwritten)
{
ssh_channel_free(forwarding_channel);
return SSH_ERROR;
}
...
ssh_channel_free(forwarding_channel);
return SSH_OK;
}
@endcode
The data sent by Google can be retrieved for example with ssh_select()
and ssh_channel_read(). Goggle's home page can then be displayed on the
local SSH client, saved into a local file, made available on a local port,
or whatever use you have for it.
@subsection libssh_reverse Doing reverse port forwarding with libssh
To do reverse port forwarding, call ssh_channel_forward_listen(),
then ssh_channel_forward_accept().
When you call ssh_channel_forward_listen(), you can let the remote server
chose the non-priviledged port it should listen to. Otherwise, you can chose
your own priviledged or non-priviledged port. Beware that you should have
administrative priviledges on the remote server to open a priviledged port
(port number < 1024).
Below is an example of a very rough web server waiting for connections on port
8080 of remote SSH server. The incoming connections are passed to the
local libssh application, which handles them:
@code
int web_server(ssh_session session)
{
int rc;
ssh_channel channel;
char buffer[256];
int nbytes, nwritten;
char *helloworld = ""
"HTTP/1.1 200 OK\n"
"Content-Type: text/html\n"
"Content-Length: 113\n"
"\n"
"<html>\n"
" <head>\n"
" <title>Hello, World!</title>\n"
" </head>\n"
" <body>\n"
" <h1>Hello, World!</h1>\n"
" </body>\n"
"</html>\n";
rc = ssh_channel_forward_listen(session, NULL, 8080, NULL);
if (rc != SSH_OK)
{
fprintf(stderr, "Error opening remote port: %s\n", ssh_get_error(session));
return rc;
}
channel = ssh_channel_forward_accept(session, 60000);
if (channel == NULL)
{
fprintf(stderr, "Error waiting for incoming connection: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
while (1)
{
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
if (nbytes < 0)
{
fprintf(stderr, "Error reading incoming data: %s\n", ssh_get_error(session));
ssh_channel_send_eof(channel);
ssh_channel_free(channel);
return SSH_ERROR;
}
if (strncmp(buffer, "GET /", 5)) continue;
nbytes = strlen(helloworld);
nwritten = ssh_channel_write(channel, helloworld, nbytes);
if (nwritten != nbytes)
{
fprintf(stderr, "Error sending answer: %s\n", ssh_get_error(session));
ssh_channel_send_eof(channel);
ssh_channel_free(channel);
return SSH_ERROR;
}
printf("Sent answer\n");
}
ssh_channel_send_eof(channel);
ssh_channel_free(channel);
return SSH_OK;
}
@endcode
*/

455
doc/guided_tour.dox Normal file
View File

@@ -0,0 +1,455 @@
/**
@page libssh_tutor_guided_tour Chapter 1: A typical SSH session
@section ssh_session A typical SSH session
A SSH session goes through the following steps:
- Before connecting to the server, you can set up if you wish one or other
server public key authentication, i.e. DSA or RSA. You can choose
cryptographic algorithms you trust and compression algorithms if any. You
must of course set up the hostname.
- The connection is established. A secure handshake is made, and resulting from
it, a public key from the server is gained. You MUST verify that the public
key is legitimate, using for instance the MD5 fingerprint or the known hosts
file.
- The client must authenticate: the classical ways are password, or
public keys (from dsa and rsa key-pairs generated by openssh).
If a SSH agent is running, it is possible to use it.
- Now that the user has been authenticated, you must open one or several
channels. Channels are different subways for information into a single ssh
connection. Each channel has a standard stream (stdout) and an error stream
(stderr). You can theoretically open an infinity of channels.
- With the channel you opened, you can do several things:
- Execute a single command.
- Open a shell. You may want to request a pseudo-terminal before.
- Invoke the sftp subsystem to transfer files.
- Invoke the scp subsystem to transfer files.
- Invoke your own subsystem. This is outside the scope of this document,
but can be done.
- When everything is finished, just close the channels, and then the connection.
The sftp and scp subsystems use channels, but libssh hides them to
the programmer. If you want to use those subsystems, instead of a channel,
you'll usually open a "sftp session" or a "scp session".
@subsection setup Creating the session and setting options
The most important object in a SSH connection is the SSH session. In order
to allocate a new SSH session, you use ssh_new(). Don't forget to
always verify that the allocation successed.
@code
#include <libssh/libssh.h>
#include <stdlib.h>
int main()
{
ssh_session my_ssh_session = ssh_new();
if (my_ssh_session == NULL)
exit(-1);
...
ssh_free(my_ssh_session);
}
@endcode
libssh follows the allocate-it-deallocate-it pattern. Each object that you allocate
using xxxxx_new() must be deallocated using xxxxx_free(). In this case, ssh_new()
does the allocation and ssh_free() does the contrary.
The ssh_options_set() function sets the options of the session. The most important options are:
- SSH_OPTIONS_HOST: the name of the host you want to connect to
- SSH_OPTIONS_PORT: the used port (default is port 22)
- SSH_OPTIONS_USER: the system user under which you want to connect
- SSH_OPTIONS_LOG_VERBOSITY: the quantity of messages that are printed
The complete list of options can be found in the documentation of ssh_options_set().
The only mandatory option is SSH_OPTIONS_HOST. If you don't use SSH_OPTIONS_USER,
the local username of your account will be used.
Here is a small example of how to use it:
@code
#include <libssh/libssh.h>
#include <stdlib.h>
int main()
{
ssh_session my_ssh_session;
int verbosity = SSH_LOG_PROTOCOL;
int port = 22;
my_ssh_session = ssh_new();
if (my_ssh_session == NULL)
exit(-1);
ssh_options_set(my_ssh_session, SSH_OPTIONS_HOST, "localhost");
ssh_options_set(my_ssh_session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
ssh_options_set(my_ssh_session, SSH_OPTIONS_PORT, &port);
...
ssh_free(my_ssh_session);
}
@endcode
Please notice that all parameters are passed to ssh_options_set() as pointers,
even if you need to set an integer value.
@see ssh_new
@see ssh_free
@see ssh_options_set
@see ssh_options_parse_config
@see ssh_options_copy
@see ssh_options_getopt
@subsection connect Connecting to the server
Once all settings have been made, you can connect using ssh_connect(). That
function will return SSH_OK if the connection worked, SSH_ERROR otherwise.
You can get the English error string with ssh_get_error() in order to show the
user what went wrong. Then, use ssh_disconnect() when you want to stop
the session.
Here's an example:
@code
#include <libssh/libssh.h>
#include <stdlib.h>
#include <stdio.h>
int main()
{
ssh_session my_ssh_session;
int rc;
my_ssh_session = ssh_new();
if (my_ssh_session == NULL)
exit(-1);
ssh_options_set(my_ssh_session, SSH_OPTIONS_HOST, "localhost");
rc = ssh_connect(my_ssh_session);
if (rc != SSH_OK)
{
fprintf(stderr, "Error connecting to localhost: %s\n",
ssh_get_error(my_ssh_session));
exit(-1);
}
...
ssh_disconnect(my_ssh_session);
ssh_free(my_ssh_session);
}
@endcode
@subsection serverauth Authenticating the server
Once you're connected, the following step is mandatory: you must check that the server
you just connected to is known and safe to use (remember, SSH is about security and
authentication).
There are two ways of doing this:
- The first way (recommended) is to use the ssh_is_server_known()
function. This function will look into the known host file
(~/.ssh/known_hosts on UNIX), look for the server hostname's pattern,
and determine whether this host is present or not in the list.
- The second way is to use ssh_get_pubkey_hash() to get a binary version
of the public key hash value. You can then use your own database to check
if this public key is known and secure.
You can also use the ssh_get_pubkey_hash() to show the public key hash
value to the user, in case he knows what the public key hash value is
(some paranoid people write their public key hash values on paper before
going abroad, just in case ...).
If the remote host is being used to for the first time, you can ask the user whether
he/she trusts it. Once he/she concluded that the host is valid and worth being
added in the known hosts file, you use ssh_write_knownhost() to register it in
the known hosts file, or any other way if you use your own database.
The following example is part of the examples suite available in the
examples/ directory:
@code
#include <errno.h>
#include <string.h>
int verify_knownhost(ssh_session session)
{
int state, hlen;
unsigned char *hash = NULL;
char *hexa;
char buf[10];
state = ssh_is_server_known(session);
hlen = ssh_get_pubkey_hash(session, &hash);
if (hlen < 0)
return -1;
switch (state)
{
case SSH_SERVER_KNOWN_OK:
break; /* ok */
case SSH_SERVER_KNOWN_CHANGED:
fprintf(stderr, "Host key for server changed: it is now:\n");
ssh_print_hexa("Public key hash", hash, hlen);
fprintf(stderr, "For security reasons, connection will be stopped\n");
free(hash);
return -1;
case SSH_SERVER_FOUND_OTHER:
fprintf(stderr, "The host key for this server was not found but an other"
"type of key exists.\n");
fprintf(stderr, "An attacker might change the default server key to"
"confuse your client into thinking the key does not exist\n");
free(hash);
return -1;
case SSH_SERVER_FILE_NOT_FOUND:
fprintf(stderr, "Could not find known host file.\n");
fprintf(stderr, "If you accept the host key here, the file will be"
"automatically created.\n");
/* fallback to SSH_SERVER_NOT_KNOWN behavior */
case SSH_SERVER_NOT_KNOWN:
hexa = ssh_get_hexa(hash, hlen);
fprintf(stderr,"The server is unknown. Do you trust the host key?\n");
fprintf(stderr, "Public key hash: %s\n", hexa);
free(hexa);
if (fgets(buf, sizeof(buf), stdin) == NULL)
{
free(hash);
return -1;
}
if (strncasecmp(buf, "yes", 3) != 0)
{
free(hash);
return -1;
}
if (ssh_write_knownhost(session) < 0)
{
fprintf(stderr, "Error %s\n", strerror(errno));
free(hash);
return -1;
}
break;
case SSH_SERVER_ERROR:
fprintf(stderr, "Error %s", ssh_get_error(session));
free(hash);
return -1;
}
free(hash);
return 0;
}
@endcode
@see ssh_connect
@see ssh_disconnect
@see ssh_get_error
@see ssh_get_error_code
@see ssh_get_pubkey_hash
@see ssh_is_server_known
@see ssh_write_knownhost
@subsection auth Authenticating the user
The authentication process is the way a service provider can identify a
user and verify his/her identity. The authorization process is about enabling
the authenticated user the access to ressources. In SSH, the two concepts
are linked. After authentication, the server can grant the user access to
several ressources such as port forwarding, shell, sftp subsystem, and so on.
libssh supports several methods of authentication:
- "none" method. This method allows to get the available authentications
methods. It also gives the server a chance to authenticate the user with
just his/her login. Some very old hardware uses this feature to fallback
the user on a "telnet over SSH" style of login.
- password method. A password is sent to the server, which accepts it or not.
- keyboard-interactive method. The server sends several challenges to the
user, who must answer correctly. This makes possible the authentication
via a codebook for instance ("give code at 23:R on page 3").
- public key method. The host knows the public key of the user, and the
user must prove he knows the associated private key. This can be done
manually, or delegated to the SSH agent as we'll see later.
All these methods can be combined. You can for instance force the user to
authenticate with at least two of the authentication methods. In that case,
one speaks of "Partial authentication". A partial authentication is a
response from authentication functions stating that your credential was
accepted, but yet another one is required to get in.
The example below shows an authentication with password:
@code
#include <libssh/libssh.h>
#include <stdlib.h>
#include <stdio.h>
int main()
{
ssh_session my_ssh_session;
int rc;
char *password;
// Open session and set options
my_ssh_session = ssh_new();
if (my_ssh_session == NULL)
exit(-1);
ssh_options_set(my_ssh_session, SSH_OPTIONS_HOST, "localhost");
// Connect to server
rc = ssh_connect(my_ssh_session);
if (rc != SSH_OK)
{
fprintf(stderr, "Error connecting to localhost: %s\n",
ssh_get_error(my_ssh_session));
ssh_free(my_ssh_session);
exit(-1);
}
// Verify the server's identity
// For the source code of verify_knowhost(), check previous example
if (verify_knownhost(my_ssh_session) < 0)
{
ssh_disconnect(my_ssh_session);
ssh_free(my_ssh_session);
exit(-1);
}
// Authenticate ourselves
password = getpass("Password: ");
rc = ssh_userauth_password(my_ssh_session, NULL, password);
if (rc != SSH_AUTH_SUCCESS)
{
fprintf(stderr, "Error authenticating with password: %s\n",
ssh_get_error(my_ssh_session));
ssh_disconnect(my_ssh_session);
ssh_free(my_ssh_session);
exit(-1);
}
...
ssh_disconnect(my_ssh_session);
ssh_free(my_ssh_session);
}
@endcode
@see @ref authentication_details
@subsection using_ssh Doing something
At this point, the authenticity of both server and client is established.
Time has come to take advantage of the many possibilities offered by the SSH
protocol: execute a remote command, open remote shells, transfer files,
forward ports, etc.
The example below shows how to execute a remote command:
@code
int show_remote_processes(ssh_session session)
{
ssh_channel channel;
int rc;
char buffer[256];
unsigned int nbytes;
channel = ssh_channel_new(session);
if (channel == NULL)
return SSH_ERROR;
rc = ssh_channel_open_session(channel);
if (rc != SSH_OK)
{
ssh_channel_free(channel);
return rc;
}
rc = ssh_channel_request_exec(channel, "ps aux");
if (rc != SSH_OK)
{
ssh_channel_close(channel);
ssh_channel_free(channel);
return rc;
}
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
while (nbytes > 0)
{
if (write(1, buffer, nbytes) != nbytes)
{
ssh_channel_close(channel);
ssh_channel_free(channel);
return SSH_ERROR;
}
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
}
if (nbytes < 0)
{
ssh_channel_close(channel);
ssh_channel_free(channel);
return SSH_ERROR;
}
ssh_channel_send_eof(channel);
ssh_channel_close(channel);
ssh_channel_free(channel);
return SSH_OK;
}
@endcode
@see @ref opening_shell
@see @ref remote_command
@see @ref sftp_subsystem
@see @ref scp_subsystem
@subsection errors Handling the errors
All the libssh functions which return an error value also set an English error message
describing the problem.
Error values are typically SSH_ERROR for integer values, or NULL for pointers.
The function ssh_get_error() returns a pointer to the static error message.
ssh_error_code() returns the error code number : SSH_NO_ERROR,
SSH_REQUEST_DENIED, SSH_INVALID_REQUEST, SSH_CONNECTION_LOST, SSH_FATAL,
or SSH_INVALID_DATA. SSH_REQUEST_DENIED means the ssh server refused your
request, but the situation is recoverable. The others mean something happened
to the connection (some encryption problems, server problems, ...).
SSH_INVALID_REQUEST means the library got some garbage from server, but
might be recoverable. SSH_FATAL means the connection has an important
problem and isn't probably recoverable.
Most of time, the error returned are SSH_FATAL, but some functions
(generaly the ssh_request_xxx ones) may fail because of server denying request.
In these cases, SSH_REQUEST_DENIED is returned.
ssh_get_error() and ssh_get_error_code() take a ssh_session as a parameter.
That's for thread safety, error messages that can be attached to a session
aren't static anymore. Any error that happens during ssh_options_xxx()
or ssh_connect() (i.e., outside of any session) can be retrieved by
giving NULL as argument.
The SFTP subsystem has its own error codes, in addition to libssh ones.
*/

50
doc/introduction.dox Normal file
View File

@@ -0,0 +1,50 @@
/**
@page libssh_tutorial The Tutorial
@section introduction Introduction
libssh is a C library that enables you to write a program that uses the
SSH protocol. With it, you can remotely execute programs, transfer
files, or use a secure and transparent tunnel for your remote programs.
The SSH protocol is encrypted, ensures data integrity, and provides strong
means of authenticating both the server of the client. The library hides
a lot of technical details from the SSH protocol, but this does not
mean that you should not try to know about and understand these details.
libssh is a Free Software / Open Source project. The libssh library
is distributed under LGPL license. The libssh project has nothing to do with
"libssh2", which is a completly different and independant project.
libssh can run on top of either libgcrypt (http://directory.fsf.org/project/libgcrypt/)
or libcrypto (http://www.openssl.org/docs/crypto/crypto.html), two general-purpose
cryptographic libraries.
This tutorial concentrates for its main part on the "client" side of libssh.
To learn how to accept incoming SSH connexions (how to write a SSH server),
you'll have to jump to the end of this document.
This tutorial describes libssh version 0.5.0. This version is a little different
from the 0.4.X series. However, the examples should work with
little changes on versions like 0.4.2 and later.
Table of contents:
@subpage libssh_tutor_guided_tour
@subpage libssh_tutor_authentication
@subpage libssh_tutor_shell
@subpage libssh_tutor_command
@subpage libssh_tutor_sftp
@subpage libssh_tutor_scp
@subpage libssh_tutor_forwarding
@subpage libssh_tutor_threads
@subpage libssh_tutor_todo
*/

View File

@@ -1,385 +0,0 @@
The new libssh 0.2 API
----------------------
Version 1
A. Introduction
---------------
With the time from the first release of libssh, I have received lots of
comments about the current API. Myself, I found it quite limiting when doing
my first libssh-server drafts. Thus, I am moving to a stronger API.
This API must still be simple. I am not introducing complex changes. An API
well designed must hide the implementation details. Implementation can change
easily within bugfixes - but API cannot change each release.
To the people already using libssh 0.11 : sorry. Once I have the complete API
redesigned, I will write a migration paper. It won't be too hard normally.
Here are the things that were lacking in the previous API and *must* change:
* A non-blocking mode connection type
* Functions to relegate File descriptor listening to Calling functions and to
the programmer. (I'll explain later).
* Along with that, good buffering system (well, it's not an API but).
* Leave the "functions returns a pointer when it works and NULL when it does
not work". It gives serious problems to implement bindings (A C++
constructor should not fail and should not depend on a network thing
* Make the Session structure an abstract structure that can work with both
client and *servers*. That mean we should have a Server object which listen
to clients on a bound port, does the different handshakes and return a
session.
Since C is not per se an Object language, I won't use inheritance between
objects.
* This same server thing must provide the reverse capabilities than the
client. That is, accept the handshake, in a nonblocking way. Accept channel
requests, or send them to the controller program.
* Support for program forking : Imagine you have a Ssh server object. You
accept a connection and receive a session, then you receive a channel. You
may want to keep the good old days fork() tricks. Libssh will give a way to
destroy handlers from sessions which belong to an other process without
disturbing the session.
* So often I received the comment back saying that it was not clear why a
session or a channel was terminated. This is over.
* And of course I received lot of mails about the fact I'm doing namespace
polution. this will be resolved this time.
So, please read this draft not as a formal documentation but like a roadmap of
things that each kind of object must do.
B. Description of objects and functions
Initialization and finalization
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Initialization is for now called automatically, so you don't have to take care
of that.
As for finalization, we need to finalize the underlying cryptographic library
(either OpenSSL or libgcrypt). Be sure that you call ssh_finalize when this
library won't be used anymore, even by other libraries (i.e. if you use libssh
and another library that uses OpenSSL, call ssh_finalize when any function of
both these libraries won't be called).
If you trust your operating system to clean up the mess after a process
terminates, you can skip this call.
Options structure
~~~~~~~~~~~~~~~~~
struct ssh_options *ssh_options_new()
ssh_options_getopt(options, *argc, argv)
ssh_options_copy(options)
char ** ssh_options_get_supported_algos(options,type)
returns a list of the algos supported by libssh, type being one of
SSH_HOSTKEYS, SSH_KEX, SSH_CRYPT, SSH_MAC, SSH_COMP, SSH_LANG
ssh_options_set_wanted_algos(options,type, char *list)
list being comma-separated list of algos, and type being the upper constants
but with _C_S or _S_V added to them.
ssh_options_set_port(options, port)
ssh_options_set_host(options, host)
ssh_options_set_fd(options, fd)
ssh_options_set_bind(options, bindaddr, port)
this options sets the address to bind for a client *or* a server. a port of
zero means whatever port is free (what most clients want).
ssh_options_set_username(options, username)
ssh_options_set_connect_timeout(options, seconds, usec)
ssh_options_set_ssh_dir(options, dir)
ssh_options_set_known_hosts_file(options, file)
ssh_options_set_identity(options, file)
ssh_options_set_banner(options, banner)
ssh_options_allow_ssh1(options, bool allow)
ssh_options_allow_ssh2(options, bool allow)
options_set_status_callback has moved into ssh_* functions.
ssh_session Structure
~~~~~~~~~~~~~~~~~~~~~
This session structure represents a ssh socket to a server *or* a client.
ssh_session *ssh_new()
ssh_set_options(ssh_session,ssh_options)
ssh_connect(session);
it will return some status describing at which point of the connection it is,
or an error code. If the connection method is non-blocking, the function
will be called more than once, though the return value SSH_AGAIN.
ssh_set_blocking(session, bool blocking)
set blocking mode or non blocking mode.
ssh_get_fd(session)
get the currently used connection file descriptor or equivalent (windows)
ssh_set_fd_toread(session)
ssh_set_fd_towrite(session)
ssh_set_fd_except(session)
Serve to notify the library that data is actualy available to be read on the
file descriptor socket. why ? because on most platforms select can't be done
twice on the same socket when the first reported data to read or to write
ssh_get_status(session)
Returns the current status bitmask : connection Open or closed, data
pending to read or not (even if connection closed), connection closed on
error or on an exit message
ssh_get_disconnect_message(session)
Returns the connection disconnect error/exit message
ssh_get_pubkey_hash(session, hash)
get the public key hash from the server.
ssh_is_server_known(session)
ssh_write_knownhost(session)
these 2 functions will be kept
ssh_disconnect(session)
standard disconnect
ssh_disconnect_error(session,error code, message)
disconnect with a message
ssh_set_username(session)
set the user name to log in
ssh_userauth_* functions will be kept as they are now, excepted the fact that
the username field will disapear.
the public key mechanism may get some more functions, like retrieving a public
key from a private key and authenticating without a public key.
ssh_get_issue_banner(session)
get the issue banner from the server, that is the welcome message.
ssh_silent_free(session)
This function silently free all data structures used by the session and
closes the socket. It may be used for instance when the process forked and
doesn't want to keep track of this session. This is obviously not possible to
do with separate channels.
The channel_struct structure
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The channels will change a bit. the constructor thing will change, and the way
to multiplex different connections will change too. channel functions will be
prefixed with "ssh_"
struct channel_struct *ssh_channel_new()
ssh_channel_open_session(channel)
will return if the channel allocation failed or not.
ssh_channel_open_forward(channel, ...) won't change. it will report an error if
the channel allocation failed.
ssh_channel_send_eof(channel)
send EOF
ssh_channel_close(channel)
closes a channel but doesn't destroy it. you may read unread data still in
the buffer. Once you closed the buffer, the other party can't send you data,
while it could still do it if you only sent an EOF.
ssh_channel_is_closed(channel)
returns true if the channel was closed at one of both sides. a closed chan
may still have data to read, if you closed yourself the connection. otherwise
(you didn't close it) the closed notification only comes when you read the
last buffer byte, or when trying to write into the channel (the SIGPIPE-like
behaviour).
ssh_channel_is_eof(channel)
reports if the other side has sent an EOF. This functions returns FALSE if
there is still data to read. A closed channel is always EOF.
ssh_channel_free(channel)
completely free the channel. closes it before if it was not done.
ssh_channel_request_env(channel, name, value)
set an environment variable.
ssh_channel_request_pty(channel)
ssh_channel_request_pty_size()
ssh_channel_change_pty_size()
ssh_channel_request_shell()
ssh_channel_request_exec()
ssh_channel_request_subsystem()
These functions won't change.
int ssh_channel_write(channel,data, len,stderr)
Depending on the blocking/non blocking mode of the channel, the behaviour may
change.
stderr is the extended buffer. It's generaly only a server->client stream.
ssh_channel_set_blocking(bool blocking)
int ssh_channel_read(channel, buffer, maxlen, is_stderr)
the behaviour will be this one:
-if the chan is in non blocking mode, it will poll what's available to read
and return this. otherwise (nothing to read) it will return 0.
-if the chan is blocking, it will block until at least one byte is
available.
ssh_channel_nonblocking disapears for the later reason.
int channel_poll(channel, is_stderr)
polls the network and reports the number of bytes ready to be read in the
chan.
ssh_session ssh_channel_get_session(channel)
returns the session pointer associated to the channel, for simplicity
reasons.
int ssh_channel_select(CHANNELS *readchans, CHANNELS *writechans, CHANNELS
*exceptchans, struct timeval *timeout)
This function won't work the same way ssh_select did.
I removed the custom file descriptor thing for 2 reasons:
1- it's not windows compliant. D'ouh !
2- most programmers won't want to depend on libssh for socket multiplexing.
that's why i let the programmer poll the fds himself and then use
ssh_set_fd_toread, towrite or except. Then, he may use ssh_channel_select
with a NULL timeout to poll which channels have something to read, write or
error report.
Here is how it's going to work. The coder sets 3 different arrays with the
channels he wants to select(), the last entry being a NULL pointer. The
function will first poll them and return the chans that must be
read/write/excepted. If nothing has this state, the function will select()
using the timeout.
The function will return 0 if everything is ok, SSH_TIMEOUT or SSH_EINTR if
the select was interrupted by a signal. It is dangerous to execute any
channel-related functions into signal handlers. they should set a flag that
you read into your loop. this "trap" (SSH_EINTR) will permit you to catch
them faster and make your program responsive and look fast.
the function will return -1 if a serious problem happens.
Error handling
~~~~~~~~~~~~~~
when an error happens, the programmer can get the error code and description
with ssh_get_error(session). the creation of a failess constructor for
ssh_session was needed for this reason.
ssh_get_error_code(session) will return an error code into this subset:
SSH_NO_ERROR : no error :)
SSH_REQUEST_DENIED : you request for a functionality or a service that is not
allowed. The session can continue.
SSH_FATAL : Unrecoverable error. The session can't continue and you should
disconnect the session. It includes the connection being cut without a
disconnect() message.
If a disconnect() message or the channel was closed, a read on such a channel
won't produce an error. otherwise it will return -1 with a SSH_FATAL error
code.
Server socket binding
~~~~~~~~~~~~~~~~~~~~~
It is not possible to bind a socket for ssh with a SSH_SESSION type, because a
single bound port may lead to multiple ssh connections. That's why the
SSH_BIND structure must be created. It uses options from the SSH_OPTIONS
structure.
SSH_BIND *ssh_bind_new()
creates a structure
ssh_bind_set_options(bind, options)
set the option structure
int ssh_bind_listen(bind)
bind and listen to the port. This call is not blocking. if some error
happens, it returns -1 and the error code can be found with perror().
ssh_bind_set_blocking(bind, bool blocking)
should ssh_bind_accept() block or not.
int ssh_bind_get_fd(bind)
return the bound file descriptor, that is the listener socket. you may put it
into a select() in your code to detect a connection attempt.
ssh_bind_set_fd_toaccept(bind)
say that the listener socket has a connection to accept (to avoid
ssh_bind_accept() to do a select on it).
SSH_SESSION *ssh_bind_accept(bind)
return a server handle to a ssh session. if the mode is blocking, the
function will always return a pointer to a session. if the mode is not
blocking, the function can return NULL if there is no connection to accept.
This SSH_SESSION handle must then pass through the functions explained above.
*server functions *
int ssh_accept(session)
when a new connection is accepted, the handshake must be done. this function
will do the banner handshake and the key exchange.
it will return SSH_AGAIN if the session mode is non blocking, and the
function must be called again until an error occurs or the kex is done.
Here, I had a few choises about *how* to implement the message parsing as a
server. There are multiple ways to do it, one being callbacks and one being
"Message" reading, parsing and then choice going to the user to use it and
answer. I've choosen the latter because i believe it's the stronger method.
A ssh server can receive 30 different kind of messages having to be dealt by
the high level routines, like channel request_shell or authentication. Having
a callback for all of them would produce a huge kludge of callbacks, with
no relations on when there were called etc.
A message based parsing allows the user to filtrate the messages he's
interested into and to use a default answer for the others. Then, the callback
thing is still possible to handle through a simple message code/callback
function array.
I did not define yet what it would look like, but i'm sure there will be a
SSH_MESSAGE (they won't have a 1/1 correspondance with ssh packets) which will
be read through
SSH_MESSAGE *ssh_server_read_message(session).
with all of the non-blocking stuff in head like returning NULL if the message
is not full.
Then, the message can be parsed, ie
int ssh_message_get_code(message)
which will return SSH_MESSAGE_AUTH
then
int ssh_message_get_subcode(message)
which then will returh SSH_MESSAGE_AUTH_PASSWORD or _NONE or _PUBKEY etc.
Then, once the message was parsed, the message will have to be answered, ie
with the generic functions like
ssh_message_accept(message) which says 'Ok your request is accepted' or
ssh_message_deny(message) which says 'Your request is refused'.
There would be specific message answer functions for some kind of messages
like the authentication one. you may want to reply that the authentication is
Partial rather than denied, and that you still accept some kind of auths, like
ssh_message_auth_reply(message,SSH_AUTH_PARTIAL,SSH_AUTH_PASSWORD |
SSH_AUTH_PUBKEY | SSH_AUTH_KEYBINT);
I won't let the user have to deal with the channels himself. When a channel is
going to be created by the remote size, a message will come asking to open a
channel. the programmer can either deny or accept, in which case a CHANNEL
object will be created and returned to the programmer. then, all standard
channel functions will run.
C. Change log of this document
3. Add paragraph about initalization and finalization.
2. ssh_options_set_username finaly is kept into the options, because it can be
set by ssh_options_getopt()
1. first release
D. End notes
I think libssh must have a very simple to use, powerful and exhaustive API. It
must have no design flaw either.
While I got some good experience at the SSH protocol, I've never writen
more-than-100 lines programs than use libssh and I don't really know the
problems of the library. I'd like people who don't understand some detail into
the API I describe here, who have comments or opinions about it to write me
the soonest possible to limit the damages if I made something the completely
wrong way.
Thanks for your patience.

24
doc/linking.dox Normal file
View File

@@ -0,0 +1,24 @@
/**
@page libssh_linking The Linking HowTo
@section dynamic Dynamic Linking
On UNIX and Windows systems its the same, you need at least the libssh.h
header file and the libssh shared library.
@section static Static Linking
@warning <b>The libssh library is licensed under the LGPL! Make sure you
understand what this means to your codebase if you want to distribute
binaries and link statically against LGPL code!</b>
On UNIX systems linking against the static version of the library is the
same as linking against the shared library. Both have the same name. Some
build system require to use the full path to the static library.
On Windows you need to define LIBSSH_STATIC in the compiler command
line. This is required cause the dynamic library needs to specify the
dllimport attribute.
*/

124
doc/mainpage.dox Normal file
View File

@@ -0,0 +1,124 @@
/**
@mainpage
This is the online reference for developing with the libssh library. It
documents the libssh C API and the C++ wrapper.
@section main-linking Linking
We created a small howto how to link libssh against your application, read
@subpage libssh_linking.
@section main-tutorial Tutorial
You should start by reading @subpage libssh_tutorial, then reading the documentation of
the interesting functions as you go.
@section main-features Features
The libssh library provides:
- Full C library functions for manipulating a client-side SSH connection
- SSH2 and SSH1 protocol compliant
- Fully configurable sessions
- Server support
- SSH agent authentication support
- Support for AES-128, AES-192, AES-256, Blowfish, 3DES in CBC mode, and AES in CTR mode
- Supports OpenSSL and GCrypt
- Use multiple SSH connections in a same process, at same time
- Use multiple channels in the same connection
- Thread safety when using different sessions at same time
- POSIX-like SFTP (Secure File Transfer) implementation with openssh extension support
- SCP implementation
- Large file system support (files bigger than 4GB)
- RSA and DSS server public key supported
- Compression support (with zlib)
- Public key (RSA and DSS), password and keyboard-interactive authentication
- Full poll()/WSAPoll() support and a poll-emulation for Win32.
- Runs and tested under x86_64, x86, ARM, Sparc32, PPC under Linux, BSD, MacOSX, Solaris and Windows
@section main-copyright Copyright Policy
The developers of libssh have a policy of asking for contributions to be made
under the personal copyright of the contributor, instead of a corporate
copyright.
There are some reasons for the establishment of this policy:
@li Individual copyrights make copyright registration in the US a simpler
process.
@li If libssh is copyrighted by individuals rather than corporations,
decisions regarding enforcement and protection of copyright will, more
likely, be made in the interests of the project, and not in the interests
of any corporations shareholders.
@li If we ever need to relicense a portion of the code contacting individuals
for permission to do so is much easier than contacting a company.
@section main-rfc Internet standard
@subsection main-rfc-secsh Secure Shell (SSH)
The following RFC documents described SSH-2 protcol as an Internet standard.
- <a href="http://tools.ietf.org/html/rfc4250" target="_blank">RFC 4250</a>,
The Secure Shell (SSH) Protocol Assigned Numbers
- <a href="http://tools.ietf.org/html/rfc4251" target="_blank">RFC 4251</a>,
The Secure Shell (SSH) Protocol Architecture
- <a href="http://tools.ietf.org/html/rfc4252" target="_blank">RFC 4252</a>,
The Secure Shell (SSH) Authentication Protocol
- <a href="http://tools.ietf.org/html/rfc4253" target="_blank">RFC 4253</a>,
The Secure Shell (SSH) Transport Layer Protocol
- <a href="http://tools.ietf.org/html/rfc4254" target="_blank">RFC 4254</a>,
The Secure Shell (SSH) Connection Protocol
- <a href="http://tools.ietf.org/html/rfc4255" target="_blank">RFC 4255</a>,
Using DNS to Securely Publish Secure Shell (SSH) Key Fingerprints
- <a href="http://tools.ietf.org/html/rfc4256" target="_blank">RFC 4256</a>,
Generic Message Exchange Authentication for the Secure Shell Protocol (SSH)
- <a href="http://tools.ietf.org/html/rfc4335" target="_blank">RFC 4335</a>,
The Secure Shell (SSH) Session Channel Break Extension
- <a href="http://tools.ietf.org/html/rfc4344" target="_blank">RFC 4344</a>,
The Secure Shell (SSH) Transport Layer Encryption Modes
- <a href="http://tools.ietf.org/html/rfc4345" target="_blank">RFC 4345</a>,
Improved Arcfour Modes for the Secure Shell (SSH) Transport Layer Protocol
It was later modified and expanded by the following RFCs.
- <a href="http://tools.ietf.org/html/rfc4419" target="_blank">RFC 4419</a>,
Diffie-Hellman Group Exchange for the Secure Shell (SSH) Transport Layer
Protocol
- <a href="http://tools.ietf.org/html/rfc4432" target="_blank">RFC 4432</a>,
RSA Key Exchange for the Secure Shell (SSH) Transport Layer Protocol
- <a href="http://tools.ietf.org/html/rfc4462" target="_blank">RFC 4462</a>,
Generic Security Service Application Program Interface (GSS-API)
Authentication and Key Exchange for the Secure Shell (SSH) Protocol
- <a href="http://tools.ietf.org/html/rfc4716" target="_blank">RFC 4716</a>,
The Secure Shell (SSH) Public Key File Format
- <a href="http://tools.ietf.org/html/rfc5656" target="_blank">RFC 5656</a>,
Elliptic Curve Algorithm Integration in the Secure Shell Transport Layer
Interesting cryptography documents:
- <a href="http://www.cryptsoft.com/pkcs11doc/" target="_blank">PKCS #11</a>, PKCS #11 reference documents, describing interface with smartcards.
@subsection main-rfc-sftp Secure Shell File Transfer Protocol (SFTP)
The protocol is not an Internet standard but it is still widely implemented.
OpenSSH and most other implementation implement Version 3 of the protocol. We
do the same in libssh.
- <a href="http://tools.ietf.org/html/draft-ietf-secsh-filexfer-02" target="_blank">
draft-ietf-secsh-filexfer-02.txt</a>,
SSH File Transfer Protocol
@subsection main-rfc-extensions Secure Shell Extensions
The OpenSSH project has defined some extensions to the protocol. We support some of
them like the statvfs calls in SFTP or the ssh-agent.
- <a href="http://api.libssh.org/rfc/PROTOCOL" target="_blank">
OpenSSH's deviations and extensions</a>
- <a href="http://api.libssh.org/rfc/PROTOCOL.agent" target="_blank">
OpenSSH's ssh-agent</a>
*/

257
doc/scp.dox Normal file
View File

@@ -0,0 +1,257 @@
/**
@page libssh_tutor_scp Chapter 6: The SCP subsystem
@section scp_subsystem The SCP subsystem
The SCP subsystem has far less functionnality than the SFTP subsystem.
However, if you only need to copy files from and to the remote system,
it does its job.
@subsection scp_session Opening and closing a SCP session
Like in the SFTP subsystem, you don't handle the SSH channels directly.
Instead, you open a "SCP session".
When you open your SCP session, you have to choose between read or write mode.
You can't do both in the same session. So you specify either SSH_SCP_READ or
SSH_SCP_WRITE as the second parameter of function ssh_scp_new().
Another important mode flag for opening your SCP session is SSH_SCP_RECURSIVE.
When you use SSH_SCP_RECURSIVE, you declare that you are willing to emulate
the behaviour of "scp -r" command in your program, no matter it is for
reading or for writing.
Once your session is created, you initialize it with ssh_scp_init(). When
you have finished transferring files, you terminate the SCP connection with
ssh_scp_close(). Finally, you can dispose the SCP connection with
ssh_scp_free().
The example below does the maintenance work to open a SCP connection for writing in
recursive mode:
@code
int scp_write(ssh_session session)
{
ssh_scp scp;
int rc;
scp = ssh_scp_new
(session, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, ".");
if (scp == NULL)
{
fprintf(stderr, "Error allocating scp session: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
rc = ssh_scp_init(scp);
if (rc != SSH_OK)
{
fprintf(stderr, "Error initializing scp session: %s\n", ssh_get_error(session));
ssh_scp_free(scp);
return rc;
}
...
ssh_scp_close(scp);
ssh_scp_free(scp);
return SSH_OK;
}
@endcode
The example below shows how to open a connection to read a single file:
@code
int scp_read(ssh_session session)
{
ssh_scp scp;
int rc;
scp = ssh_scp_new
(session, SSH_SCP_READ, "helloworld/helloworld.txt");
if (scp == NULL)
{
fprintf(stderr, "Error allocating scp session: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
rc = ssh_scp_init(scp);
if (rc != SSH_OK)
{
fprintf(stderr, "Error initializing scp session: %s\n", ssh_get_error(session));
ssh_scp_free(scp);
return rc;
}
...
ssh_scp_close(scp);
ssh_scp_free(scp);
return SSH_OK;
}
@endcode
@subsection scp_write Creating files and directories
You create directories with ssh_scp_push_directory(). In recursive mode,
you are placed in this directory once it is created. If the directory
already exists and if you are in recursive mode, you simply enter that
directory.
Creating files is done in two steps. First, you prepare the writing with
ssh_scp_push_file(). Then, you write the data with ssh_scp_write().
The length of the data to write must be identical between both function calls.
There's no need to "open" nor "close" the file, this is done automatically
on the remote end. If the file already exists, it is overwritten and truncated.
The following example creates a new directory named "helloworld/", then creates
a file named "helloworld.txt" in that directory:
@code
int scp_helloworld(ssh_session session, ssh_scp scp)
{
int rc;
const char *helloworld = "Hello, world!\n";
int length = strlen(helloworld);
rc = ssh_scp_push_directory(scp, "helloworld", S_IRWXU);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't create remote directory: %s\n", ssh_get_error(session));
return rc;
}
rc = ssh_scp_push_file
(scp, "helloworld.txt", length, S_IRUSR | S_IWUSR);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't open remote file: %s\n", ssh_get_error(session));
return rc;
}
rc = ssh_scp_write(scp, helloworld, length);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't write to remote file: %s\n", ssh_get_error(session));
return rc;
}
return SSH_OK;
}
@endcode
@subsection scp_recursive_write Copying full directory trees to the remote server
Let's say you want to copy the following tree of files to the remote site:
@verbatim
+-- file1
+-- B --+
| +-- file2
-- A --+
| +-- file3
+-- C --+
+-- file4
@endverbatim
You would do it that way:
- open the session in recursive mode
- enter directory A
- enter its subdirectory B
- create file1 in B
- create file2 in B
- leave directory B
- enter subdirectory C
- create file3 in C
- create file4 in C
- leave directory C
- leave directory A
To leave a directory, call ssh_scp_leave_directory().
@subsection scp_read Reading files and directories
To receive files, you pull requests from the other side with ssh_scp_pull_request().
If this function returns SSH_SCP_REQUEST_NEWFILE, then you must get ready for
the reception. You can get the size of the data to receive with ssh_scp_request_get_size()
and allocate a buffer accordingly. When you are ready, you accept the request with
ssh_scp_accept_request(), then read the data with ssh_scp_read().
The following example receives a single file. The name of the file to
receive has been given earlier, when the scp session was opened:
@code
int scp_receive(ssh_session session, ssh_scp scp)
{
int rc;
int size, mode;
char *filename, *buffer;
rc = ssh_scp_pull_request(scp);
if (rc != SSH_SCP_REQUEST_NEWFILE)
{
fprintf(stderr, "Error receiving information about file: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
size = ssh_scp_request_get_size(scp);
filename = strdup(ssh_scp_request_get_filename(scp));
mode = ssh_scp_request_get_permissions(scp);
printf("Receiving file %s, size %d, permisssions 0%o\n", filename, size, mode);
free(filename);
buffer = malloc(size);
if (buffer == NULL)
{
fprintf(stderr, "Memory allocation error\n");
return SSH_ERROR;
}
ssh_scp_accept_request(scp);
rc = ssh_scp_read(scp, buffer, size);
if (rc == SSH_ERROR)
{
fprintf(stderr, "Error receiving file data: %s\n", ssh_get_error(session));
free(buffer);
return rc;
}
printf("Done\n");
write(1, buffer, size);
free(buffer);
rc = ssh_scp_pull_request(scp);
if (rc != SSH_SCP_REQUEST_EOF)
{
fprintf(stderr, "Unexpected request: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
return SSH_OK;
}
@endcode
In this example, since we just requested a single file, we expect ssh_scp_request()
to return SSH_SCP_REQUEST_NEWFILE first, then SSH_SCP_REQUEST_EOF. That's quite a
naive approach; for example, the remote server might send a warning as well
(return code SSH_SCP_REQUEST_WARNING) and the example would fail. A more comprehensive
reception program would receive the requests in a loop and analyze them carefully
until SSH_SCP_REQUEST_EOF has been received.
@subsection scp_recursive_read Receiving full directory trees from the remote server
If you opened the SCP session in recursive mode, the remote end will be
telling you when to change directory.
In that case, when ssh_scp_pull_request() answers
SSH_SCP_REQUEST_NEWDIRECTORY, you should make that local directory (if
it does not exist yet) and enter it. When ssh_scp_pull_request() answers
SSH_SCP_REQUEST_ENDDIRECTORY, you should leave the current directory.
*/

395
doc/sftp.dox Normal file
View File

@@ -0,0 +1,395 @@
/**
@page libssh_tutor_sftp Chapter 5: The SFTP subsystem
@section sftp_subsystem The SFTP subsystem
SFTP stands for "Secure File Transfer Protocol". It enables you to safely
transfer files between the local and the remote computer. It reminds a lot
of the old FTP protocol.
SFTP is a rich protocol. It lets you do over the network almost everything
that you can do with local files:
- send files
- modify only a portion of a file
- receive files
- receive only a portion of a file
- get file owner and group
- get file permissions
- set file owner and group
- set file permissions
- remove files
- rename files
- create a directory
- remove a directory
- retrieve the list of files in a directory
- get the target of a symbolic link
- create symbolic links
- get information about mounted filesystems.
The current implemented version of the SFTP protocol is version 3. All functions
aren't implemented yet, but the most important are.
@subsection sftp_session Opening and closing a SFTP session
Unlike with remote shells and remote commands, when you use the SFTP subsystem,
you don't handle directly the SSH channels. Instead, you open a "SFTP session".
The function sftp_new() creates a new SFTP session. The function sftp_init()
initializes it. The function sftp_free() deletes it.
As you see, all the SFTP-related functions start with the "sftp_" prefix
instead of the usual "ssh_" prefix.
The example below shows how to use these functions:
@code
#include <libssh/sftp.h>
int sftp_helloworld(ssh_session session)
{
sftp_session sftp;
int rc;
sftp = sftp_new(session);
if (sftp == NULL)
{
fprintf(stderr, "Error allocating SFTP session: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
rc = sftp_init(sftp);
if (rc != SSH_OK)
{
fprintf(stderr, "Error initializing SFTP session: %s.\n", sftp_get_error(sftp));
sftp_free(sftp);
return rc;
}
...
sftp_free(sftp);
return SSH_OK;
}
@endcode
@subsection sftp_errors Analyzing SFTP errors
In case of a problem, the function sftp_get_error() returns a SFTP-specific
error number, in addition to the regular SSH error number returned by
ssh_get_error_number().
Possible errors are:
- SSH_FX_OK: no error
- SSH_FX_EOF: end-of-file encountered
- SSH_FX_NO_SUCH_FILE: file does not exist
- SSH_FX_PERMISSION_DENIED: permission denied
- SSH_FX_FAILURE: generic failure
- SSH_FX_BAD_MESSAGE: garbage received from server
- SSH_FX_NO_CONNECTION: no connection has been set up
- SSH_FX_CONNECTION_LOST: there was a connection, but we lost it
- SSH_FX_OP_UNSUPPORTED: operation not supported by libssh yet
- SSH_FX_INVALID_HANDLE: invalid file handle
- SSH_FX_NO_SUCH_PATH: no such file or directory path exists
- SSH_FX_FILE_ALREADY_EXISTS: an attempt to create an already existing file or directory has been made
- SSH_FX_WRITE_PROTECT: write-protected filesystem
- SSH_FX_NO_MEDIA: no media was in remote drive
@subsection sftp_mkdir Creating a directory
The function sftp_mkdir() tahes the "SFTP session" we juste created as
its first argument. It also needs the name of the file to create, and the
desired permissions. The permissions are the same as for the usual mkdir()
function. To get a comprehensive list of the available permissions, use the
"man 2 stat" command. The desired permissions are combined with the remote
user's mask to determine the effective permissions.
The code below creates a directory named "helloworld" in the current directory that
can be read and written only by its owner:
@code
#include <libssh/sftp.h>
#include <sys/stat.h>
int sftp_helloworld(ssh_session session, sftp_session sftp)
{
int rc;
rc = sftp_mkdir(sftp, "helloworld", S_IRWXU);
if (rc != SSH_OK)
{
if (sftp_get_error(sftp) != SSH_FX_FILE_ALREADY_EXISTS)
{
fprintf(stderr, "Can't create directory: %s\n", ssh_get_error(session));
return rc;
}
}
...
return SSH_OK;
}
@endcode
Unlike its equivalent in the SCP subsystem, this function does NOT change the
current directory to the newly created subdirectory.
@subsection sftp_write Copying a file to the remote computer
You handle the contents of a remote file just like you would do with a
local file: you open the file in a given mode, move the file pointer in it,
read or write data, and close the file.
The sftp_open() function is very similar to the regular open() function,
excepted that it returns a file handle of type sftp_file. This file handle
is then used by the other file manipulation functions and remains valid
until you close the remote file with sftp_close().
The example below creates a new file named "helloworld.txt" in the
newly created "helloworld" directory. If the file already exists, it will
be truncated. It then writes the famous "Hello, World!" sentence to the
file, followed by a new line character. Finally, the file is closed:
@code
#include <libssh/sftp.h>
#include <sys/stat.h>
#include <fcntl.h>
int sftp_helloworld(ssh_session session, sftp_session sftp)
{
int access_type = O_WRONLY | O_CREAT | O_TRUNC;
sftp_file file;
const char *helloworld = "Hello, World!\n";
int length = strlen(helloworld);
int rc, nwritten;
...
file = sftp_open(sftp, "helloworld/helloworld.txt", access_type, S_IRWXU);
if (file == NULL)
{
fprintf(stderr, "Can't open file for writing: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
nwritten = sftp_write(file, helloworld, length);
if (nwritten != length)
{
fprintf(stderr, "Can't write data to file: %s\n", ssh_get_error(session));
sftp_close(file);
return SSH_ERROR;
}
rc = sftp_close(file);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't close the written file: %s\n", ssh_get_error(session));
return rc;
}
return SSH_OK;
}
@endcode
@subsection sftp_read Reading a file from the remote computer
The nice thing with reading a file over the network through SFTP is that it
can be done both in a synchronous way or an asynchronous way. If you read the file
asynchronously, your program can do something else while it waits for the
results to come.
Synchronous read is done with sftp_read().
The following example prints the contents of remote file "/etc/profile". For
each 1024 bytes of information read, it waits until the end of the read operation:
@code
int sftp_read_sync(ssh_session session, sftp_session sftp)
{
int access_type;
sftp_file file;
char buffer[1024];
int nbytes, rc;
access_type = O_RDONLY;
file = sftp_open(sftp, "/etc/profile", access_type, 0);
if (file == NULL)
{
fprintf(stderr, "Can't open file for reading: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
nbytes = sftp_read(file, buffer, sizeof(buffer));
while (nbytes > 0)
{
if (write(1, buffer, nbytes) != nbytes)
{
sftp_close(file);
return SSH_ERROR;
}
nbytes = sftp_read(file, buffer, sizeof(buffer));
}
if (nbytes < 0)
{
fprintf(stderr, "Error while reading file: %s\n", ssh_get_error(session));
sftp_close(file);
return SSH_ERROR;
}
rc = sftp_close(file);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't close the read file: %s\n", ssh_get_error(session));
return rc;
}
return SSH_OK;
}
@endcode
Asynchronous read is done in two steps, first sftp_async_read_begin(), which
returns a "request handle", and then sftp_async_read(), which uses that request handle.
If the file has been opened in nonblocking mode, then sftp_async_read()
might return SSH_AGAIN, which means that the request hasn't completed yet
and that the function should be called again later on. Otherwise,
sftp_async_read() waits for the data to come. To open a file in nonblocking mode,
call sftp_file_set_nonblocking() right after you opened it. Default is blocking mode.
The example below reads a very big file in asynchronous, nonblocking, mode. Each
time the data are not ready yet, a counter is incrementer.
@code
int sftp_read_async(ssh_session session, sftp_session sftp)
{
int access_type;
sftp_file file;
char buffer[1024];
int async_request;
int nbytes;
long counter;
int rc;
access_type = O_RDONLY;
file = sftp_open(sftp, "some_very_big_file", access_type, 0);
if (file == NULL)
{
fprintf(stderr, "Can't open file for reading: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
sftp_file_set_nonblocking(file);
async_request = sftp_async_read_begin(file, sizeof(buffer));
counter = 0L;
usleep(10000);
if (async_request >= 0)
nbytes = sftp_async_read(file, buffer, sizeof(buffer), async_request);
else nbytes = -1;
while (nbytes > 0 || nbytes == SSH_AGAIN)
{
if (nbytes > 0)
{
write(1, buffer, nbytes);
async_request = sftp_async_read_begin(file, sizeof(buffer));
}
else counter++;
usleep(10000);
if (async_request >= 0)
nbytes = sftp_async_read(file, buffer, sizeof(buffer), async_request);
else nbytes = -1;
}
if (nbytes < 0)
{
fprintf(stderr, "Error while reading file: %s\n", ssh_get_error(session));
sftp_close(file);
return SSH_ERROR;
}
printf("The counter has reached value: %ld\n", counter);
rc = sftp_close(file);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't close the read file: %s\n", ssh_get_error(session));
return rc;
}
return SSH_OK;
}
@endcode
@subsection sftp_ls Listing the contents of a directory
The functions sftp_opendir(), sftp_readdir(), sftp_dir_eof(),
and sftp_closedir() enable to list the contents of a directory.
They use a new handle_type, "sftp_dir", which gives access to the
directory being read.
In addition, sftp_readdir() returns a "sftp_attributes" which is a pointer
to a structure with informations about a directory entry:
- name: the name of the file or directory
- size: its size in bytes
- etc.
sftp_readdir() might return NULL under two conditions:
- when the end of the directory has been met
- when an error occured
To tell the difference, call sftp_dir_eof().
The attributes must be freed with sftp_attributes_free() when no longer
needed.
The following example reads the contents of some remote directory:
@code
int sftp_list_dir(ssh_session session, sftp_session sftp)
{
sftp_dir dir;
sftp_attributes attributes;
int rc;
dir = sftp_opendir(sftp, "/var/log");
if (!dir)
{
fprintf(stderr, "Directory not opened: %s\n", ssh_get_error(session));
return SSH_ERROR;
}
printf("Name Size Perms Owner\tGroup\n");
while ((attributes = sftp_readdir(sftp, dir)) != NULL)
{
printf("%-22s %10llu %.8o %s(%d)\t%s(%d)\n",
attributes->name,
(long long unsigned int) attributes->size,
attributes->permissions,
attributes->owner,
attributes->uid,
attributes->group,
attributes->gid);
sftp_attributes_free(attributes);
}
if (!sftp_dir_eof(dir))
{
fprintf(stderr, "Can't list directory: %s\n", ssh_get_error(session));
sftp_closedir(dir);
return SSH_ERROR;
}
rc = sftp_closedir(dir);
if (rc != SSH_OK)
{
fprintf(stderr, "Can't close directory: %s\n", ssh_get_error(session));
return rc;
}
}
@endcode
*/

361
doc/shell.dox Normal file
View File

@@ -0,0 +1,361 @@
/**
@page libssh_tutor_shell Chapter 3: Opening a remote shell
@section opening_shell Opening a remote shell
We already mentioned that a single SSH connection can be shared
between several "channels". Channels can be used for different purposes.
This chapter shows how to open one of these channels, and how to use it to
start a command interpreter on a remote computer.
@subsection open_channel Opening and closing a channel
The ssh_channel_new() function creates a channel. It returns the channel as
a variable of type ssh_channel.
Once you have this channel, you open a SSH session that uses it with
ssh_channel_open_session().
Once you don't need the channel anymore, you can send an end-of-file
to it with ssh_channel_close(). At this point, you can destroy the channel
with ssh_channel_free().
The code sample below achieves these tasks:
@code
int shell_session(ssh_session session)
{
ssh_channel channel;
int rc;
channel = ssh_channel_new(session);
if (channel == NULL)
return SSH_ERROR;
rc = ssh_channel_open_session(channel);
if (rc != SSH_OK)
{
ssh_channel_free(channel);
return rc;
}
...
ssh_channel_close(channel);
ssh_channel_send_eof(channel);
ssh_channel_free(channel);
return SSH_OK;
}
@endcode
@subsection interactive Interactive and non-interactive sessions
A "shell" is a command interpreter. It is said to be "interactive"
if there is a human user typing the commands, one after the
other. The contrary, a non-interactive shell, is similar to
the execution of commands in the background: there is no attached
terminal.
If you plan using an interactive shell, you need to create a
pseud-terminal on the remote side. A remote terminal is usually referred
to as a "pty", for "pseudo-teletype". The remote processes won't see the
difference with a real text-oriented terminal.
If needed, you request the pty with the function ssh_channel_request_pty().
Then you define its dimensions (number of rows and columns)
with ssh_channel_change_pty_size().
Be your session interactive or not, the next step is to request a
shell with ssh_channel_request_shell().
@code
int interactive_shell_session(ssh_channel channel)
{
int rc;
rc = ssh_channel_request_pty(channel);
if (rc != SSH_OK) return rc;
rc = ssh_channel_change_pty_size(channel, 80, 24);
if (rc != SSH_OK) return rc;
rc = ssh_channel_request_shell(channel);
if (rc != SSH_OK) return rc;
...
return rc;
}
@endcode
@subsection read_data Displaying the data sent by the remote computer
In your program, you will usually need to receive all the data "displayed"
into the remote pty. You will usually analyse, log, or display this data.
ssh_channel_read() and ssh_channel_read_nonblocking() are the simplest
way to read data from a channel. If you only need to read from a single
channel, they should be enough.
The example below shows how to wait for remote data using ssh_channel_read():
@code
int interactive_shell_session(ssh_channel channel)
{
int rc;
char buffer[256];
int nbytes;
rc = ssh_channel_request_pty(channel);
if (rc != SSH_OK) return rc;
rc = ssh_channel_change_pty_size(channel, 80, 24);
if (rc != SSH_OK) return rc;
rc = ssh_channel_request_shell(channel);
if (rc != SSH_OK) return rc;
while (ssh_channel_is_open(channel) &&
!ssh_channel_is_eof(channel))
{
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
if (nbytes < 0)
return SSH_ERROR;
if (nbytes > 0)
write(1, buffer, nbytes);
}
return rc;
}
@endcode
Unlike ssh_channel_read(), ssh_channel_read_nonblocking() never waits for
remote data to be ready. It returns immediately.
If you plan to use ssh_channel_read_nonblocking() repeatedly in a loop,
you should use a "passive wait" function like usleep(3) in the same
loop. Otherwise, your program will consume all the CPU time, and your
computer might become unresponsive.
@subsection write_data Sending user input to the remote computer
User's input is sent to the remote site with ssh_channel_write().
The following example shows how to combine a nonblocking read from a SSH
channel with a nonblocking read from the keyboard. The local input is then
sent to the remote computer:
@code
/* Under Linux, this function determines whether a key has been pressed.
Under Windows, it is a standard function, so you need not redefine it.
*/
int kbhit()
{
struct timeval tv = { 0L, 0L };
fd_set fds;
FD_ZERO(&fds);
FD_SET(0, &fds);
return select(1, &fds, NULL, NULL, &tv);
}
/* A very simple terminal emulator:
- print data received from the remote computer
- send keyboard input to the remote computer
*/
int interactive_shell_session(ssh_channel channel)
{
/* Session and terminal initialization skipped */
...
char buffer[256];
int nbytes, nwritten;
while (ssh_channel_is_open(channel) &&
!ssh_channel_is_eof(channel))
{
nbytes = ssh_channel_read_nonblocking(channel, buffer, sizeof(buffer), 0);
if (nbytes < 0) return SSH_ERROR;
if (nbytes > 0)
{
nwritten = write(1, buffer, nbytes);
if (nwritten != nbytes) return SSH_ERROR;
if (!kbhit())
{
usleep(50000L); // 0.05 second
continue;
}
nbytes = read(0, buffer, sizeof(buffer));
if (nbytes < 0) return SSH_ERROR;
if (nbytes > 0)
{
nwritten = ssh_channel_write(channel, buffer, nbytes);
if (nwritten != nbytes) return SSH_ERROR;
}
}
return rc;
}
@endcode
Of course, this is a poor terminal emulator, since the echo from the keys
pressed should not be done locally, but should be done by the remote side.
Also, user's input should not be sent once "Enter" key is pressed, but
immediately after each key is pressed. This can be accomplished
by setting the local terminal to "raw" mode with the cfmakeraw(3) function.
cfmakeraw() is a standard function under Linux, on other systems you can
recode it with:
@code
static void cfmakeraw(struct termios *termios_p)
{
termios_p->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
termios_p->c_oflag &= ~OPOST;
termios_p->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
termios_p->c_cflag &= ~(CSIZE|PARENB);
termios_p->c_cflag |= CS8;
}
@endcode
If you are not using a local terminal, but some kind of graphical
environment, the solution to this kind of "echo" problems will be different.
@subsection select_loop A more elaborate way to get the remote data
*** Warning: ssh_select() and ssh_channel_select() are not relevant anymore,
since libssh is about to provide an easier system for asynchronous
communications. This subsection should be removed then. ***
ssh_channel_read() and ssh_channel_read_nonblocking() functions are simple,
but they are not adapted when you expect data from more than one SSH channel,
or from other file descriptors. Last example showed how getting data from
the standard input (the keyboard) at the same time as data from the SSH
channel was complicated. The functions ssh_select() and ssh_channel_select()
provide a more elegant way to wait for data coming from many sources.
The functions ssh_select() and ssh_channel_select() remind of the standard
UNIX select(2) function. The idea is to wait for "something" to happen:
incoming data to be read, outcoming data to block, or an exception to
occur. Both these functions do a "passive wait", i.e. you can safely use
them repeatedly in a loop, it will not consume exaggerate processor time
and make your computer unresponsive. It is quite common to use these
functions in your application's main loop.
The difference between ssh_select() and ssh_channel_select() is that
ssh_channel_select() is simpler, but allows you only to watch SSH channels.
ssh_select() is more complete and enables watching regular file descriptors
as well, in the same function call.
Below is an example of a function that waits both for remote SSH data to come,
as well as standard input from the keyboard:
@code
int interactive_shell_session(ssh_session session, ssh_channel channel)
{
/* Session and terminal initialization skipped */
...
char buffer[256];
int nbytes, nwritten;
while (ssh_channel_is_open(channel) &&
!ssh_channel_is_eof(channel))
{
struct timeval timeout;
ssh_channel in_channels[2], out_channels[2];
fd_set fds;
int maxfd;
timeout.tv_sec = 30;
timeout.tv_usec = 0;
in_channels[0] = channel;
in_channels[1] = NULL;
FD_ZERO(&fds);
FD_SET(0, &fds);
FD_SET(ssh_get_fd(session), &fds);
maxfd = ssh_get_fd(session) + 1;
ssh_select(in_channels, out_channels, maxfd, &fds, &timeout);
if (out_channels[0] != NULL)
{
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
if (nbytes < 0) return SSH_ERROR;
if (nbytes > 0)
{
nwritten = write(1, buffer, nbytes);
if (nwritten != nbytes) return SSH_ERROR;
}
}
if (FD_ISSET(0, &fds))
{
nbytes = read(0, buffer, sizeof(buffer));
if (nbytes < 0) return SSH_ERROR;
if (nbytes > 0)
{
nwritten = ssh_channel_write(channel, buffer, nbytes);
if (nbytes != nwritten) return SSH_ERROR;
}
}
}
return rc;
}
@endcode
@subsection x11 Using graphical applications on the remote side
If your remote application is graphical, you can forward the X11 protocol to
your local computer.
To do that, you first declare that you accept X11 connections with
ssh_channel_accept_x11(). Then you create the forwarding tunnel for
the X11 protocol with ssh_channel_request_x11().
The following code performs channel initialization and shell session
opening, and handles a parallel X11 connection:
@code
int interactive_shell_session(ssh_channel channel)
{
int rc;
ssh_channel x11channel;
rc = ssh_channel_request_pty(channel);
if (rc != SSH_OK) return rc;
rc = ssh_channel_change_pty_size(channel, 80, 24);
if (rc != SSH_OK) return rc;
rc = ssh_channel_request_x11(channel, 0, NULL, NULL, 0);
if (rc != SSH_OK) return rc;
rc = ssh_channel_request_shell(channel);
if (rc != SSH_OK) return rc;
/* Read the data sent by the remote computer here */
...
}
@endcode
Don't forget to set the $DISPLAY environment variable on the remote
side, or the remote applications won't try using the X11 tunnel:
@code
$ export DISPLAY=:0
$ xclock &
@endcode
*/

View File

@@ -1,184 +0,0 @@
body {
background-color:#ddf;
/*background-image:url(../back6.jpg);*/
margin:10px 10px 10px 10px;
}
h1 {
font-family:verdana, sans-serif;
font-size:80%;
color:black;
background-color:transparent;
text-align:left;
}
h2 {
font-family:verdana, sans-serif;
font-size:100%;
color:black;
background-color:transparent;
text-align:left;
}
h3 {
font-family:verdana, sans-serif;
font-size:80%;
color:black;
background-color:transparent;
text-align:left;
}
p {
font-family:verdana, sans-serif;
font-size:80%;
color:black;
background-color:transparent;
text-align:left;
margin-left:0px;
margin-right:0px;
}
li {
font-family:verdana, sans-serif;
font-size:80%;
color:black;
background-color:transparent;
text-align:left;
margin-left:0px;
margin-right:0px;
}
a:link {
font-family:verdana, sans-serif;
font-size:100%;
color:black;
background-color:transparent;
text-decoration:underline;
}
a:visited {
font-family:verdana, sans-serif;
font-size:100%;
color:black;
background-color:transparent;
text-decoration:underline;
}
a:hover {
font-family:verdana, sans-serif;
font-size:100%;
color:black;
background-color:transparent;
text-decoration:underline;
}
table {
border-color:transparent;
border-style:solid;
border-width:1px;
}
td {
font-family:verdana, sans-serif;
font-size:80%;
color:black;
text-align:left;
background-color:transparent;
border-color:transparent;
border-style:solid;
border-width:1px;
}
.tout {
margin: 5px;
padding: 0px;
border: 2px solid #aac;
background: #eef;
}
.prot {
border-style:solid;
border-width:2px;
border-color:#88F;
padding: 4px;
background-color:#cce;
margin: 5px 5px 5px 5px;
}
.ex {
border-style:solid;
border-width:2px;
border-color:#aaF;
padding: 4px;
background-color:#dde;
margin: 5px 5px 5px 5px;
}
.desc {
border-style:solid;
border-width:3px;
border-color:#66F;
padding: 4px;
background-color:#aac;
margin: 15px 5px 20px 5px;
}
#titre {
margin: 5px;
padding: 0px;
border: 5px solid #aac;
background: #eef;
}
#gauche {
float:left;
margin: 5px;
padding: 4px;
border: 5px solid #aac;
background: #bbf;
width: 130px;
}
#droite {
position: relative;
top:5px;
left:165px;
margin: 5px 170px 5px 5px;
padding: 10px;
border: 5px solid #aac;
background: #bbf;
}
/* boutons */
a.bouton:link{
width:128px;
height:34px;
text-decoration:none;
color:#aaa;
text-align:center;
font-weight:bold;
/*background-color:#444;*/
background-image:url(noclicked.png);
}
a.bouton:visited{
width:128px;
height:34px;
text-decoration:none;
color:#aaa;
text-align:center;
font-weight:bold;
/*background-color:#444;*/
background-image:url(noclicked.png);
}
a.bouton:hover{
width:128px;
height:34px;
text-decoration:none;
color:white;
text-align:center;
font-weight:bold;
/*background-color:#888;*/
background-image:url(clicked.png);
}
.bouton{
text-align:center;
display:block;
}

14
doc/tbd.dox Normal file
View File

@@ -0,0 +1,14 @@
/**
@page libssh_tutor_todo To be done
*** To be written ***
@section sshd Writing a libssh-based server
*** To be written ***
@section cpp The libssh C++ wrapper
*** To be written ***
*/

65
doc/threading.dox Normal file
View File

@@ -0,0 +1,65 @@
/**
@page libssh_tutor_threads Chapter 8: Threads with libssh
@section threads_with_libssh How to use libssh with threads
libssh may be used in multithreaded applications, but under several conditions :
- Threading must be initialized during the initialization of libssh. This
initialization must be done outside of any threading context.
- If pthreads is being used by your application (or your framework's backend),
you must link with libssh_threads_pthread dynamic library and initialize
threading with the ssh_threads_pthreads threading object.
- If an other threading library is being used by your application, you must
implement all the methods of the ssh_threads_callbacks_struct structure
and initialize libssh with it.
- At all times, you may use different sessions inside threads, make parallel
connections, read/write on different sessions and so on. You can use a
single session in several channels at the same time. This will lead to
internal state corruption. This limitation is being worked out and will
maybe disappear later.
@subsection threads_init Initialization of threads
To initialize threading, you must first select the threading model you want to
use, using ssh_threads_set_callbacks(), then call ssh_init().
@code
#include <libssh/callbacks.h>
...
ssh_threads_set_callbacks(ssh_threads_noop);
ssh_init();
@endcode
ssh_threads_noop is the threading structure that does nothing. It's the
threading callbacks being used by default when you're not using threading.
@subsection threads_pthread Using libpthread with libssh
If your application is using libpthread, you may simply use the libpthread
threading backend:
@code
#include <libssh/callbacks.h>
...
ssh_threads_set_callbacks(ssh_threads_pthread);
ssh_init();
@endcode
However, you must be sure to link with the library ssh_threads_pthread. If
you're using gcc, you must use the commandline
@code
gcc -o output input.c -lssh -lssh_threads_pthread
@endcode
@subsection threads_other Using another threading library
You must find your way in the ssh_threads_callbacks_struct structure. You must
implement the following methods :
- mutex_lock
- mutex_unlock
- mutex_init
- mutex_destroy
- thread_id
Good luck !
*/

48
examples/CMakeLists.txt Normal file
View File

@@ -0,0 +1,48 @@
project(libssh-examples C CXX)
set(examples_SRCS
authentication.c
knownhosts.c
connect_ssh.c
)
include_directories(
${LIBSSH_PUBLIC_INCLUDE_DIRS}
${CMAKE_BINARY_DIR}
)
if (LINUX)
add_executable(libssh_scp libssh_scp.c ${examples_SRCS})
target_link_libraries(libssh_scp ${LIBSSH_SHARED_LIBRARY})
add_executable(scp_download scp_download.c ${examples_SRCS})
target_link_libraries(scp_download ${LIBSSH_SHARED_LIBRARY})
add_executable(samplessh sample.c ${examples_SRCS})
target_link_libraries(samplessh ${LIBSSH_SHARED_LIBRARY})
add_executable(sshnetcat sshnetcat.c ${examples_SRCS})
target_link_libraries(sshnetcat ${LIBSSH_SHARED_LIBRARY})
if (WITH_SFTP)
add_executable(samplesftp samplesftp.c ${examples_SRCS})
target_link_libraries(samplesftp ${LIBSSH_SHARED_LIBRARY})
endif (WITH_SFTP)
if (WITH_SERVER)
add_executable(samplesshd samplesshd.c)
target_link_libraries(samplesshd ${LIBSSH_SHARED_LIBRARY})
endif (WITH_SERVER)
endif (LINUX)
add_executable(exec exec.c ${examples_SRCS})
target_link_libraries(exec ${LIBSSH_SHARED_LIBRARY})
add_executable(senddata senddata.c ${examples_SRCS})
target_link_libraries(senddata ${LIBSSH_SHARED_LIBRARY})
add_executable(libsshpp libsshpp.cpp)
target_link_libraries(libsshpp ${LIBSSH_SHARED_LIBRARY})
add_executable(libsshpp_noexcept libsshpp_noexcept.cpp)
target_link_libraries(libsshpp_noexcept ${LIBSSH_SHARED_LIBRARY})

164
examples/authentication.c Normal file
View File

@@ -0,0 +1,164 @@
/*
* authentication.c
* This file contains an example of how to do an authentication to a
* SSH server using libssh
*/
/*
Copyright 2003-2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libssh/libssh.h>
#include "examples_common.h"
int authenticate_kbdint(ssh_session session, const char *password) {
int err;
err = ssh_userauth_kbdint(session, NULL, NULL);
while (err == SSH_AUTH_INFO) {
const char *instruction;
const char *name;
char buffer[128];
int i, n;
name = ssh_userauth_kbdint_getname(session);
instruction = ssh_userauth_kbdint_getinstruction(session);
n = ssh_userauth_kbdint_getnprompts(session);
if (name && strlen(name) > 0) {
printf("%s\n", name);
}
if (instruction && strlen(instruction) > 0) {
printf("%s\n", instruction);
}
for (i = 0; i < n; i++) {
const char *answer;
const char *prompt;
char echo;
prompt = ssh_userauth_kbdint_getprompt(session, i, &echo);
if (prompt == NULL) {
break;
}
if (echo) {
char *p;
printf("%s", prompt);
if (fgets(buffer, sizeof(buffer), stdin) == NULL) {
return SSH_AUTH_ERROR;
}
buffer[sizeof(buffer) - 1] = '\0';
if ((p = strchr(buffer, '\n'))) {
*p = '\0';
}
if (ssh_userauth_kbdint_setanswer(session, i, buffer) < 0) {
return SSH_AUTH_ERROR;
}
memset(buffer, 0, strlen(buffer));
} else {
if (password && strstr(prompt, "Password:")) {
answer = password;
} else {
buffer[0] = '\0';
if (ssh_getpass(prompt, buffer, sizeof(buffer), 0, 0) < 0) {
return SSH_AUTH_ERROR;
}
answer = buffer;
}
if (ssh_userauth_kbdint_setanswer(session, i, answer) < 0) {
return SSH_AUTH_ERROR;
}
}
}
err=ssh_userauth_kbdint(session,NULL,NULL);
}
return err;
}
static void error(ssh_session session){
fprintf(stderr,"Authentication failed: %s\n",ssh_get_error(session));
}
int authenticate_console(ssh_session session){
int rc;
int method;
char password[128] = {0};
char *banner;
// Try to authenticate
rc = ssh_userauth_none(session, NULL);
if (rc == SSH_AUTH_ERROR) {
error(session);
return rc;
}
method = ssh_auth_list(session);
while (rc != SSH_AUTH_SUCCESS) {
// Try to authenticate with public key first
if (method & SSH_AUTH_METHOD_PUBLICKEY) {
rc = ssh_userauth_autopubkey(session, NULL);
if (rc == SSH_AUTH_ERROR) {
error(session);
return rc;
} else if (rc == SSH_AUTH_SUCCESS) {
break;
}
}
// Try to authenticate with keyboard interactive";
if (method & SSH_AUTH_METHOD_INTERACTIVE) {
rc = authenticate_kbdint(session, NULL);
if (rc == SSH_AUTH_ERROR) {
error(session);
return rc;
} else if (rc == SSH_AUTH_SUCCESS) {
break;
}
}
if (ssh_getpass("Password: ", password, sizeof(password), 0, 0) < 0) {
return SSH_AUTH_ERROR;
}
// Try to authenticate with password
if (method & SSH_AUTH_METHOD_PASSWORD) {
rc = ssh_userauth_password(session, NULL, password);
if (rc == SSH_AUTH_ERROR) {
error(session);
return rc;
} else if (rc == SSH_AUTH_SUCCESS) {
break;
}
}
}
banner = ssh_get_issue_banner(session);
if (banner) {
printf("%s\n",banner);
ssh_string_free_char(banner);
}
return rc;
}

67
examples/connect_ssh.c Normal file
View File

@@ -0,0 +1,67 @@
/*
* connect_ssh.c
* This file contains an example of how to connect to a
* SSH server using libssh
*/
/*
Copyright 2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include <libssh/libssh.h>
#include "examples_common.h"
#include <stdio.h>
ssh_session connect_ssh(const char *host, const char *user,int verbosity){
ssh_session session;
int auth=0;
session=ssh_new();
if (session == NULL) {
return NULL;
}
if(user != NULL){
if (ssh_options_set(session, SSH_OPTIONS_USER, user) < 0) {
ssh_free(session);
return NULL;
}
}
if (ssh_options_set(session, SSH_OPTIONS_HOST, host) < 0) {
ssh_free(session);
return NULL;
}
ssh_options_set(session, SSH_OPTIONS_LOG_VERBOSITY, &verbosity);
if(ssh_connect(session)){
fprintf(stderr,"Connection failed : %s\n",ssh_get_error(session));
ssh_disconnect(session);
ssh_free(session);
return NULL;
}
if(verify_knownhost(session)<0){
ssh_disconnect(session);
ssh_free(session);
return NULL;
}
auth=authenticate_console(session);
if(auth==SSH_AUTH_SUCCESS){
return session;
} else if(auth==SSH_AUTH_DENIED){
fprintf(stderr,"Authentication failed\n");
} else {
fprintf(stderr,"Error while authenticating : %s\n",ssh_get_error(session));
}
ssh_disconnect(session);
ssh_free(session);
return NULL;
}

View File

@@ -0,0 +1,22 @@
/*
Copyright 2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#ifndef EXAMPLES_COMMON_H_
#define EXAMPLES_COMMON_H_
#include <libssh/libssh.h>
int authenticate_console(ssh_session session);
int authenticate_kbdint(ssh_session session, const char *password);
int verify_knownhost(ssh_session session);
ssh_session connect_ssh(const char *hostname, const char *user, int verbosity);
#endif /* EXAMPLES_COMMON_H_ */

66
examples/exec.c Normal file
View File

@@ -0,0 +1,66 @@
/* simple exec example */
#include <stdio.h>
#include <libssh/libssh.h>
#include "examples_common.h"
int main(void) {
ssh_session session;
ssh_channel channel;
char buffer[256];
int nbytes;
int rc;
session = connect_ssh("localhost", NULL, 0);
if (session == NULL) {
ssh_finalize();
return 1;
}
channel = ssh_channel_new(session);;
if (channel == NULL) {
ssh_disconnect(session);
ssh_free(session);
ssh_finalize();
return 1;
}
rc = ssh_channel_open_session(channel);
if (rc < 0) {
goto failed;
}
rc = ssh_channel_request_exec(channel, "lsof");
if (rc < 0) {
goto failed;
}
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
while (nbytes > 0) {
if (fwrite(buffer, 1, nbytes, stdout) != (unsigned int) nbytes) {
goto failed;
}
nbytes = ssh_channel_read(channel, buffer, sizeof(buffer), 0);
}
if (nbytes < 0) {
goto failed;
}
ssh_channel_send_eof(channel);
ssh_channel_close(channel);
ssh_channel_free(channel);
ssh_disconnect(session);
ssh_free(session);
ssh_finalize();
return 0;
failed:
ssh_channel_close(channel);
ssh_channel_free(channel);
ssh_disconnect(session);
ssh_free(session);
ssh_finalize();
return 1;
}

98
examples/knownhosts.c Normal file
View File

@@ -0,0 +1,98 @@
/*
* knownhosts.c
* This file contains an example of how verify the identity of a
* SSH server using libssh
*/
/*
Copyright 2003-2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <libssh/libssh.h>
#include "examples_common.h"
#ifdef _WIN32
#define strncasecmp _strnicmp
#endif
int verify_knownhost(ssh_session session){
char *hexa;
int state;
char buf[10];
unsigned char *hash = NULL;
int hlen;
state=ssh_is_server_known(session);
hlen = ssh_get_pubkey_hash(session, &hash);
if (hlen < 0) {
return -1;
}
switch(state){
case SSH_SERVER_KNOWN_OK:
break; /* ok */
case SSH_SERVER_KNOWN_CHANGED:
fprintf(stderr,"Host key for server changed : server's one is now :\n");
ssh_print_hexa("Public key hash",hash, hlen);
ssh_clean_pubkey_hash(&hash);
fprintf(stderr,"For security reason, connection will be stopped\n");
return -1;
case SSH_SERVER_FOUND_OTHER:
fprintf(stderr,"The host key for this server was not found but an other type of key exists.\n");
fprintf(stderr,"An attacker might change the default server key to confuse your client"
"into thinking the key does not exist\n"
"We advise you to rerun the client with -d or -r for more safety.\n");
return -1;
case SSH_SERVER_FILE_NOT_FOUND:
fprintf(stderr,"Could not find known host file. If you accept the host key here,\n");
fprintf(stderr,"the file will be automatically created.\n");
/* fallback to SSH_SERVER_NOT_KNOWN behavior */
case SSH_SERVER_NOT_KNOWN:
hexa = ssh_get_hexa(hash, hlen);
fprintf(stderr,"The server is unknown. Do you trust the host key ?\n");
fprintf(stderr, "Public key hash: %s\n", hexa);
ssh_string_free_char(hexa);
if (fgets(buf, sizeof(buf), stdin) == NULL) {
ssh_clean_pubkey_hash(&hash);
return -1;
}
if(strncasecmp(buf,"yes",3)!=0){
ssh_clean_pubkey_hash(&hash);
return -1;
}
fprintf(stderr,"This new key will be written on disk for further usage. do you agree ?\n");
if (fgets(buf, sizeof(buf), stdin) == NULL) {
ssh_clean_pubkey_hash(&hash);
return -1;
}
if(strncasecmp(buf,"yes",3)==0){
if (ssh_write_knownhost(session) < 0) {
ssh_clean_pubkey_hash(&hash);
fprintf(stderr, "error %s\n", strerror(errno));
return -1;
}
}
break;
case SSH_SERVER_ERROR:
ssh_clean_pubkey_hash(&hash);
fprintf(stderr,"%s",ssh_get_error(session));
return -1;
}
ssh_clean_pubkey_hash(&hash);
return 0;
}

304
examples/libssh_scp.c Normal file
View File

@@ -0,0 +1,304 @@
/* libssh_scp.c
* Sample implementation of a SCP client
*/
/*
Copyright 2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
#include <libssh/libssh.h>
#include "examples_common.h"
char **sources;
int nsources;
char *destination;
int verbosity=0;
struct location {
int is_ssh;
char *user;
char *host;
char *path;
ssh_session session;
ssh_scp scp;
FILE *file;
};
enum {
READ,
WRITE
};
static void usage(const char *argv0){
fprintf(stderr,"Usage : %s [options] [[user@]host1:]file1 ... \n"
" [[user@]host2:]destination\n"
"sample scp client - libssh-%s\n",
// "Options :\n",
// " -r : use RSA to verify host public key\n",
argv0,
ssh_version(0));
exit(0);
}
static int opts(int argc, char **argv){
int i;
while((i=getopt(argc,argv,"v"))!=-1){
switch(i){
case 'v':
verbosity++;
break;
default:
fprintf(stderr,"unknown option %c\n",optopt);
usage(argv[0]);
return -1;
}
}
nsources=argc-optind-1;
if(nsources < 1){
usage(argv[0]);
return -1;
}
sources=malloc((nsources + 1) * sizeof(char *));
if(sources == NULL)
return -1;
for(i=0;i<nsources;++i){
sources[i] = argv[optind];
optind++;
}
sources[i]=NULL;
destination=argv[optind];
return 0;
}
static struct location *parse_location(char *loc){
struct location *location=malloc(sizeof(struct location));
char *ptr;
location->host=location->user=NULL;
ptr=strchr(loc,':');
if(ptr != NULL){
location->is_ssh=1;
location->path=strdup(ptr+1);
*ptr='\0';
ptr=strchr(loc,'@');
if(ptr != NULL){
location->host=strdup(ptr+1);
*ptr='\0';
location->user=strdup(loc);
} else {
location->host=strdup(loc);
}
} else {
location->is_ssh=0;
location->path=strdup(loc);
}
return location;
}
static int open_location(struct location *loc, int flag){
if(loc->is_ssh && flag==WRITE){
loc->session=connect_ssh(loc->host,loc->user,verbosity);
if(!loc->session){
fprintf(stderr,"Couldn't connect to %s\n",loc->host);
return -1;
}
loc->scp=ssh_scp_new(loc->session,SSH_SCP_WRITE,loc->path);
if(!loc->scp){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
return -1;
}
if(ssh_scp_init(loc->scp)==SSH_ERROR){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
ssh_scp_free(loc->scp);
return -1;
}
return 0;
} else if(loc->is_ssh && flag==READ){
loc->session=connect_ssh(loc->host, loc->user,verbosity);
if(!loc->session){
fprintf(stderr,"Couldn't connect to %s\n",loc->host);
return -1;
}
loc->scp=ssh_scp_new(loc->session,SSH_SCP_READ,loc->path);
if(!loc->scp){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
return -1;
}
if(ssh_scp_init(loc->scp)==SSH_ERROR){
fprintf(stderr,"error : %s\n",ssh_get_error(loc->session));
ssh_scp_free(loc->scp);
return -1;
}
return 0;
} else {
loc->file=fopen(loc->path,flag==READ ? "r":"w");
if(!loc->file){
if(errno==EISDIR){
if(chdir(loc->path)){
fprintf(stderr,"Error changing directory to %s: %s\n",loc->path,strerror(errno));
return -1;
}
return 0;
}
fprintf(stderr,"Error opening %s: %s\n",loc->path,strerror(errno));
return -1;
}
return 0;
}
return -1;
}
/** @brief copies files from source location to destination
* @param src source location
* @param dest destination location
* @param recursive Copy also directories
*/
static int do_copy(struct location *src, struct location *dest, int recursive){
int size;
socket_t fd;
struct stat s;
int w,r;
char buffer[16384];
int total=0;
int mode;
char *filename;
/* recursive mode doesn't work yet */
(void)recursive;
/* Get the file name and size*/
if(!src->is_ssh){
fd=fileno(src->file);
fstat(fd,&s);
size=s.st_size;
mode = s.st_mode & S_IFMT;
filename=ssh_basename(src->path);
} else {
size=0;
do {
r=ssh_scp_pull_request(src->scp);
if(r==SSH_SCP_REQUEST_NEWDIR){
ssh_scp_deny_request(src->scp,"Not in recursive mode");
continue;
}
if(r==SSH_SCP_REQUEST_NEWFILE){
size=ssh_scp_request_get_size(src->scp);
filename=strdup(ssh_scp_request_get_filename(src->scp));
mode=ssh_scp_request_get_permissions(src->scp);
//ssh_scp_accept_request(src->scp);
break;
}
if(r==SSH_ERROR){
fprintf(stderr,"Error: %s\n",ssh_get_error(src->session));
return -1;
}
} while(r != SSH_SCP_REQUEST_NEWFILE);
}
if(dest->is_ssh){
r=ssh_scp_push_file(dest->scp,src->path, size, mode);
// snprintf(buffer,sizeof(buffer),"C0644 %d %s\n",size,src->path);
if(r==SSH_ERROR){
fprintf(stderr,"error: %s\n",ssh_get_error(dest->session));
ssh_scp_free(dest->scp);
return -1;
}
} else {
if(!dest->file){
dest->file=fopen(filename,"w");
if(!dest->file){
fprintf(stderr,"Cannot open %s for writing: %s\n",filename,strerror(errno));
if(src->is_ssh)
ssh_scp_deny_request(src->scp,"Cannot open local file");
return -1;
}
}
if(src->is_ssh){
ssh_scp_accept_request(src->scp);
}
}
do {
if(src->is_ssh){
r=ssh_scp_read(src->scp,buffer,sizeof(buffer));
if(r==SSH_ERROR){
fprintf(stderr,"Error reading scp: %s\n",ssh_get_error(src->session));
return -1;
}
if(r==0)
break;
} else {
r=fread(buffer,1,sizeof(buffer),src->file);
if(r==0)
break;
if(r<0){
fprintf(stderr,"Error reading file: %s\n",strerror(errno));
return -1;
}
}
if(dest->is_ssh){
w=ssh_scp_write(dest->scp,buffer,r);
if(w == SSH_ERROR){
fprintf(stderr,"Error writing in scp: %s\n",ssh_get_error(dest->session));
ssh_scp_free(dest->scp);
dest->scp=NULL;
return -1;
}
} else {
w=fwrite(buffer,r,1,dest->file);
if(w<=0){
fprintf(stderr,"Error writing in local file: %s\n",strerror(errno));
return -1;
}
}
total+=r;
} while(total < size);
printf("wrote %d bytes\n",total);
return 0;
}
int main(int argc, char **argv){
struct location *dest, *src;
int i;
int r;
if(opts(argc,argv)<0)
return EXIT_FAILURE;
dest=parse_location(destination);
if(open_location(dest,WRITE)<0)
return EXIT_FAILURE;
for(i=0;i<nsources;++i){
src=parse_location(sources[i]);
if(open_location(src,READ)<0){
return EXIT_FAILURE;
}
if(do_copy(src,dest,0) < 0){
break;
}
}
if(dest->is_ssh){
r=ssh_scp_close(dest->scp);
if(r == SSH_ERROR){
fprintf(stderr,"Error closing scp: %s\n",ssh_get_error(dest->session));
ssh_scp_free(dest->scp);
dest->scp=NULL;
return -1;
}
} else {
fclose(dest->file);
dest->file=NULL;
}
ssh_disconnect(dest->session);
ssh_finalize();
return 0;
}

33
examples/libsshpp.cpp Normal file
View File

@@ -0,0 +1,33 @@
/*
Copyright 2010 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
*/
/* This file demonstrates the use of the C++ wrapper to libssh */
#include <iostream>
#include <string>
#include <libssh/libsshpp.hpp>
int main(int argc, const char **argv){
ssh::Session session;
try {
if(argc>1)
session.setOption(SSH_OPTIONS_HOST,argv[1]);
else
session.setOption(SSH_OPTIONS_HOST,"localhost");
session.connect();
session.userauthAutopubkey();
session.disconnect();
} catch (ssh::SshException e){
std::cout << "Error during connection : ";
std::cout << e.getError() << std::endl;
}
return 0;
}

View File

@@ -0,0 +1,41 @@
/*
Copyright 2010 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
*/
/* This file demonstrates the use of the C++ wrapper to libssh
* specifically, without C++ exceptions
*/
#include <iostream>
#define SSH_NO_CPP_EXCEPTIONS
#include <libssh/libsshpp.hpp>
int main(int argc, const char **argv){
ssh::Session session,s2;
int err;
if(argc>1)
err=session.setOption(SSH_OPTIONS_HOST,argv[1]);
else
err=session.setOption(SSH_OPTIONS_HOST,"localhost");
if(err==SSH_ERROR)
goto error;
err=session.connect();
if(err==SSH_ERROR)
goto error;
err=session.userauthAutopubkey();
if(err==SSH_ERROR)
goto error;
return 0;
error:
std::cout << "Error during connection : ";
std::cout << session.getError() << std::endl;
return 1;
}

538
examples/sample.c Normal file
View File

@@ -0,0 +1,538 @@
/* client.c */
/*
Copyright 2003-2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include "config.h"
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <termios.h>
#include <sys/select.h>
#include <sys/time.h>
#ifdef HAVE_PTY_H
#include <pty.h>
#endif
#include <sys/ioctl.h>
#include <signal.h>
#include <errno.h>
#include <libssh/callbacks.h>
#include <libssh/libssh.h>
#include <libssh/sftp.h>
#include <fcntl.h>
#include "examples_common.h"
#define MAXCMD 10
char *host;
char *user;
char *cmds[MAXCMD];
struct termios terminal;
char *pcap_file=NULL;
char *proxycommand;
static int auth_callback(const char *prompt, char *buf, size_t len,
int echo, int verify, void *userdata) {
char *answer = NULL;
char *ptr;
(void) verify;
(void) userdata;
if (echo) {
while ((answer = fgets(buf, len, stdin)) == NULL);
if ((ptr = strchr(buf, '\n'))) {
*ptr = '\0';
}
} else {
if (ssh_getpass(prompt, buf, len, 0, 0) < 0) {
return -1;
}
return 0;
}
if (answer == NULL) {
return -1;
}
strncpy(buf, answer, len);
return 0;
}
struct ssh_callbacks_struct cb = {
.auth_function=auth_callback,
.userdata=NULL
};
static void add_cmd(char *cmd){
int n;
for(n=0;cmds[n] && (n<MAXCMD);n++);
if(n==MAXCMD)
return;
cmds[n]=strdup(cmd);
}
static void usage(){
fprintf(stderr,"Usage : ssh [options] [login@]hostname\n"
"sample client - libssh-%s\n"
"Options :\n"
" -l user : log in as user\n"
" -p port : connect to port\n"
" -d : use DSS to verify host public key\n"
" -r : use RSA to verify host public key\n"
#ifdef WITH_PCAP
" -P file : create a pcap debugging file\n"
#endif
#ifndef _WIN32
" -T proxycommand : command to execute as a socket proxy\n"
#endif
,
ssh_version(0));
exit(0);
}
static int opts(int argc, char **argv){
int i;
// for(i=0;i<argc;i++)
// printf("%d : %s\n",i,argv[i]);
/* insert your own arguments here */
while((i=getopt(argc,argv,"T:P:"))!=-1){
switch(i){
case 'P':
pcap_file=optarg;
break;
#ifndef _WIN32
case 'T':
proxycommand=optarg;
break;
#endif
default:
fprintf(stderr,"unknown option %c\n",optopt);
usage();
}
}
if(optind < argc)
host=argv[optind++];
while(optind < argc)
add_cmd(argv[optind++]);
if(host==NULL)
usage();
return 0;
}
#ifndef HAVE_CFMAKERAW
static void cfmakeraw(struct termios *termios_p){
termios_p->c_iflag &= ~(IGNBRK|BRKINT|PARMRK|ISTRIP|INLCR|IGNCR|ICRNL|IXON);
termios_p->c_oflag &= ~OPOST;
termios_p->c_lflag &= ~(ECHO|ECHONL|ICANON|ISIG|IEXTEN);
termios_p->c_cflag &= ~(CSIZE|PARENB);
termios_p->c_cflag |= CS8;
}
#endif
static void do_cleanup(int i) {
/* unused variable */
(void) i;
tcsetattr(0,TCSANOW,&terminal);
}
static void do_exit(int i) {
/* unused variable */
(void) i;
do_cleanup(0);
exit(0);
}
ssh_channel chan;
int signal_delayed=0;
static void sigwindowchanged(int i){
(void) i;
signal_delayed=1;
}
static void setsignal(void){
signal(SIGWINCH, sigwindowchanged);
signal_delayed=0;
}
static void sizechanged(void){
struct winsize win = { 0, 0, 0, 0 };
ioctl(1, TIOCGWINSZ, &win);
ssh_channel_change_pty_size(chan,win.ws_col, win.ws_row);
// printf("Changed pty size\n");
setsignal();
}
/* There are two flavors of select loop: the one based on
* ssh_select and the one based on channel_select.
* The ssh_select one permits you to give your own file descriptors to
* follow. It is thus a complete select loop.
* The second one only selects on channels. It is simplier to use
* but doesn't permit you to fill in your own file descriptor. It is
* more adapted if you can't use ssh_select as a main loop (because
* you already have another main loop system).
*/
#ifdef USE_CHANNEL_SELECT
/* channel_select base main loop, with a standard select(2)
*/
static void select_loop(ssh_session session,ssh_channel channel){
fd_set fds;
struct timeval timeout;
char buffer[4096];
ssh_buffer readbuf=ssh_buffer_new();
ssh_channel channels[2];
int lus;
int eof=0;
int maxfd;
int ret;
while(channel){
/* when a signal is caught, ssh_select will return
* with SSH_EINTR, which means it should be started
* again. It lets you handle the signal the faster you
* can, like in this window changed example. Of course, if
* your signal handler doesn't call libssh at all, you're
* free to handle signals directly in sighandler.
*/
do{
FD_ZERO(&fds);
if(!eof)
FD_SET(0,&fds);
timeout.tv_sec=30;
timeout.tv_usec=0;
FD_SET(ssh_get_fd(session),&fds);
maxfd=ssh_get_fd(session)+1;
ret=select(maxfd,&fds,NULL,NULL,&timeout);
if(ret==EINTR)
continue;
if(FD_ISSET(0,&fds)){
lus=read(0,buffer,sizeof(buffer));
if(lus)
ssh_channel_write(channel,buffer,lus);
else {
eof=1;
ssh_channel_send_eof(channel);
}
}
if(FD_ISSET(ssh_get_fd(session),&fds)){
ssh_set_fd_toread(session);
}
channels[0]=channel; // set the first channel we want to read from
channels[1]=NULL;
ret=ssh_channel_select(channels,NULL,NULL,NULL); // no specific timeout - just poll
if(signal_delayed)
sizechanged();
} while (ret==EINTR || ret==SSH_EINTR);
// we already looked for input from stdin. Now, we are looking for input from the channel
if(channel && ssh_channel_is_closed(channel)){
ssh_log(session,SSH_LOG_RARE,"exit-status : %d",ssh_channel_get_exit_status(channel));
ssh_channel_free(channel);
channel=NULL;
channels[0]=NULL;
}
if(channels[0]){
while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,0)>0){
lus=channel_read_buffer(channel,readbuf,0,0);
if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session));
return;
}
if(lus==0){
ssh_log(session,SSH_LOG_RARE,"EOF received");
ssh_log(session,SSH_LOG_RARE,"exit-status : %d",ssh_channel_get_exit_status(channel));
ssh_channel_free(channel);
channel=channels[0]=NULL;
} else
if (write(1,ssh_buffer_get_begin(readbuf),lus) < 0) {
fprintf(stderr, "Error writing to buffer\n");
return;
}
}
while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,1)>0){ /* stderr */
lus=channel_read_buffer(channel,readbuf,0,1);
if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session));
return;
}
if(lus==0){
ssh_log(session,SSH_LOG_RARE,"EOF received");
ssh_log(session,SSH_LOG_RARE,"exit-status : %d",ssh_channel_get_exit_status(channel));
ssh_channel_free(channel);
channel=channels[0]=NULL;
} else
if (write(2,ssh_buffer_get_begin(readbuf),lus) < 0) {
fprintf(stderr, "Error writing to buffer\n");
return;
}
}
}
if(channel && ssh_channel_is_closed(channel)){
ssh_channel_free(channel);
channel=NULL;
}
}
ssh_buffer_free(readbuf);
}
#else /* CHANNEL_SELECT */
static void select_loop(ssh_session session,ssh_channel channel){
fd_set fds;
struct timeval timeout;
char buffer[4096];
/* channels will be set to the channels to poll.
* outchannels will contain the result of the poll
*/
ssh_channel channels[2], outchannels[2];
int lus;
int eof=0;
int maxfd;
int ret;
while(channel){
do{
FD_ZERO(&fds);
if(!eof)
FD_SET(0,&fds);
timeout.tv_sec=30;
timeout.tv_usec=0;
FD_SET(ssh_get_fd(session),&fds);
maxfd=ssh_get_fd(session)+1;
channels[0]=channel; // set the first channel we want to read from
channels[1]=NULL;
ret=ssh_select(channels,outchannels,maxfd,&fds,&timeout);
if(signal_delayed)
sizechanged();
if(ret==EINTR)
continue;
if(FD_ISSET(0,&fds)){
lus=read(0,buffer,sizeof(buffer));
if(lus)
ssh_channel_write(channel,buffer,lus);
else {
eof=1;
ssh_channel_send_eof(channel);
}
}
if(channel && ssh_channel_is_closed(channel)){
ssh_log(session,SSH_LOG_RARE,"exit-status : %d",ssh_channel_get_exit_status(channel));
ssh_channel_free(channel);
channel=NULL;
channels[0]=NULL;
}
if(outchannels[0]){
while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,0)!=0){
lus=ssh_channel_read(channel,buffer,sizeof(buffer),0);
if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session));
return;
}
if(lus==0){
ssh_log(session,SSH_LOG_RARE,"EOF received");
ssh_log(session,SSH_LOG_RARE,"exit-status : %d",ssh_channel_get_exit_status(channel));
ssh_channel_free(channel);
channel=channels[0]=NULL;
} else
if (write(1,buffer,lus) < 0) {
fprintf(stderr, "Error writing to buffer\n");
return;
}
}
while(channel && ssh_channel_is_open(channel) && ssh_channel_poll(channel,1)!=0){ /* stderr */
lus=ssh_channel_read(channel,buffer,sizeof(buffer),1);
if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session));
return;
}
if(lus==0){
ssh_log(session,SSH_LOG_RARE,"EOF received");
ssh_log(session,SSH_LOG_RARE,"exit-status : %d",ssh_channel_get_exit_status(channel));
ssh_channel_free(channel);
channel=channels[0]=NULL;
} else
if (write(2,buffer,lus) < 0) {
fprintf(stderr, "Error writing to buffer\n");
return;
}
}
}
if(channel && ssh_channel_is_closed(channel)){
ssh_channel_free(channel);
channel=NULL;
}
} while (ret==EINTR || ret==SSH_EINTR);
}
}
#endif
static void shell(ssh_session session){
ssh_channel channel;
struct termios terminal_local;
int interactive=isatty(0);
channel = ssh_channel_new(session);
if(interactive){
tcgetattr(0,&terminal_local);
memcpy(&terminal,&terminal_local,sizeof(struct termios));
}
if(ssh_channel_open_session(channel)){
printf("error opening channel : %s\n",ssh_get_error(session));
return;
}
chan=channel;
if(interactive){
ssh_channel_request_pty(channel);
sizechanged();
}
if(ssh_channel_request_shell(channel)){
printf("Requesting shell : %s\n",ssh_get_error(session));
return;
}
if(interactive){
cfmakeraw(&terminal_local);
tcsetattr(0,TCSANOW,&terminal_local);
setsignal();
}
signal(SIGTERM,do_cleanup);
select_loop(session,channel);
if(interactive)
do_cleanup(0);
}
static void batch_shell(ssh_session session){
ssh_channel channel;
char buffer[1024];
int i,s=0;
for(i=0;i<MAXCMD && cmds[i];++i) {
s+=snprintf(buffer+s,sizeof(buffer)-s,"%s ",cmds[i]);
free(cmds[i]);
cmds[i] = NULL;
}
channel=ssh_channel_new(session);
ssh_channel_open_session(channel);
if(ssh_channel_request_exec(channel,buffer)){
printf("error executing \"%s\" : %s\n",buffer,ssh_get_error(session));
return;
}
select_loop(session,channel);
}
static int client(ssh_session session){
int auth=0;
char *banner;
int state;
if (user)
if (ssh_options_set(session, SSH_OPTIONS_USER, user) < 0)
return -1;
if (ssh_options_set(session, SSH_OPTIONS_HOST ,host) < 0)
return -1;
if (proxycommand != NULL){
if(ssh_options_set(session, SSH_OPTIONS_PROXYCOMMAND, proxycommand))
return -1;
}
ssh_options_parse_config(session, NULL);
if(ssh_connect(session)){
fprintf(stderr,"Connection failed : %s\n",ssh_get_error(session));
return -1;
}
state=verify_knownhost(session);
if (state != 0)
return -1;
ssh_userauth_none(session, NULL);
banner=ssh_get_issue_banner(session);
if(banner){
printf("%s\n",banner);
free(banner);
}
auth=authenticate_console(session);
if(auth != SSH_AUTH_SUCCESS){
return -1;
}
ssh_log(session, SSH_LOG_FUNCTIONS, "Authentication success");
if(!cmds[0])
shell(session);
else
batch_shell(session);
return 0;
}
ssh_pcap_file pcap;
void set_pcap(ssh_session session);
void set_pcap(ssh_session session){
if(!pcap_file)
return;
pcap=ssh_pcap_file_new();
if(!pcap)
return;
if(ssh_pcap_file_open(pcap,pcap_file) == SSH_ERROR){
printf("Error opening pcap file\n");
ssh_pcap_file_free(pcap);
pcap=NULL;
return;
}
ssh_set_pcap_file(session,pcap);
}
void cleanup_pcap(void);
void cleanup_pcap(){
if(pcap)
ssh_pcap_file_free(pcap);
pcap=NULL;
}
int main(int argc, char **argv){
ssh_session session;
session = ssh_new();
ssh_callbacks_init(&cb);
ssh_set_callbacks(session,&cb);
if(ssh_options_getopt(session, &argc, argv)) {
fprintf(stderr, "error parsing command line :%s\n",
ssh_get_error(session));
usage();
}
opts(argc,argv);
signal(SIGTERM, do_exit);
set_pcap(session);
client(session);
ssh_disconnect(session);
ssh_free(session);
cleanup_pcap();
ssh_finalize();
return 0;
}

265
examples/samplesftp.c Normal file
View File

@@ -0,0 +1,265 @@
/*
Copyright 2003-2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include "config.h"
#include <sys/statvfs.h>
#include <stdio.h>
#include <unistd.h>
#include <errno.h>
#include <fcntl.h>
#include <stdlib.h>
#include <string.h>
#include <libssh/libssh.h>
#include <libssh/sftp.h>
#include "examples_common.h"
#ifdef WITH_SFTP
int verbosity;
char *destination;
#define DATALEN 65536
static void do_sftp(ssh_session session){
sftp_session sftp=sftp_new(session);
sftp_dir dir;
sftp_attributes file;
sftp_statvfs_t sftpstatvfs;
struct statvfs sysstatvfs;
sftp_file fichier;
sftp_file to;
int len=1;
unsigned int i;
char data[DATALEN]={0};
char *lnk;
unsigned int count;
if(!sftp){
fprintf(stderr, "sftp error initialising channel: %s\n",
ssh_get_error(session));
return;
}
if(sftp_init(sftp)){
fprintf(stderr, "error initialising sftp: %s\n",
ssh_get_error(session));
return;
}
printf("Additional SFTP extensions provided by the server:\n");
count = sftp_extensions_get_count(sftp);
for (i = 0; i < count; i++) {
printf("\t%s, version: %s\n",
sftp_extensions_get_name(sftp, i),
sftp_extensions_get_data(sftp, i));
}
/* test symlink and readlink */
if (sftp_symlink(sftp, "/tmp/this_is_the_link",
"/tmp/sftp_symlink_test") < 0) {
fprintf(stderr, "Could not create link (%s)\n", ssh_get_error(session));
return;
}
lnk = sftp_readlink(sftp, "/tmp/sftp_symlink_test");
if (lnk == NULL) {
fprintf(stderr, "Could not read link (%s)\n", ssh_get_error(session));
return;
}
printf("readlink /tmp/sftp_symlink_test: %s\n", lnk);
sftp_unlink(sftp, "/tmp/sftp_symlink_test");
if (sftp_extension_supported(sftp, "statvfs@openssh.com", "2")) {
sftpstatvfs = sftp_statvfs(sftp, "/tmp");
if (sftpstatvfs == NULL) {
fprintf(stderr, "statvfs failed (%s)\n", ssh_get_error(session));
return;
}
printf("sftp statvfs:\n"
"\tfile system block size: %llu\n"
"\tfundamental fs block size: %llu\n"
"\tnumber of blocks (unit f_frsize): %llu\n"
"\tfree blocks in file system: %llu\n"
"\tfree blocks for non-root: %llu\n"
"\ttotal file inodes: %llu\n"
"\tfree file inodes: %llu\n"
"\tfree file inodes for to non-root: %llu\n"
"\tfile system id: %llu\n"
"\tbit mask of f_flag values: %llu\n"
"\tmaximum filename length: %llu\n",
(unsigned long long) sftpstatvfs->f_bsize,
(unsigned long long) sftpstatvfs->f_frsize,
(unsigned long long) sftpstatvfs->f_blocks,
(unsigned long long) sftpstatvfs->f_bfree,
(unsigned long long) sftpstatvfs->f_bavail,
(unsigned long long) sftpstatvfs->f_files,
(unsigned long long) sftpstatvfs->f_ffree,
(unsigned long long) sftpstatvfs->f_favail,
(unsigned long long) sftpstatvfs->f_fsid,
(unsigned long long) sftpstatvfs->f_flag,
(unsigned long long) sftpstatvfs->f_namemax);
sftp_statvfs_free(sftpstatvfs);
if (statvfs("/tmp", &sysstatvfs) < 0) {
fprintf(stderr, "statvfs failed (%s)\n", strerror(errno));
return;
}
printf("sys statvfs:\n"
"\tfile system block size: %llu\n"
"\tfundamental fs block size: %llu\n"
"\tnumber of blocks (unit f_frsize): %llu\n"
"\tfree blocks in file system: %llu\n"
"\tfree blocks for non-root: %llu\n"
"\ttotal file inodes: %llu\n"
"\tfree file inodes: %llu\n"
"\tfree file inodes for to non-root: %llu\n"
"\tfile system id: %llu\n"
"\tbit mask of f_flag values: %llu\n"
"\tmaximum filename length: %llu\n",
(unsigned long long) sysstatvfs.f_bsize,
(unsigned long long) sysstatvfs.f_frsize,
(unsigned long long) sysstatvfs.f_blocks,
(unsigned long long) sysstatvfs.f_bfree,
(unsigned long long) sysstatvfs.f_bavail,
(unsigned long long) sysstatvfs.f_files,
(unsigned long long) sysstatvfs.f_ffree,
(unsigned long long) sysstatvfs.f_favail,
(unsigned long long) sysstatvfs.f_fsid,
(unsigned long long) sysstatvfs.f_flag,
(unsigned long long) sysstatvfs.f_namemax);
}
/* the connection is made */
/* opening a directory */
dir=sftp_opendir(sftp,"./");
if(!dir) {
fprintf(stderr, "Directory not opened(%s)\n", ssh_get_error(session));
return ;
}
/* reading the whole directory, file by file */
while((file=sftp_readdir(sftp,dir))){
fprintf(stderr, "%30s(%.8o) : %s(%.5d) %s(%.5d) : %.10llu bytes\n",
file->name,
file->permissions,
file->owner,
file->uid,
file->group,
file->gid,
(long long unsigned int) file->size);
sftp_attributes_free(file);
}
/* when file=NULL, an error has occured OR the directory listing is end of file */
if(!sftp_dir_eof(dir)){
fprintf(stderr, "Error: %s\n", ssh_get_error(session));
return;
}
if(sftp_closedir(dir)){
fprintf(stderr, "Error: %s\n", ssh_get_error(session));
return;
}
/* this will open a file and copy it into your /home directory */
/* the small buffer size was intended to stress the library. of course, you can use a buffer till 20kbytes without problem */
fichier=sftp_open(sftp,"/usr/bin/ssh",O_RDONLY, 0);
if(!fichier){
fprintf(stderr, "Error opening /usr/bin/ssh: %s\n",
ssh_get_error(session));
return;
}
/* open a file for writing... */
to=sftp_open(sftp,"ssh-copy",O_WRONLY | O_CREAT, 0700);
if(!to){
fprintf(stderr, "Error opening ssh-copy for writing: %s\n",
ssh_get_error(session));
return;
}
while((len=sftp_read(fichier,data,4096)) > 0){
if(sftp_write(to,data,len)!=len){
fprintf(stderr, "Error writing %d bytes: %s\n",
len, ssh_get_error(session));
return;
}
}
printf("finished\n");
if(len<0)
fprintf(stderr, "Error reading file: %s\n", ssh_get_error(session));
sftp_close(fichier);
sftp_close(to);
printf("fichiers ferm\n");
to=sftp_open(sftp,"/tmp/grosfichier",O_WRONLY|O_CREAT, 0644);
for(i=0;i<1000;++i){
len=sftp_write(to,data,DATALEN);
printf("wrote %d bytes\n",len);
if(len != DATALEN){
printf("chunk %d : %d (%s)\n",i,len,ssh_get_error(session));
}
}
sftp_close(to);
/* close the sftp session */
sftp_free(sftp);
printf("sftp session terminated\n");
}
static void usage(const char *argv0){
fprintf(stderr,"Usage : %s [-v] remotehost\n"
"sample sftp test client - libssh-%s\n"
"Options :\n"
" -v : increase log verbosity\n",
argv0,
ssh_version(0));
exit(0);
}
static int opts(int argc, char **argv){
int i;
while((i=getopt(argc,argv,"v"))!=-1){
switch(i){
case 'v':
verbosity++;
break;
default:
fprintf(stderr,"unknown option %c\n",optopt);
usage(argv[0]);
return -1;
}
}
destination=argv[optind];
if(destination == NULL){
usage(argv[0]);
return -1;
}
return 0;
}
int main(int argc, char **argv){
ssh_session session;
if(opts(argc,argv)<0)
return EXIT_FAILURE;
session=connect_ssh(destination,NULL,verbosity);
if(session == NULL)
return EXIT_FAILURE;
do_sftp(session);
ssh_disconnect(session);
ssh_free(session);
return 0;
}
#endif

308
examples/samplesshd.c Normal file
View File

@@ -0,0 +1,308 @@
/* This is a sample implementation of a libssh based SSH server */
/*
Copyright 2003-2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include "config.h"
#include <libssh/libssh.h>
#include <libssh/server.h>
#ifdef HAVE_ARGP_H
#include <argp.h>
#endif
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#ifndef KEYS_FOLDER
#ifdef _WIN32
#define KEYS_FOLDER
#else
#define KEYS_FOLDER "/etc/ssh/"
#endif
#endif
#ifdef WITH_PCAP
const char *pcap_file="debug.server.pcap";
ssh_pcap_file pcap;
void set_pcap(ssh_session session);
void set_pcap(ssh_session session){
if(!pcap_file)
return;
pcap=ssh_pcap_file_new();
if(ssh_pcap_file_open(pcap,pcap_file) == SSH_ERROR){
printf("Error opening pcap file\n");
ssh_pcap_file_free(pcap);
pcap=NULL;
return;
}
ssh_set_pcap_file(session,pcap);
}
void cleanup_pcap(void);
void cleanup_pcap(){
ssh_pcap_file_free(pcap);
pcap=NULL;
}
#endif
static int auth_password(char *user, char *password){
if(strcmp(user,"aris"))
return 0;
if(strcmp(password,"lala"))
return 0;
return 1; // authenticated
}
#ifdef HAVE_ARGP_H
const char *argp_program_version = "libssh server example "
SSH_STRINGIFY(LIBSSH_VERSION);
const char *argp_program_bug_address = "<libssh@libssh.org>";
/* Program documentation. */
static char doc[] = "libssh -- a Secure Shell protocol implementation";
/* A description of the arguments we accept. */
static char args_doc[] = "BINDADDR";
/* The options we understand. */
static struct argp_option options[] = {
{
.name = "port",
.key = 'p',
.arg = "PORT",
.flags = 0,
.doc = "Set the port to bind.",
.group = 0
},
{
.name = "hostkey",
.key = 'k',
.arg = "FILE",
.flags = 0,
.doc = "Set the host key.",
.group = 0
},
{
.name = "dsakey",
.key = 'd',
.arg = "FILE",
.flags = 0,
.doc = "Set the dsa key.",
.group = 0
},
{
.name = "rsakey",
.key = 'r',
.arg = "FILE",
.flags = 0,
.doc = "Set the rsa key.",
.group = 0
},
{
.name = "verbose",
.key = 'v',
.arg = NULL,
.flags = 0,
.doc = "Get verbose output.",
.group = 0
},
{NULL, 0, 0, 0, NULL, 0}
};
/* Parse a single option. */
static error_t parse_opt (int key, char *arg, struct argp_state *state) {
/* Get the input argument from argp_parse, which we
* know is a pointer to our arguments structure.
*/
ssh_bind sshbind = state->input;
switch (key) {
case 'p':
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDPORT_STR, arg);
break;
case 'd':
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_DSAKEY, arg);
break;
case 'k':
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_HOSTKEY, arg);
break;
case 'r':
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_RSAKEY, arg);
break;
case 'v':
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_LOG_VERBOSITY_STR, "3");
break;
case ARGP_KEY_ARG:
if (state->arg_num >= 1) {
/* Too many arguments. */
argp_usage (state);
}
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_BINDADDR, arg);
break;
case ARGP_KEY_END:
if (state->arg_num < 1) {
/* Not enough arguments. */
argp_usage (state);
}
break;
default:
return ARGP_ERR_UNKNOWN;
}
return 0;
}
/* Our argp parser. */
static struct argp argp = {options, parse_opt, args_doc, doc, NULL, NULL, NULL};
#endif /* HAVE_ARGP_H */
int main(int argc, char **argv){
ssh_session session;
ssh_bind sshbind;
ssh_message message;
ssh_channel chan=0;
char buf[2048];
int auth=0;
int sftp=0;
int i;
int r;
sshbind=ssh_bind_new();
session=ssh_new();
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_DSAKEY, KEYS_FOLDER "ssh_host_dsa_key");
ssh_bind_options_set(sshbind, SSH_BIND_OPTIONS_RSAKEY, KEYS_FOLDER "ssh_host_rsa_key");
#ifdef HAVE_ARGP_H
/*
* Parse our arguments; every option seen by parse_opt will
* be reflected in arguments.
*/
argp_parse (&argp, argc, argv, 0, 0, sshbind);
#else
(void) argc;
(void) argv;
#endif
#ifdef WITH_PCAP
set_pcap(session);
#endif
if(ssh_bind_listen(sshbind)<0){
printf("Error listening to socket: %s\n",ssh_get_error(sshbind));
return 1;
}
r=ssh_bind_accept(sshbind,session);
if(r==SSH_ERROR){
printf("error accepting a connection : %s\n",ssh_get_error(sshbind));
return 1;
}
if (ssh_handle_key_exchange(session)) {
printf("ssh_handle_key_exchange: %s\n", ssh_get_error(session));
return 1;
}
do {
message=ssh_message_get(session);
if(!message)
break;
switch(ssh_message_type(message)){
case SSH_REQUEST_AUTH:
switch(ssh_message_subtype(message)){
case SSH_AUTH_METHOD_PASSWORD:
printf("User %s wants to auth with pass %s\n",
ssh_message_auth_user(message),
ssh_message_auth_password(message));
if(auth_password(ssh_message_auth_user(message),
ssh_message_auth_password(message))){
auth=1;
ssh_message_auth_reply_success(message,0);
break;
}
// not authenticated, send default message
case SSH_AUTH_METHOD_NONE:
default:
ssh_message_auth_set_methods(message,SSH_AUTH_METHOD_PASSWORD);
ssh_message_reply_default(message);
break;
}
break;
default:
ssh_message_reply_default(message);
}
ssh_message_free(message);
} while (!auth);
if(!auth){
printf("auth error: %s\n",ssh_get_error(session));
ssh_disconnect(session);
return 1;
}
do {
message=ssh_message_get(session);
if(message){
switch(ssh_message_type(message)){
case SSH_REQUEST_CHANNEL_OPEN:
if(ssh_message_subtype(message)==SSH_CHANNEL_SESSION){
chan=ssh_message_channel_request_open_reply_accept(message);
break;
}
default:
ssh_message_reply_default(message);
}
ssh_message_free(message);
}
} while(message && !chan);
if(!chan){
printf("error : %s\n",ssh_get_error(session));
ssh_finalize();
return 1;
}
do {
message=ssh_message_get(session);
if(message && ssh_message_type(message)==SSH_REQUEST_CHANNEL &&
ssh_message_subtype(message)==SSH_CHANNEL_REQUEST_SHELL){
// if(!strcmp(ssh_message_channel_request_subsystem(message),"sftp")){
sftp=1;
ssh_message_channel_request_reply_success(message);
break;
// }
}
if(!sftp){
ssh_message_reply_default(message);
}
ssh_message_free(message);
} while (message && !sftp);
if(!sftp){
printf("error : %s\n",ssh_get_error(session));
return 1;
}
printf("it works !\n");
do{
i=ssh_channel_read(chan,buf, 2048, 0);
if(i>0) {
ssh_channel_write(chan, buf, i);
if (write(1,buf,i) < 0) {
printf("error writing to buffer\n");
return 1;
}
}
} while (i>0);
ssh_disconnect(session);
ssh_bind_free(sshbind);
#ifdef WITH_PCAP
cleanup_pcap();
#endif
ssh_finalize();
return 0;
}

165
examples/scp_download.c Normal file
View File

@@ -0,0 +1,165 @@
/* scp_download.c
* Sample implementation of a tiny SCP downloader client
*/
/*
Copyright 2009 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
*/
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <sys/stat.h>
#include <libssh/libssh.h>
#include "examples_common.h"
int verbosity=0;
const char *createcommand="rm -fr /tmp/libssh_tests && mkdir /tmp/libssh_tests && cd /tmp/libssh_tests && date > a && date > b && mkdir c && date > d";
char *host=NULL;
static void usage(const char *argv0){
fprintf(stderr,"Usage : %s [options] host\n"
"sample tiny scp downloader client - libssh-%s\n"
"This program will create files in /tmp and try to fetch them\n",
// "Options :\n",
// " -r : use RSA to verify host public key\n",
argv0,
ssh_version(0));
exit(0);
}
static int opts(int argc, char **argv){
int i;
while((i=getopt(argc,argv,"v"))!=-1){
switch(i){
case 'v':
verbosity++;
break;
default:
fprintf(stderr,"unknown option %c\n",optopt);
usage(argv[0]);
return -1;
}
}
host = argv[optind];
if(host == NULL)
usage(argv[0]);
return 0;
}
static void create_files(ssh_session session){
ssh_channel channel=ssh_channel_new(session);
char buffer[1];
if(channel == NULL){
fprintf(stderr,"Error creating channel: %s\n",ssh_get_error(session));
exit(EXIT_FAILURE);
}
if(ssh_channel_open_session(channel) != SSH_OK){
fprintf(stderr,"Error creating channel: %s\n",ssh_get_error(session));
ssh_channel_free(channel);
exit(EXIT_FAILURE);
}
if(ssh_channel_request_exec(channel,createcommand) != SSH_OK){
fprintf(stderr,"Error executing command: %s\n",ssh_get_error(session));
ssh_channel_close(channel);
ssh_channel_free(channel);
exit(EXIT_FAILURE);
}
while(!ssh_channel_is_eof(channel)){
ssh_channel_read(channel,buffer,1,1);
if (write(1,buffer,1) < 0) {
fprintf(stderr, "Error writing to buffer\n");
ssh_channel_close(channel);
ssh_channel_free(channel);
return;
}
}
ssh_channel_close(channel);
ssh_channel_free(channel);
}
static int fetch_files(ssh_session session){
int size;
char buffer[16384];
int mode;
char *filename;
int r;
ssh_scp scp=ssh_scp_new(session, SSH_SCP_READ | SSH_SCP_RECURSIVE, "/tmp/libssh_tests/*");
if(ssh_scp_init(scp) != SSH_OK){
fprintf(stderr,"error initializing scp: %s\n",ssh_get_error(session));
ssh_scp_free(scp);
return -1;
}
printf("Trying to download 3 files (a,b,d) and 1 directory (c)\n");
do {
r=ssh_scp_pull_request(scp);
switch(r){
case SSH_SCP_REQUEST_NEWFILE:
size=ssh_scp_request_get_size(scp);
filename=strdup(ssh_scp_request_get_filename(scp));
mode=ssh_scp_request_get_permissions(scp);
printf("downloading file %s, size %d, perms 0%o\n",filename,size,mode);
free(filename);
ssh_scp_accept_request(scp);
r=ssh_scp_read(scp,buffer,sizeof(buffer));
if(r==SSH_ERROR){
fprintf(stderr,"Error reading scp: %s\n",ssh_get_error(session));
ssh_scp_close(scp);
ssh_scp_free(scp);
return -1;
}
printf("done\n");
break;
case SSH_ERROR:
fprintf(stderr,"Error: %s\n",ssh_get_error(session));
ssh_scp_close(scp);
ssh_scp_free(scp);
return -1;
case SSH_SCP_REQUEST_WARNING:
fprintf(stderr,"Warning: %s\n",ssh_scp_request_get_warning(scp));
break;
case SSH_SCP_REQUEST_NEWDIR:
filename=strdup(ssh_scp_request_get_filename(scp));
mode=ssh_scp_request_get_permissions(scp);
printf("downloading directory %s, perms 0%o\n",filename,mode);
free(filename);
ssh_scp_accept_request(scp);
break;
case SSH_SCP_REQUEST_ENDDIR:
printf("End of directory\n");
break;
case SSH_SCP_REQUEST_EOF:
printf("End of requests\n");
goto end;
}
} while (1);
end:
ssh_scp_close(scp);
ssh_scp_free(scp);
return 0;
}
int main(int argc, char **argv){
ssh_session session;
if(opts(argc,argv)<0)
return EXIT_FAILURE;
session=connect_ssh(host,NULL,verbosity);
if(session == NULL)
return EXIT_FAILURE;
create_files(session);
fetch_files(session);
ssh_disconnect(session);
ssh_free(session);
ssh_finalize();
return 0;
}

64
examples/senddata.c Normal file
View File

@@ -0,0 +1,64 @@
#include <stdio.h>
#include <libssh/libssh.h>
#include "examples_common.h"
#define LIMIT 0x100000000
int main(void) {
ssh_session session;
ssh_channel channel;
char buffer[1024*1024];
int rc;
uint64_t total=0;
uint64_t lastshown=4096;
session = connect_ssh("localhost", NULL, 0);
if (session == NULL) {
return 1;
}
channel = ssh_channel_new(session);;
if (channel == NULL) {
ssh_disconnect(session);
return 1;
}
rc = ssh_channel_open_session(channel);
if (rc < 0) {
ssh_channel_close(channel);
ssh_disconnect(session);
return 1;
}
rc = ssh_channel_request_exec(channel, "cat > /dev/null");
if (rc < 0) {
ssh_channel_close(channel);
ssh_disconnect(session);
return 1;
}
while ((rc = ssh_channel_write(channel, buffer, sizeof(buffer))) > 0) {
total += rc;
if(total/2 >= lastshown){
printf("written %llx\n", (long long unsigned int) total);
lastshown=total;
}
if(total > LIMIT)
break;
}
if (rc < 0) {
printf("error : %s\n",ssh_get_error(session));
ssh_channel_close(channel);
ssh_disconnect(session);
return 1;
}
ssh_channel_send_eof(channel);
ssh_channel_close(channel);
ssh_disconnect(session);
return 0;
}

258
examples/sshnetcat.c Normal file
View File

@@ -0,0 +1,258 @@
/*
Copyright 2010 Aris Adamantiadis
This file is part of the SSH Library
You are free to copy this file, modify it in any way, consider it being public
domain. This does not apply to the rest of the library though, but it is
allowed to cut-and-paste working code from this file to any license of
program.
The goal is to show the API in action. It's not a reference on how terminal
clients must be made or how a client should react.
*/
#include "config.h"
#include <stdio.h>
#include <unistd.h>
#include <stdlib.h>
#include <string.h>
#include <termios.h>
#include <sys/select.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#include <errno.h>
#include <libssh/callbacks.h>
#include <libssh/libssh.h>
#include <libssh/sftp.h>
#include <fcntl.h>
#include "examples_common.h"
char *host;
const char *desthost="localhost";
const char *port="22";
#ifdef WITH_PCAP
#include <libssh/pcap.h>
char *pcap_file=NULL;
#endif
static void usage(){
fprintf(stderr,"Usage : sshnetcat [user@]host forwarded_host forwarded_port\n");
exit(1);
}
static int opts(int argc, char **argv){
int i;
while((i=getopt(argc,argv,"P:"))!=-1){
switch(i){
#ifdef WITH_PCAP
case 'P':
pcap_file=optarg;
break;
#endif
default:
fprintf(stderr,"unknown option %c\n",optopt);
usage();
}
}
if(optind < argc)
host=argv[optind++];
if(optind < argc)
desthost=argv[optind++];
if(optind < argc)
port=argv[optind++];
if(host==NULL)
usage();
return 0;
}
static void select_loop(ssh_session session,ssh_channel channel){
fd_set fds;
struct timeval timeout;
char buffer[4096];
/* channels will be set to the channels to poll.
* outchannels will contain the result of the poll
*/
ssh_channel channels[2], outchannels[2];
int lus;
int eof=0;
int maxfd;
int ret;
while(channel){
do{
FD_ZERO(&fds);
if(!eof)
FD_SET(0,&fds);
timeout.tv_sec=30;
timeout.tv_usec=0;
FD_SET(ssh_get_fd(session),&fds);
maxfd=ssh_get_fd(session)+1;
channels[0]=channel; // set the first channel we want to read from
channels[1]=NULL;
ret=ssh_select(channels,outchannels,maxfd,&fds,&timeout);
if(ret==EINTR)
continue;
if(FD_ISSET(0,&fds)){
lus=read(0,buffer,sizeof(buffer));
if(lus)
channel_write(channel,buffer,lus);
else {
eof=1;
channel_send_eof(channel);
}
}
if(channel && channel_is_closed(channel)){
ssh_log(session,SSH_LOG_RARE,"exit-status : %d\n",channel_get_exit_status(channel));
channel_free(channel);
channel=NULL;
channels[0]=NULL;
}
if(outchannels[0]){
while(channel && channel_is_open(channel) && channel_poll(channel,0)){
lus=channel_read(channel,buffer,sizeof(buffer),0);
if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session));
return;
}
if(lus==0){
ssh_log(session,SSH_LOG_RARE,"EOF received\n");
ssh_log(session,SSH_LOG_RARE,"exit-status : %d\n",channel_get_exit_status(channel));
channel_free(channel);
channel=channels[0]=NULL;
} else {
ret = write(1, buffer, lus);
if (ret < 0) {
fprintf(stderr, "Error writing to stdin: %s",
strerror(errno));
return;
}
}
}
while(channel && channel_is_open(channel) && channel_poll(channel,1)){ /* stderr */
lus=channel_read(channel,buffer,sizeof(buffer),1);
if(lus==-1){
fprintf(stderr, "Error reading channel: %s\n",
ssh_get_error(session));
return;
}
if(lus==0){
ssh_log(session,SSH_LOG_RARE,"EOF received\n");
ssh_log(session,SSH_LOG_RARE,"exit-status : %d\n",channel_get_exit_status(channel));
channel_free(channel);
channel=channels[0]=NULL;
} else
ret = write(2, buffer, lus);
if (ret < 0) {
fprintf(stderr, "Error writing to stderr: %s",
strerror(errno));
return;
}
}
}
if(channel && channel_is_closed(channel)){
channel_free(channel);
channel=NULL;
}
} while (ret==EINTR || ret==SSH_EINTR);
}
}
static void forwarding(ssh_session session){
ssh_channel channel;
int r;
channel=channel_new(session);
r=channel_open_forward(channel,desthost,atoi(port),"localhost",22);
if(r<0) {
printf("error forwarding port : %s\n",ssh_get_error(session));
return;
}
select_loop(session,channel);
}
static int client(ssh_session session){
int auth=0;
char *banner;
int state;
if (ssh_options_set(session, SSH_OPTIONS_HOST ,host) < 0)
return -1;
ssh_options_parse_config(session, NULL);
if(ssh_connect(session)){
fprintf(stderr,"Connection failed : %s\n",ssh_get_error(session));
return -1;
}
state=verify_knownhost(session);
if (state != 0)
return -1;
ssh_userauth_none(session, NULL);
banner=ssh_get_issue_banner(session);
if(banner){
printf("%s\n",banner);
free(banner);
}
auth=authenticate_console(session);
if(auth != SSH_AUTH_SUCCESS){
return -1;
}
ssh_log(session, SSH_LOG_FUNCTIONS, "Authentication success");
forwarding(session);
return 0;
}
#ifdef WITH_PCAP
ssh_pcap_file pcap;
void set_pcap(ssh_session session);
void set_pcap(ssh_session session){
if(!pcap_file)
return;
pcap=ssh_pcap_file_new();
if(ssh_pcap_file_open(pcap,pcap_file) == SSH_ERROR){
printf("Error opening pcap file\n");
ssh_pcap_file_free(pcap);
pcap=NULL;
return;
}
ssh_set_pcap_file(session,pcap);
}
void cleanup_pcap(void);
void cleanup_pcap(){
ssh_pcap_file_free(pcap);
pcap=NULL;
}
#endif
int main(int argc, char **argv){
ssh_session session;
session = ssh_new();
if(ssh_options_getopt(session, &argc, argv)) {
fprintf(stderr, "error parsing command line :%s\n",
ssh_get_error(session));
usage();
}
opts(argc,argv);
#ifdef WITH_PCAP
set_pcap(session);
#endif
client(session);
ssh_disconnect(session);
ssh_free(session);
#ifdef WITH_PCAP
cleanup_pcap();
#endif
ssh_finalize();
return 0;
}

3
include/CMakeLists.txt Normal file
View File

@@ -0,0 +1,3 @@
project(headers C)
add_subdirectory(libssh)

View File

@@ -1 +0,0 @@
SUBDIRS = libssh

View File

@@ -0,0 +1,39 @@
project(libssh-headers C)
set(libssh_HDRS
callbacks.h
libssh.h
ssh2.h
legacy.h
)
if (WITH_SFTP)
set(libssh_HDRS
${libssh_HDRS}
sftp.h
)
endif (WITH_SFTP)
if (WITH_SSH1)
set(libssh_HDRS
${libssh_HDRS}
ssh1.h
)
endif (WITH_SSH1)
if (WITH_SERVER)
set(libssh_HDRS
${libssh_HDRS}
server.h
)
endif (WITH_SERVER)
install(
FILES
${libssh_HDRS}
DESTINATION
${INCLUDE_INSTALL_DIR}/${APPLICATION_NAME}
COMPONENT
headers
)

View File

@@ -1,8 +0,0 @@
libsshdir = $(includedir)/libssh
libssh_HEADERS = crypto.h libssh.h priv.h server.h sftp.h ssh1.h ssh2.h
nodist_libssh_HEADERS = config.h
config.h:
$(LN_S) $(top_builddir)/config.h ./config.h
DISTCLEANFILES = config.h

97
include/libssh/agent.h Normal file
View File

@@ -0,0 +1,97 @@
#ifndef __AGENT_H
#define __AGENT_H
#include "libssh/libssh.h"
/* Messages for the authentication agent connection. */
#define SSH_AGENTC_REQUEST_RSA_IDENTITIES 1
#define SSH_AGENT_RSA_IDENTITIES_ANSWER 2
#define SSH_AGENTC_RSA_CHALLENGE 3
#define SSH_AGENT_RSA_RESPONSE 4
#define SSH_AGENT_FAILURE 5
#define SSH_AGENT_SUCCESS 6
#define SSH_AGENTC_ADD_RSA_IDENTITY 7
#define SSH_AGENTC_REMOVE_RSA_IDENTITY 8
#define SSH_AGENTC_REMOVE_ALL_RSA_IDENTITIES 9
/* private OpenSSH extensions for SSH2 */
#define SSH2_AGENTC_REQUEST_IDENTITIES 11
#define SSH2_AGENT_IDENTITIES_ANSWER 12
#define SSH2_AGENTC_SIGN_REQUEST 13
#define SSH2_AGENT_SIGN_RESPONSE 14
#define SSH2_AGENTC_ADD_IDENTITY 17
#define SSH2_AGENTC_REMOVE_IDENTITY 18
#define SSH2_AGENTC_REMOVE_ALL_IDENTITIES 19
/* smartcard */
#define SSH_AGENTC_ADD_SMARTCARD_KEY 20
#define SSH_AGENTC_REMOVE_SMARTCARD_KEY 21
/* lock/unlock the agent */
#define SSH_AGENTC_LOCK 22
#define SSH_AGENTC_UNLOCK 23
/* add key with constraints */
#define SSH_AGENTC_ADD_RSA_ID_CONSTRAINED 24
#define SSH2_AGENTC_ADD_ID_CONSTRAINED 25
#define SSH_AGENTC_ADD_SMARTCARD_KEY_CONSTRAINED 26
#define SSH_AGENT_CONSTRAIN_LIFETIME 1
#define SSH_AGENT_CONSTRAIN_CONFIRM 2
/* extended failure messages */
#define SSH2_AGENT_FAILURE 30
/* additional error code for ssh.com's ssh-agent2 */
#define SSH_COM_AGENT2_FAILURE 102
#define SSH_AGENT_OLD_SIGNATURE 0x01
struct ssh_agent_struct {
struct ssh_socket_struct *sock;
ssh_buffer ident;
unsigned int count;
};
#ifndef _WIN32
/* agent.c */
/**
* @brief Create a new ssh agent structure.
*
* @return An allocated ssh agent structure or NULL on error.
*/
struct ssh_agent_struct *agent_new(struct ssh_session_struct *session);
void agent_close(struct ssh_agent_struct *agent);
/**
* @brief Free an allocated ssh agent structure.
*
* @param agent The ssh agent structure to free.
*/
void agent_free(struct ssh_agent_struct *agent);
/**
* @brief Check if the ssh agent is running.
*
* @param session The ssh session to check for the agent.
*
* @return 1 if it is running, 0 if not.
*/
int agent_is_running(struct ssh_session_struct *session);
int agent_get_ident_count(struct ssh_session_struct *session);
struct ssh_public_key_struct *agent_get_next_ident(struct ssh_session_struct *session,
char **comment);
struct ssh_public_key_struct *agent_get_first_ident(struct ssh_session_struct *session,
char **comment);
ssh_string agent_sign_data(struct ssh_session_struct *session,
struct ssh_buffer_struct *data,
struct ssh_public_key_struct *pubkey);
#endif
#endif /* __AGENT_H */
/* vim: set ts=2 sw=2 et cindent: */

86
include/libssh/auth.h Normal file
View File

@@ -0,0 +1,86 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2009 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef AUTH_H_
#define AUTH_H_
#include "config.h"
#include "libssh/callbacks.h"
SSH_PACKET_CALLBACK(ssh_packet_userauth_banner);
SSH_PACKET_CALLBACK(ssh_packet_userauth_failure);
SSH_PACKET_CALLBACK(ssh_packet_userauth_success);
SSH_PACKET_CALLBACK(ssh_packet_userauth_pk_ok);
SSH_PACKET_CALLBACK(ssh_packet_userauth_info_request);
#ifdef WITH_SSH1
void ssh_auth1_handler(ssh_session session, uint8_t type);
/* auth1.c */
int ssh_userauth1_none(ssh_session session, const char *username);
int ssh_userauth1_offer_pubkey(ssh_session session, const char *username,
int type, ssh_string pubkey);
int ssh_userauth1_password(ssh_session session, const char *username,
const char *password);
#endif
/** @internal
* States of authentication in the client-side. They describe
* what was the last response from the server
*/
enum ssh_auth_state_e {
/** No authentication asked */
SSH_AUTH_STATE_NONE=0,
/** Last authentication response was a partial success */
SSH_AUTH_STATE_PARTIAL,
/** Last authentication response was a success */
SSH_AUTH_STATE_SUCCESS,
/** Last authentication response was failed */
SSH_AUTH_STATE_FAILED,
/** Last authentication was erroneous */
SSH_AUTH_STATE_ERROR,
/** Last state was a keyboard-interactive ask for info */
SSH_AUTH_STATE_INFO,
/** Last state was a public key accepted for authentication */
SSH_AUTH_STATE_PK_OK,
/** We asked for a keyboard-interactive authentication */
SSH_AUTH_STATE_KBDINT_SENT
};
/** @internal
* @brief states of the authentication service request
*/
enum ssh_auth_service_state_e {
/** initial state */
SSH_AUTH_SERVICE_NONE=0,
/** Authentication service request packet sent */
SSH_AUTH_SERVICE_SENT,
/** Service accepted */
SSH_AUTH_SERVICE_ACCEPTED,
/** Access to service denied (fatal) */
SSH_AUTH_SERVICE_DENIED,
/** Specific to SSH1 */
SSH_AUTH_SERVICE_USER_SENT
};
#endif /* AUTH_H_ */

53
include/libssh/bind.h Normal file
View File

@@ -0,0 +1,53 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2010 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef BIND_H_
#define BIND_H_
#include "libssh/priv.h"
struct ssh_bind_struct {
struct error_struct error;
ssh_callbacks callbacks; /* Callbacks to user functions */
struct ssh_bind_callbacks_struct *bind_callbacks;
void *bind_callbacks_userdata;
struct ssh_poll_handle_struct *poll;
/* options */
char *wanted_methods[10];
char *banner;
char *dsakey;
char *rsakey;
char *bindaddr;
socket_t bindfd;
unsigned int bindport;
unsigned int log_verbosity;
int blocking;
int toaccept;
};
struct ssh_poll_handle_struct *ssh_bind_get_poll(struct ssh_bind_struct
*sshbind);
#endif /* BIND_H_ */

73
include/libssh/buffer.h Normal file
View File

@@ -0,0 +1,73 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2009 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef BUFFER_H_
#define BUFFER_H_
#include "libssh/libssh.h"
/*
* Describes a buffer state
* [XXXXXXXXXXXXDATA PAYLOAD XXXXXXXXXXXXXXXXXXXXXXXX]
* ^ ^ ^ ^]
* \_data points\_pos points here \_used points here | /
* here Allocated
*/
struct ssh_buffer_struct {
char *data;
uint32_t used;
uint32_t allocated;
uint32_t pos;
};
LIBSSH_API void ssh_buffer_free(ssh_buffer buffer);
LIBSSH_API void *ssh_buffer_get_begin(ssh_buffer buffer);
LIBSSH_API uint32_t ssh_buffer_get_len(ssh_buffer buffer);
LIBSSH_API ssh_buffer ssh_buffer_new(void);
int buffer_add_ssh_string(ssh_buffer buffer, ssh_string string);
int buffer_add_u8(ssh_buffer buffer, uint8_t data);
int buffer_add_u16(ssh_buffer buffer, uint16_t data);
int buffer_add_u32(ssh_buffer buffer, uint32_t data);
int buffer_add_u64(ssh_buffer buffer, uint64_t data);
int buffer_add_data(ssh_buffer buffer, const void *data, uint32_t len);
int buffer_prepend_data(ssh_buffer buffer, const void *data, uint32_t len);
int buffer_add_buffer(ssh_buffer buffer, ssh_buffer source);
int buffer_reinit(ssh_buffer buffer);
/* buffer_get_rest returns a pointer to the current position into the buffer */
void *buffer_get_rest(ssh_buffer buffer);
/* buffer_get_rest_len returns the number of bytes which can be read */
uint32_t buffer_get_rest_len(ssh_buffer buffer);
/* buffer_read_*() returns the number of bytes read, except for ssh strings */
int buffer_get_u8(ssh_buffer buffer, uint8_t *data);
int buffer_get_u32(ssh_buffer buffer, uint32_t *data);
int buffer_get_u64(ssh_buffer buffer, uint64_t *data);
uint32_t buffer_get_data(ssh_buffer buffer, void *data, uint32_t requestedlen);
/* buffer_get_ssh_string() is an exception. if the String read is too large or invalid, it will answer NULL. */
ssh_string buffer_get_ssh_string(ssh_buffer buffer);
/* gets a string out of a SSH-1 mpint */
ssh_string buffer_get_mpint(ssh_buffer buffer);
/* buffer_pass_bytes acts as if len bytes have been read (used for padding) */
uint32_t buffer_pass_bytes_end(ssh_buffer buffer, uint32_t len);
uint32_t buffer_pass_bytes(ssh_buffer buffer, uint32_t len);
#endif /* BUFFER_H_ */

463
include/libssh/callbacks.h Normal file
View File

@@ -0,0 +1,463 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2009 Aris Adamantiadis <aris@0xbadc0de.be>
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
/* callback.h
* This file includes the public declarations for the libssh callback mechanism
*/
#ifndef _SSH_CALLBACK_H
#define _SSH_CALLBACK_H
#include <libssh/libssh.h>
#include <string.h>
#ifdef __cplusplus
extern "C" {
#endif
/**
* @defgroup libssh_callbacks The libssh callbacks
* @ingroup libssh
*
* Callback which can be replaced in libssh.
*
* @{
*/
/** @internal
* @brief callback to process simple codes
* @param code value to transmit
* @param user Userdata to pass in callback
*/
typedef void (*ssh_callback_int) (int code, void *user);
/** @internal
* @brief callback for data received messages.
* @param data data retrieved from the socket or stream
* @param len number of bytes available from this stream
* @param user user-supplied pointer sent along with all callback messages
* @returns number of bytes processed by the callee. The remaining bytes will
* be sent in the next callback message, when more data is available.
*/
typedef int (*ssh_callback_data) (const void *data, size_t len, void *user);
typedef void (*ssh_callback_int_int) (int code, int errno_code, void *user);
typedef int (*ssh_message_callback) (ssh_session, ssh_message message, void *user);
typedef int (*ssh_channel_callback_int) (ssh_channel channel, int code, void *user);
typedef int (*ssh_channel_callback_data) (ssh_channel channel, int code, void *data, size_t len, void *user);
/**
* @brief SSH authentication callback.
*
* @param prompt Prompt to be displayed.
* @param buf Buffer to save the password. You should null-terminate it.
* @param len Length of the buffer.
* @param echo Enable or disable the echo of what you type.
* @param verify Should the password be verified?
* @param userdata Userdata to be passed to the callback function. Useful
* for GUI applications.
*
* @return 0 on success, < 0 on error.
*/
typedef int (*ssh_auth_callback) (const char *prompt, char *buf, size_t len,
int echo, int verify, void *userdata);
/**
* @brief SSH log callback. All logging messages will go through this callback
* @param session Current session handler
* @param priority Priority of the log, the smaller being the more important
* @param message the actual message
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_log_callback) (ssh_session session, int priority,
const char *message, void *userdata);
/**
* @brief SSH Connection status callback.
* @param session Current session handler
* @param status Percentage of connection status, going from 0.0 to 1.0
* once connection is done.
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_status_callback) (ssh_session session, float status,
void *userdata);
/**
* @brief SSH global request callback. All global request will go through this
* callback.
* @param session Current session handler
* @param message the actual message
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_global_request_callback) (ssh_session session,
ssh_message message, void *userdata);
/**
* The structure to replace libssh functions with appropriate callbacks.
*/
struct ssh_callbacks_struct {
/** DON'T SET THIS use ssh_callbacks_init() instead. */
size_t size;
/**
* User-provided data. User is free to set anything he wants here
*/
void *userdata;
/**
* This functions will be called if e.g. a keyphrase is needed.
*/
ssh_auth_callback auth_function;
/**
* This function will be called each time a loggable event happens.
*/
ssh_log_callback log_function;
/**
* This function gets called during connection time to indicate the
* percentage of connection steps completed.
*/
void (*connect_status_function)(void *userdata, float status);
/**
* This function will be called each time a global request is received.
*/
ssh_global_request_callback global_request_function;
};
typedef struct ssh_callbacks_struct *ssh_callbacks;
/**
* These are the callbacks exported by the socket structure
* They are called by the socket module when a socket event appears
*/
struct ssh_socket_callbacks_struct {
/**
* User-provided data. User is free to set anything he wants here
*/
void *userdata;
/**
* This function will be called each time data appears on socket. The data
* not consumed will appear on the next data event.
*/
ssh_callback_data data;
/** This function will be called each time a controlflow state changes, i.e.
* the socket is available for reading or writing.
*/
ssh_callback_int controlflow;
/** This function will be called each time an exception appears on socket. An
* exception can be a socket problem (timeout, ...) or an end-of-file.
*/
ssh_callback_int_int exception;
/** This function is called when the ssh_socket_connect was used on the socket
* on nonblocking state, and the connection successed.
*/
ssh_callback_int_int connected;
};
typedef struct ssh_socket_callbacks_struct *ssh_socket_callbacks;
#define SSH_SOCKET_FLOW_WRITEWILLBLOCK 1
#define SSH_SOCKET_FLOW_WRITEWONTBLOCK 2
#define SSH_SOCKET_EXCEPTION_EOF 1
#define SSH_SOCKET_EXCEPTION_ERROR 2
#define SSH_SOCKET_CONNECTED_OK 1
#define SSH_SOCKET_CONNECTED_ERROR 2
#define SSH_SOCKET_CONNECTED_TIMEOUT 3
/**
* @brief Initializes an ssh_callbacks_struct
* A call to this macro is mandatory when you have set a new
* ssh_callback_struct structure. Its goal is to maintain the binary
* compatibility with future versions of libssh as the structure
* evolves with time.
*/
#define ssh_callbacks_init(p) do {\
(p)->size=sizeof(*(p)); \
} while(0);
/**
* @internal
* @brief tests if a callback can be called without crash
* verifies that the struct size if big enough
* verifies that the callback pointer exists
* @param p callback pointer
* @param c callback name
* @returns nonzero if callback can be called
*/
#define ssh_callbacks_exists(p,c) (\
(p != NULL) && ( (char *)&((p)-> c) < (char *)(p) + (p)->size ) && \
((p)-> c != NULL) \
)
/** @brief Prototype for a packet callback, to be called when a new packet arrives
* @param session The current session of the packet
* @param type packet type (see ssh2.h)
* @param packet buffer containing the packet, excluding size, type and padding fields
* @param user user argument to the callback
* and are called each time a packet shows up
* @returns SSH_PACKET_USED Packet was parsed and used
* @returns SSH_PACKET_NOT_USED Packet was not used or understood, processing must continue
*/
typedef int (*ssh_packet_callback) (ssh_session session, uint8_t type, ssh_buffer packet, void *user);
/** return values for a ssh_packet_callback */
/** Packet was used and should not be parsed by another callback */
#define SSH_PACKET_USED 1
/** Packet was not used and should be passed to any other callback
* available */
#define SSH_PACKET_NOT_USED 2
/** @brief This macro declares a packet callback handler
* @code
* SSH_PACKET_CALLBACK(mycallback){
* ...
* }
* @endcode
*/
#define SSH_PACKET_CALLBACK(name) \
int name (ssh_session session, uint8_t type, ssh_buffer packet, void *user)
struct ssh_packet_callbacks_struct {
/** Index of the first packet type being handled */
uint8_t start;
/** Number of packets being handled by this callback struct */
uint8_t n_callbacks;
/** A pointer to n_callbacks packet callbacks */
ssh_packet_callback *callbacks;
/**
* User-provided data. User is free to set anything he wants here
*/
void *user;
};
typedef struct ssh_packet_callbacks_struct *ssh_packet_callbacks;
/**
* @brief Set the session callback functions.
*
* This functions sets the callback structure to use your own callback
* functions for auth, logging and status.
*
* @code
* struct ssh_callbacks_struct cb = {
* .userdata = data,
* .auth_function = my_auth_function
* };
* ssh_callbacks_init(&cb);
* ssh_set_callbacks(session, &cb);
* @endcode
*
* @param session The session to set the callback structure.
*
* @param cb The callback structure itself.
*
* @return SSH_OK on success, SSH_ERROR on error.
*/
LIBSSH_API int ssh_set_callbacks(ssh_session session, ssh_callbacks cb);
/**
* @brief SSH channel data callback. Called when data is available on a channel
* @param session Current session handler
* @param channel the actual channel
* @param data the data that has been read on the channel
* @param len the length of the data
* @param is_stderr is 0 for stdout or 1 for stderr
* @param userdata Userdata to be passed to the callback function.
*/
typedef int (*ssh_channel_data_callback) (ssh_session session,
ssh_channel channel,
void *data,
uint32_t len,
int is_stderr,
void *userdata);
/**
* @brief SSH channel eof callback. Called when a channel receives EOF
* @param session Current session handler
* @param channel the actual channel
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_channel_eof_callback) (ssh_session session,
ssh_channel channel,
void *userdata);
/**
* @brief SSH channel close callback. Called when a channel is closed by remote peer
* @param session Current session handler
* @param channel the actual channel
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_channel_close_callback) (ssh_session session,
ssh_channel channel,
void *userdata);
/**
* @brief SSH channel signal callback. Called when a channel has received a signal
* @param session Current session handler
* @param channel the actual channel
* @param signal the signal name (without the SIG prefix)
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_channel_signal_callback) (ssh_session session,
ssh_channel channel,
const char *signal,
void *userdata);
/**
* @brief SSH channel exit status callback. Called when a channel has received an exit status
* @param session Current session handler
* @param channel the actual channel
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_channel_exit_status_callback) (ssh_session session,
ssh_channel channel,
int exit_status,
void *userdata);
/**
* @brief SSH channel exit signal callback. Called when a channel has received an exit signal
* @param session Current session handler
* @param channel the actual channel
* @param signal the signal name (without the SIG prefix)
* @param core a boolean telling wether a core has been dumped or not
* @param errmsg the description of the exception
* @param lang the language of the description (format: RFC 3066)
* @param userdata Userdata to be passed to the callback function.
*/
typedef void (*ssh_channel_exit_signal_callback) (ssh_session session,
ssh_channel channel,
const char *signal,
int core,
const char *errmsg,
const char *lang,
void *userdata);
struct ssh_channel_callbacks_struct {
/** DON'T SET THIS use ssh_callbacks_init() instead. */
size_t size;
/**
* User-provided data. User is free to set anything he wants here
*/
void *userdata;
/**
* This functions will be called when there is data available.
*/
ssh_channel_data_callback channel_data_function;
/**
* This functions will be called when the channel has received an EOF.
*/
ssh_channel_eof_callback channel_eof_function;
/**
* This functions will be called when the channel has been closed by remote
*/
ssh_channel_close_callback channel_close_function;
/**
* This functions will be called when a signal has been received
*/
ssh_channel_signal_callback channel_signal_function;
/**
* This functions will be called when an exit status has been received
*/
ssh_channel_exit_status_callback channel_exit_status_function;
/**
* This functions will be called when an exit signal has been received
*/
ssh_channel_exit_signal_callback channel_exit_signal_function;
};
typedef struct ssh_channel_callbacks_struct *ssh_channel_callbacks;
/**
* @brief Set the channel callback functions.
*
* This functions sets the callback structure to use your own callback
* functions for channel data and exceptions
*
* @code
* struct ssh_channel_callbacks_struct cb = {
* .userdata = data,
* .channel_data = my_channel_data_function
* };
* ssh_callbacks_init(&cb);
* ssh_set_channel_callbacks(channel, &cb);
* @endcode
*
* @param channel The channel to set the callback structure.
*
* @param cb The callback structure itself.
*
* @return SSH_OK on success, SSH_ERROR on error.
*/
LIBSSH_API int ssh_set_channel_callbacks(ssh_channel channel,
ssh_channel_callbacks cb);
/** @} */
/** @group libssh_threads
* @{
*/
typedef int (*ssh_thread_callback) (void **lock);
typedef unsigned long (*ssh_thread_id_callback) (void);
struct ssh_threads_callbacks_struct {
const char *type;
ssh_thread_callback mutex_init;
ssh_thread_callback mutex_destroy;
ssh_thread_callback mutex_lock;
ssh_thread_callback mutex_unlock;
ssh_thread_id_callback thread_id;
};
/**
* @brief sets the thread callbacks necessary if your program is using
* libssh in a multithreaded fashion. This function must be called first,
* outside of any threading context (in your main() for instance), before
* ssh_init().
* @param cb pointer to a ssh_threads_callbacks_struct structure, which contains
* the different callbacks to be set.
* @see ssh_threads_callbacks_struct
* @see SSH_THREADS_PTHREAD
*/
LIBSSH_API int ssh_threads_set_callbacks(struct ssh_threads_callbacks_struct
*cb);
/**
* @brief returns a pointer on the pthread threads callbacks, to be used with
* ssh_threads_set_callbacks.
* @warning you have to link with the library ssh_threads.
* @see ssh_threads_set_callbacks
*/
LIBSSH_API struct ssh_threads_callbacks_struct *ssh_threads_get_pthread(void);
/**
* @brief returns a pointer on the noop threads callbacks, to be used with
* ssh_threads_set_callbacks. These callbacks do nothing and are being used by
* default.
* @see ssh_threads_set_callbacks
*/
LIBSSH_API struct ssh_threads_callbacks_struct *ssh_threads_get_noop(void);
/** @} */
#ifdef __cplusplus
}
#endif
#endif /*_SSH_CALLBACK_H */
/* @} */

110
include/libssh/channels.h Normal file
View File

@@ -0,0 +1,110 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2009 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef CHANNELS_H_
#define CHANNELS_H_
#include "libssh/priv.h"
/** @internal
* Describes the different possible states in a
* outgoing (client) channel request
*/
enum ssh_channel_request_state_e {
/** No request has been made */
SSH_CHANNEL_REQ_STATE_NONE = 0,
/** A request has been made and answer is pending */
SSH_CHANNEL_REQ_STATE_PENDING,
/** A request has been replied and accepted */
SSH_CHANNEL_REQ_STATE_ACCEPTED,
/** A request has been replied and refused */
SSH_CHANNEL_REQ_STATE_DENIED,
/** A request has been replied and an error happend */
SSH_CHANNEL_REQ_STATE_ERROR
};
enum ssh_channel_state_e {
SSH_CHANNEL_STATE_NOT_OPEN = 0,
SSH_CHANNEL_STATE_OPEN_DENIED,
SSH_CHANNEL_STATE_OPEN,
SSH_CHANNEL_STATE_CLOSED
};
struct ssh_channel_struct {
struct ssh_channel_struct *prev;
struct ssh_channel_struct *next;
ssh_session session; /* SSH_SESSION pointer */
uint32_t local_channel;
uint32_t local_window;
int local_eof;
uint32_t local_maxpacket;
uint32_t remote_channel;
uint32_t remote_window;
int remote_eof; /* end of file received */
uint32_t remote_maxpacket;
enum ssh_channel_state_e state;
int delayed_close;
ssh_buffer stdout_buffer;
ssh_buffer stderr_buffer;
void *userarg;
int version;
int blocking;
int exit_status;
enum ssh_channel_request_state_e request_state;
ssh_channel_callbacks callbacks;
};
SSH_PACKET_CALLBACK(ssh_packet_channel_open_conf);
SSH_PACKET_CALLBACK(ssh_packet_channel_open_fail);
SSH_PACKET_CALLBACK(ssh_packet_channel_success);
SSH_PACKET_CALLBACK(ssh_packet_channel_failure);
SSH_PACKET_CALLBACK(ssh_request_success);
SSH_PACKET_CALLBACK(ssh_request_denied);
SSH_PACKET_CALLBACK(channel_rcv_change_window);
SSH_PACKET_CALLBACK(channel_rcv_eof);
SSH_PACKET_CALLBACK(channel_rcv_close);
SSH_PACKET_CALLBACK(channel_rcv_request);
SSH_PACKET_CALLBACK(channel_rcv_data);
ssh_channel ssh_channel_new(ssh_session session);
int channel_default_bufferize(ssh_channel channel, void *data, int len,
int is_stderr);
uint32_t ssh_channel_new_id(ssh_session session);
ssh_channel ssh_channel_from_local(ssh_session session, uint32_t id);
int channel_write_common(ssh_channel channel, const void *data,
uint32_t len, int is_stderr);
#ifdef WITH_SSH1
SSH_PACKET_CALLBACK(ssh_packet_data1);
SSH_PACKET_CALLBACK(ssh_packet_close1);
/* channels1.c */
int channel_open_session1(ssh_channel channel);
int channel_request_pty_size1(ssh_channel channel, const char *terminal,
int cols, int rows);
int channel_change_pty_size1(ssh_channel channel, int cols, int rows);
int channel_request_shell1(ssh_channel channel);
int channel_request_exec1(ssh_channel channel, const char *cmd);
int channel_write1(ssh_channel channel, const void *data, int len);
#endif
#endif /* CHANNELS_H_ */

View File

@@ -1,44 +1,71 @@
/*
Copyright 2003 Aris Adamantiadis
* This file is part of the SSH Library
*
* Copyright (c) 2003,2009 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
This file is part of the SSH Library
/*
* crypto.h is an include file for internal cryptographic structures of libssh
*/
The SSH Library is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or (at your
option) any later version.
#ifndef _CRYPTO_H_
#define _CRYPTO_H_
The SSH Library is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
License for more details.
#include "config.h"
You should have received a copy of the GNU Lesser General Public License
along with the SSH Library; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
MA 02111-1307, USA. */
/* Crypto.h is an include file for internal structures of libssh */
/* It hasn't to be into the final development set of files (and btw the filename would cause problems on most systems) */
/* Openssl has (really) stupid defines */
#ifdef set_key
#undef set_key
#ifdef HAVE_LIBGCRYPT
#include <gcrypt.h>
#endif
#include "libssh/wrapper.h"
#ifdef cbc_encrypt
#undef cbc_encrypt
#endif
#ifdef cbc_decrypt
#undef cbc_decrypt
#endif
#ifdef des_set_key
#undef des_set_key
#endif
#ifdef GCRYPT
#include <gcrypt.h>
#endif
struct ssh_crypto_struct {
bignum e,f,x,k,y;
unsigned char session_id[SHA_DIGEST_LEN];
unsigned char encryptIV[SHA_DIGEST_LEN*2];
unsigned char decryptIV[SHA_DIGEST_LEN*2];
unsigned char decryptkey[SHA_DIGEST_LEN*2];
unsigned char encryptkey[SHA_DIGEST_LEN*2];
unsigned char encryptMAC[SHA_DIGEST_LEN];
unsigned char decryptMAC[SHA_DIGEST_LEN];
unsigned char hmacbuf[EVP_MAX_MD_SIZE];
struct crypto_struct *in_cipher, *out_cipher; /* the cipher structures/objects */
ssh_string server_pubkey;
const char *server_pubkey_type;
int do_compress_out; /* idem */
int do_compress_in; /* don't set them, set the option instead */
int delayed_compress_in; /* Use of zlib@openssh.org */
int delayed_compress_out;
void *compress_out_ctx; /* don't touch it */
void *compress_in_ctx; /* really, don't */
};
struct crypto_struct {
char *name; /* ssh name of the algorithm */
const char *name; /* ssh name of the algorithm */
unsigned int blocksize; /* blocksize of the algo */
unsigned int keylen; /* length of the key structure */
#ifdef HAVE_LIBGCRYPT
@@ -48,15 +75,23 @@ struct crypto_struct {
#endif
unsigned int keysize; /* bytes of key used. != keylen */
#ifdef HAVE_LIBGCRYPT
void (*set_encrypt_key)(struct crypto_struct *cipher, void *key, void *IV); /* sets the new key for immediate use */
void (*set_decrypt_key)(struct crypto_struct *cipher, void *key, void *IV);
void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out,unsigned long len);
void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out,unsigned long len);
/* sets the new key for immediate use */
int (*set_encrypt_key)(struct crypto_struct *cipher, void *key, void *IV);
int (*set_decrypt_key)(struct crypto_struct *cipher, void *key, void *IV);
void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out,
unsigned long len);
void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out,
unsigned long len);
#elif defined HAVE_LIBCRYPTO
void (*set_encrypt_key)(struct crypto_struct *cipher, void *key); /* sets the new key for immediate use */
void (*set_decrypt_key)(struct crypto_struct *cipher, void *key);
void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out,unsigned long len,void *IV);
void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out,unsigned long len,void *IV);
/* sets the new key for immediate use */
int (*set_encrypt_key)(struct crypto_struct *cipher, void *key);
int (*set_decrypt_key)(struct crypto_struct *cipher, void *key);
void (*cbc_encrypt)(struct crypto_struct *cipher, void *in, void *out,
unsigned long len, void *IV);
void (*cbc_decrypt)(struct crypto_struct *cipher, void *in, void *out,
unsigned long len, void *IV);
#endif
};
/* vim: set ts=2 sw=2 et cindent: */
#endif /* _CRYPTO_H_ */

57
include/libssh/dh.h Normal file
View File

@@ -0,0 +1,57 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2009 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef DH_H_
#define DH_H_
#include "config.h"
/* DH key generation */
#include "libssh/keys.h"
void ssh_print_bignum(const char *which,bignum num);
int dh_generate_e(ssh_session session);
int dh_generate_f(ssh_session session);
int dh_generate_x(ssh_session session);
int dh_generate_y(ssh_session session);
int ssh_crypto_init(void);
void ssh_crypto_finalize(void);
ssh_string dh_get_e(ssh_session session);
ssh_string dh_get_f(ssh_session session);
int dh_import_f(ssh_session session,ssh_string f_string);
int dh_import_e(ssh_session session, ssh_string e_string);
void dh_import_pubkey(ssh_session session,ssh_string pubkey_string);
int dh_build_k(ssh_session session);
int make_sessionid(ssh_session session);
/* add data for the final cookie */
int hashbufin_add_cookie(ssh_session session, unsigned char *cookie);
int hashbufout_add_cookie(ssh_session session);
int generate_session_keys(ssh_session session);
int sig_verify(ssh_session session, ssh_public_key pubkey,
SIGNATURE *signature, unsigned char *digest, int size);
/* returns 1 if server signature ok, 0 otherwise. The NEXT crypto is checked, not the current one */
int signature_verify(ssh_session session,ssh_string signature);
bignum make_string_bn(ssh_string string);
ssh_string make_bignum_string(bignum num);
#endif /* DH_H_ */

33
include/libssh/kex.h Normal file
View File

@@ -0,0 +1,33 @@
/*
* This file is part of the SSH Library
*
* Copyright (c) 2009 by Aris Adamantiadis
*
* The SSH Library is free software; you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation; either version 2.1 of the License, or (at your
* option) any later version.
*
* The SSH Library is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
* License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with the SSH Library; see the file COPYING. If not, write to
* the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
* MA 02111-1307, USA.
*/
#ifndef KEX_H_
#define KEX_H_
#include "libssh/priv.h"
#include "libssh/callbacks.h"
SSH_PACKET_CALLBACK(ssh_packet_kexinit);
#ifdef WITH_SSH1
SSH_PACKET_CALLBACK(ssh_packet_publickey1);
#endif
#endif /* KEX_H_ */

Some files were not shown because too many files have changed in this diff Show More