Skip to content

Commit ae75319

Browse files
JacobBarthelmehJacobBarthelmeh
authored
Merge pull request #91 from ejohnstown/next-release
Next Release
2 parents 1a0be64 + 226264a commit ae75319

6 files changed

Lines changed: 185 additions & 42 deletions

File tree

‎ChangeLog.md‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
### wolfSSH v1.3.0 (08/15/2018)
2+
3+
- Accepted code submission from Stephen Casner for SCP support. Thanks Stephen!
4+
- Added SCP server support.
5+
- Added SFTP client and server support.
6+
- Updated the autoconf scripts.
7+
- Other bug fixes and enhancements.
8+
9+
### wolfSSH v1.2.0 (09/26/2017)
10+
11+
- Added ECDH Group Exchange with SHA2 hashing and curves nistp256,
12+
nistp384, and nistp521.
13+
- Added ECDSA with SHA2 hashing and curves nistp256, nistp384, and nistp521.
14+
- Added client support.
15+
- Added an example client that talks to the echoserver.
16+
- Changed the echoserver to allow only one connection, but multiple
17+
connections are allowed with a command line option.
18+
- Added option to echoserver to offer an ECC public key.
19+
- Added a Visual Studio solution to build the library, examples, and tests.
20+
- Other bug fixes and enhancements.
21+
22+
### wolfSSH v1.1.0 (06/16/2017)
23+
24+
- Added DH Group Exchange with SHA-256 hashing to the key exchange.
25+
- Removed the canned banner and provided a function to set a banner string.
26+
If no sting is provided, no banner is sent.
27+
- Expanded the make checking to include an API test.
28+
- Added a function that returns session statistics.
29+
- When connecting to the echoserver, hitting Ctrl-E will give you some
30+
session statistics.
31+
- Parse and reply to the Global Request message.
32+
- Fixed a bug with client initiated rekeying.
33+
- Fixed a bug with the GetString function.
34+
- Other small bug fixes and enhancements.
35+
36+
### wolfSSH v1.0.0 (10/24/2016)
37+
38+
Initial release.

‎Makefile.am‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ dist_example_DATA=
2929

3030
ACLOCAL_AMFLAGS= -I m4
3131

32-
EXTRA_DIST+= README.md
33-
EXTRA_DIST+= LICENSING
32+
EXTRA_DIST+= LICENSING README.md ChangeLog.md
3433

3534
include src/include.am
3635
include wolfssh/include.am

‎README‎

Lines changed: 140 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,140 @@
1+
wolfssh
2+
=======
3+
4+
wolfSSL's Embeddable SSH Server
5+
6+
dependencies
7+
------------
8+
9+
wolfSSH is dependent on wolfCrypt. The simplest configuration of wolfSSL
10+
required for wolfSSH is the default build.
11+
12+
$ cd wolfssl
13+
$ ./configure [OPTIONS] --enable-ssh
14+
$ make check
15+
$ sudo make install
16+
17+
To use the key generation function in wolfSSH, wolfSSL will need to be
18+
configured with keygen: `--enable-keygen`.
19+
20+
If the bulk of wolfSSL code isn't desired, wolfSSL can be configured with
21+
the crypto only option: `--enable-cryptonly`.
22+
23+
24+
building
25+
--------
26+
27+
From the source directory run:
28+
29+
$ ./autogen.sh
30+
$ ./configure
31+
$ make
32+
$ make check
33+
34+
The `autogen.sh` script only has to be run the first time after cloning the
35+
repository. If you have already run it or are using code from a source
36+
archive, you should skip it.
37+
38+
For building under Windows with Visual Studio, see the file
39+
"ide/winvs/README.md".
40+
41+
NOTE: On resource constrained devices the DEFAULT_WINDOW_SZ may need to be set
42+
to a lower size. By default channels are set to handle 1 Mb of data being sent
43+
and received. An example of setting a lower window size for new channels would
44+
be as follows "./configure CPPFLAGS=-DDEFAULT_WINDOW_SZ=16384"
45+
46+
examples
47+
--------
48+
49+
The directory `examples` contains an echoserver that any client should be able
50+
to connect to. From the terminal run:
51+
52+
$ ./examples/echoserver/echoserver
53+
54+
From another terminal run:
55+
56+
$ ssh_client localhost -p 22222
57+
58+
The server will send a canned banner to the client:
59+
60+
wolfSSH Example Echo Server
61+
62+
Characters typed into the client will be echoed to the screen by the server.
63+
If the characters are echoed twice, the client has local echo enabled. The
64+
echo server isn't being a proper terminal so the CR/LF translation will not
65+
work as expected.
66+
67+
68+
testing notes
69+
-------------
70+
71+
After cloning the repository, be sure to make the testing private keys read-
72+
only for the user, otherwise ssh_client will tell you to do it.
73+
74+
$ chmod 0600 ./keys/gretel-key-rsa.pem ./keys/hansel-key-rsa.pem \
75+
./keys/gretel-key-ecc.pem ./keys/hansel-key-ecc.pem
76+
77+
Authentication against the example echoserver can be done with a password or
78+
public key. To use a password the command line:
79+
80+
$ ssh_client -p 22222 USER@localhost
81+
82+
Where the `USER` and password pairs are:
83+
84+
jill:upthehill
85+
jack:fetchapail
86+
87+
To use public key authentication use the command line:
88+
89+
$ ssh_client -i ./keys/key-USER.pem -p 22222 USER@localhost
90+
91+
Where the user can be `gretel` or `hansel`.
92+
93+
94+
scp support
95+
-----------
96+
97+
wolfSSH includes server-side support for scp, which includes support for both
98+
copying files 'to' the server, and copying files 'from' the server. Both
99+
single file and recursive directory copy are supported with the default
100+
send and receive callbacks.
101+
102+
To compile wolfSSH with scp support, use the `--enable-scp` build option
103+
or define `WOLFSSL_SCP`:
104+
105+
$ ./configure --enable-scp
106+
$ make
107+
108+
For full API usage and implementation details, please see the wolfSSH User
109+
Manual.
110+
111+
The wolfSSL example server has been set up to accept a single scp request,
112+
and is compiled by default when compiling the wolfSSH library. To start the
113+
example server, run:
114+
115+
$ ./examples/server/server
116+
117+
Standard scp commands can be used on the client side. The following are a
118+
few examples, where `scp` represents the ssh client you are using.
119+
120+
To copy a single file TO the server, using the default example user "jill":
121+
122+
$ scp -P 22222 <local_file> jill@127.0.0.1:<remote_path>
123+
124+
To copy the same single file TO the server, but with timestamp and in
125+
verbose mode:
126+
127+
$ scp -v -p -P 22222 <local_file> jill@127.0.0.1:<remote_path>
128+
129+
To recursively copy a directory TO the server:
130+
131+
$ scp -P 22222 -r <local_dir> jill@127.0.0.1:<remote_dir>
132+
133+
To copy a single file FROM the server to the local client:
134+
135+
$ scp -P 22222 jill@127.0.0.1:<remote_file> <local_path>
136+
137+
To recursively copy a directory FROM the server to the local client:
138+
139+
$ scp -P 22222 -r jill@127.0.0.1:<remote_dir> <local_path>
140+

‎README.md‎

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ For building under Windows with Visual Studio, see the file
4141
NOTE: On resource constrained devices the DEFAULT_WINDOW_SZ may need to be set
4242
to a lower size. By default channels are set to handle 1 Mb of data being sent
4343
and received. An example of setting a lower window size for new channels would
44-
be as follows "./configure C_EXTRA_FLAGS=-DDEFAULT_WINDOW_SZ=16384"
44+
be as follows "./configure CPPFLAGS=-DDEFAULT_WINDOW_SZ=16384"
4545

4646
examples
4747
--------
@@ -138,37 +138,3 @@ To recursively copy a directory FROM the server to the local client:
138138

139139
$ scp -P 22222 -r jill@127.0.0.1:<remote_dir> <local_path>
140140

141-
142-
release notes
143-
-------------
144-
145-
### wolfSSH v1.2.0 (09/26/2017)
146-
147-
- Added ECDH Group Exchange with SHA2 hashing and curves nistp256,
148-
nistp384, and nistp521.
149-
- Added ECDSA with SHA2 hashing and curves nistp256, nistp384, and nistp521.
150-
- Added client support.
151-
- Added an example client that talks to the echoserver.
152-
- Changed the echoserver to allow only one connection, but multiple
153-
connections are allowed with a command line option.
154-
- Added option to echoserver to offer an ECC public key.
155-
- Added a Visual Studio solution to build the library, examples, and tests.
156-
- Other bug fixes and enhancements.
157-
158-
### wolfSSH v1.1.0 (06/16/2017)
159-
160-
- Added DH Group Exchange with SHA-256 hashing to the key exchange.
161-
- Removed the canned banner and provided a function to set a banner string.
162-
If no sting is provided, no banner is sent.
163-
- Expanded the make checking to include an API test.
164-
- Added a function that returns session statistics.
165-
- When connecting to the echoserver, hitting Ctrl-E will give you some
166-
session statistics.
167-
- Parse and reply to the Global Request message.
168-
- Fixed a bug with client initiated rekeying.
169-
- Fixed a bug with the GetString function.
170-
- Other small bug fixes and enhancements.
171-
172-
### wolfSSH v1.0.0 (10/24/2016)
173-
174-
Initial release.

‎configure.ac‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# wolfssh
2-
# Copyright (C) 2014-2017 wolfSSL Inc.
2+
# Copyright (C) 2014-2018 wolfSSL Inc.
33
# All right reserved.
44

55
AC_COPYRIGHT([Copyright (C) 2014-2018 wolfSSL Inc.])
6-
AC_INIT([wolfssh],[1.2.2],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com])
6+
AC_INIT([wolfssh],[1.3.0],[support@wolfssl.com],[wolfssh],[https://www.wolfssl.com])
77
AC_PREREQ([2.63])
88
AC_CONFIG_AUX_DIR([build-aux])
99

@@ -20,7 +20,7 @@ AC_ARG_PROGRAM
2020
AC_CONFIG_MACRO_DIR([m4])
2121
AC_CONFIG_HEADERS([src/config.h])
2222

23-
WOLFSSH_LIBRARY_VERSION=4:0:0
23+
WOLFSSH_LIBRARY_VERSION=4:0:3
2424
# | | |
2525
# +------+ | +---+
2626
# | | |

‎wolfssh/version.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@
3333
extern "C" {
3434
#endif
3535

36-
#define LIBWOLFSSH_VERSION_STRING "1.2.2"
37-
#define LIBWOLFSSH_VERSION_HEX 0x01002002
36+
#define LIBWOLFSSH_VERSION_STRING "1.3.0"
37+
#define LIBWOLFSSH_VERSION_HEX 0x01003000
3838

3939
#ifdef __cplusplus
4040
}

0 commit comments

Comments
 (0)