Commit Graph

571 Commits (f7f7b4743e2585ddee6009fa4d7b1bed3a3bd1a7)

Author SHA1 Message Date
John Safranek f7f7b4743e
Merge pull request #147 from kojo1/add-algos
Add AES-CTR, make Algo configurable
2019-04-05 14:14:03 -07:00
JacobBarthelmeh c050a8365a
Merge pull request #150 from ejohnstown/mem-update
Memory Update
2019-04-05 15:00:45 -06:00
John Safranek 1d051e1a84 Memory Update
1. Renumbered the dynamic memory type IDs so they don't conflict with wolfCrypt/wolfSSL.
2. Renumbered the error codes so they don't conflict with wolfCrypt.
3. Fixed a couple of typos when using dynamic memory type IDs that were missed due to default memory handling being used.
2019-04-05 11:36:25 -07:00
Takashi Kojo 658f081237 make configuration opts, WOLFSSH_NO_xxx, compatible with wolfSSL names. 2019-04-05 08:39:10 +09:00
Takashi Kojo aeb2337e52 WOLFSSL_AES_COUNTER in user_settings.h 2019-04-05 07:00:21 +09:00
Takashi Kojo a93bc3673e guard by configuration options, WOLFSSH_NO_xxx 2019-04-05 06:52:54 +09:00
John Safranek 883b29d031 Memory Update
1. Removed the memory API.
2. Wired the existing memory calls back into the wolfCrypt memory calls.
3. Updated the include.am and vcxproj files for the deleted source.

The wolfSSH memory API is a shallow copy of the wolfCrypt memory API.
wolfCrypt's API offers more options including logging and static memory
that may be useful for wolfSSH in the future. Since both APIs were
available, wolfSSH's was removed as redundant.
2019-04-04 11:19:09 -07:00
John Safranek b7c4630b01 Memory Update
1. Fixed a couple of dynamic memory type identifiers with typos.
2. Fixed a reference to the heap in a free.
These were missed by the compiler becuase in generic builds, the heap
and dynamic type are ignored in a macro.
2019-04-04 10:24:53 -07:00
Takashi Kojo 08faaf9f46 configurable cannedXXXAlgoNames 2019-04-04 17:12:38 +09:00
John Safranek d3f3e2ca33
Merge pull request #119 from JacobBarthelmeh/exec
Extended Data Read and Execute Channel
2019-04-03 16:21:47 -07:00
Jacob Barthelmeh d27454d567 remove duplicate line 2019-04-03 17:09:07 -06:00
JacobBarthelmeh cfb540523a
Merge pull request #149 from ejohnstown/fuzz-fix
Fuzz Fix
2019-04-03 16:06:22 -06:00
John Safranek 0326cfea31 Fuzz Fix
AFL found a failed bounds check in DoDebug. Fixed the check to test for the smallest possible size of the incoming message.
2019-04-03 14:09:06 -07:00
JacobBarthelmeh 2f2dca7498
Merge pull request #148 from ejohnstown/pubkeycb
Server Public Key Bug Fix
2019-04-03 11:38:16 -06:00
John Safranek 47a51b5a5b Server Public Key Bug Fix
The callback was getting a pointer to the raw public key data in the
receive buffer including the blob length, this caused the pubkey to be
short in the callback. Updated the pubKey given to the callback to be
the SSH encoded blob without the total size, and pass the total size in.
Also, update the hash of the public key to include the size.
2019-04-03 10:18:20 -07:00
Takashi Kojo 357172afcd add CTR in cannedEncAlgoNames 2019-04-03 09:46:31 +09:00
Takashi Kojo b8a2101499 AES_ENCRYPT for AES-CTR, wc_AesSetKey 2019-04-03 06:47:47 +09:00
Takashi Kojo 6c57e54e79 make Alog configurable 2019-04-02 08:44:17 +09:00
Takashi Kojo 8a82608cd7 add AES-CTR 2019-04-02 07:21:38 +09:00
Jacob Barthelmeh 9df6e300f8 do not exit on want read with console parsing 2019-04-01 13:16:59 -06:00
Jacob Barthelmeh ff84dea8a0 add function to get extended data and example remote command execute
update client example remote command execute for Windows

add wolfSSH_stream_peek and console translation

improvements to console translation and add client side psuedo terminal

windows client -c fix, clang build, sanity check on side for exec

fix for warnings with VS 2010 build

cast return value of WSTRLEN

update termios guard and fix for scan-build check

advance extended data buffer index on read

fix for error.h after rebase
2019-03-29 09:25:27 -06:00
JacobBarthelmeh f134754112
Merge pull request #145 from ejohnstown/pubkeyverify
Public Key Check Callback
2019-03-26 14:54:12 -06:00
John Safranek 8a267e2bd2 Public Key Check Callback
The public key check callback hook is given a pointer to the public key, the size of the key, and the application-specific context data.
1. Added a callback function hook for checking the public key sent to the client by the server. It defaults to accepting the key.
2. Added accessors for the public key check callback function and context data.
3. Added a dummy callback to all the example tools.
2019-03-26 13:51:35 -07:00
John Safranek 0ca04e4248
Merge pull request #144 from JacobBarthelmeh/testing
sanity check on size returned
2019-03-22 13:56:38 -07:00
Jacob Barthelmeh d6efc07bc9 sanity check on size returned 2019-03-18 14:28:01 -06:00
JacobBarthelmeh 8038d4835c
Merge pull request #140 from ejohnstown/cleanup
Build Cleanup
2019-03-05 17:04:31 -07:00
John Safranek a2bfd7749c 1. Update the Windows build README.
2. Add a guard to the sftpclient.c so it builds without SFTP enabled.
2019-03-04 16:46:25 -08:00
JacobBarthelmeh 8855bdeaeb
Merge pull request #139 from ejohnstown/build-fix
Windows Build Fix
2019-03-04 16:06:23 -07:00
John Safranek c14de5040b Change the ifdef around the Win32 wrapper functions to be switched off
when SCP or SFTP aren't enabled on a windows build.
2019-03-04 13:52:10 -08:00
JacobBarthelmeh b6e4209d23
Merge pull request #135 from ejohnstown/examples
Configure Update
2019-02-27 14:34:15 -07:00
John Safranek ea515ca1b2 Add configure option to disable building the example tools. 2019-02-27 13:25:55 -08:00
David Garske c4874154c0
Merge pull request #134 from ejohnstown/nbsftp
Non-blocking wolfSFTP
2019-02-27 12:50:36 -08:00
John Safranek 2350ffe00e Review Fixes
1. Add a wrapper to the key-gen code that checks for wolfCrypt's keygen flag and errors if keygen isn't available.
2. The main loops around wolfSSH_stream_read() for the example client and server needed to check the error register for WANT_READ or WANT_WRITE, not the return code.
2019-02-27 11:28:24 -08:00
Jacob Barthelmeh 3a2da4bb0e account for order of test listing directory 2019-02-19 15:44:56 -07:00
John Safranek 8672e8fb6d
Merge pull request #132 from JacobBarthelmeh/readme
adjust the default window size
2019-02-14 15:15:17 -08:00
John Safranek 5fe676862c Made a similar fix for the non-windows code as in the last commit. Also
cleaned up some tabs that an editor added.
2019-02-13 17:13:28 -08:00
John Safranek 0ffab772b4 Update to the SFTP functions. Directory handles are 64-bit values. They
weren't getting mangled to be sent to the peer or unmangled on receipt
consistently. Fixed.
2019-02-13 16:58:40 -08:00
Jacob Barthelmeh 4733878fc9 adjust the default window size 2019-02-08 16:40:14 -07:00
Jacob Barthelmeh aa7330f7fc nonblocking chmod, add chmod sftp test 2019-02-07 17:51:52 -07:00
John Safranek 854fb8d7e8 Added some porting fixes for OSE. Added the switch USE_OSE_API to enable
them.
2019-02-07 11:55:39 -08:00
Jacob Barthelmeh d0a7e69487 adjustement to sftp test and fix typo 2019-02-07 12:12:30 -07:00
Jacob Barthelmeh a6a1297c93 check for socket disconnect error 2019-02-07 11:07:10 -07:00
Jacob Barthelmeh 249795ce9a account for order of handle when sent across the wire 2019-02-07 10:15:03 -07:00
John Safranek 8fe5ad76d4 Fixed a couple of the updates to the Windows side of the code for
removing 64-bit values.
2019-02-06 16:38:00 -08:00
Jacob Barthelmeh 99c4cfca00 adjustments to handle array
Signed-off-by: Jacob Barthelmeh <jacob@wolfssl.com>
2019-02-06 17:14:21 -07:00
John Safranek accd3c299d Add a function to assign-add a 32-bit value to a 64-bit value. The
64-bit value is an array 2 of 32-bit values. In SFTP, changed up all the
uses (most) of word64 to word32 arrays. Not all systems we support have
64-bit types available.
2019-02-06 14:31:31 -08:00
Jacob Barthelmeh a92bcdc074 add test cases for more SFTP commands 2019-02-06 13:45:18 -07:00
Jacob Barthelmeh a268085b0b cast return value of wstrlen 2019-02-04 14:53:45 -07:00
Jacob Barthelmeh 55a763c360 add missing testsuite.h file 2019-02-04 14:49:56 -07:00
Jacob Barthelmeh 9c73700f25 add SFTP tests to testsuite 2019-02-04 12:22:31 -07:00