Merge branch 'development' into beta-release-restricted

* development:
  Remove warning about needing future yotta version
  Cosmetics in create-module.sh
  Use more reliable host in example-tls-client
This commit is contained in:
Manuel Pégourié-Gonnard 2015-08-17 15:01:49 +02:00
commit fe77551383
4 changed files with 11 additions and 12 deletions

View file

@ -41,4 +41,4 @@ mkdir -p $DEST
rsync -cr --delete --exclude build --exclude yotta_\* $TMP/ $DEST/
rm -rf $TMP
echo "mbed TLS yotta module created in '$DEST'."
echo "mbed TLS yotta module created in '$PWD/$DEST'."

View file

@ -22,8 +22,6 @@ Please follow the instructions in the [TLS client sample](https://github.com/ARM
## Configuring mbed TLS features
**Warning:** This is only a preview of a future feature that will require support from yotta; as of yotta 0.5.2 this is not supported yet.
mbed TLS makes it easy to disable during the compilation any feature that is not needed for a particular project. The default configuration enables all modern and widely-used features, which should meet the need of any new project; it disables all features that are either older or less mainstrem, in order to keep the footprint low. The list of available compile flags is available in the fully documented [config.h file](https://github.com/ARMmbed/mbedtls/blob/development/include/mbedtls/config.h), present in the `mbedtls` directory of the yotta module.
Should you need to adjust those flags, you can provide your own configuration file with the suitable `#define` and `#undef` statements, to be included between the default definitions and the sanity checks. This file should be in your application's include directory and can be named freely; you just need to let mbed TLS know the name of the file, by using yotta's [configuration system](http://docs.yottabuild.org/reference/config.html). This name should go in your `config.json`, under mbedtls, as the key `user-config-file`, for example:

View file

@ -57,7 +57,7 @@ To build and run this example the requirements below are necessary:
10. The output in the terminal window should look like:
```
{{timeout;120}}
{timeout;120}}
{{host_test_name;default}}
{{description;mbed TLS example HTTPS client}}
{{test_id;MBEDTLS_EX_HTTPS_CLIENT}}
@ -66,6 +66,7 @@ To build and run this example the requirements below are necessary:
Client IP Address is 192.168.0.2
Connecting to developer.mbed.org:443
developer.mbed.org address: 217.140.101.20
TLS connection to developer.mbed.org established
Server certificate:
cert. version : 3
@ -82,25 +83,25 @@ To build and run this example the requirements below are necessary:
ext key usage : TLS Web Server Authentication, TLS Web Client Authentication
Certificate verification passed
HTTPS: Received 473 chars from server
HTTPS: Received 469 chars from server
HTTPS: Received 200 OK status ... [OK]
HTTPS: Received 'Hello world!' status ... [OK]
HTTPS: Received message:
HTTP/1.1 200 OK
Server: nginx/1.7.10
Date: Tue, 28 Jul 2015 14:32:30 GMT
Date: Mon, 17 Aug 2015 11:46:19 GMT
Content-Type: text/plain
Content-Length: 14
Connection: keep-alive
Last-Modified: Fri, 27 Jul 2012 13:30:34 GMT
Accept-Ranges: bytes
Cache-Control: max-age=36000
Expires: Wed, 29 Jul 2015 00:32:30 GMT
Expires: Mon, 17 Aug 2015 21:46:19 GMT
X-Upstream-L3: 172.17.42.1:8080
X-Upstream-L2: developer-sjc-indigo-1-nginx
X-Upstream-L1-next-hop: 217.140.101.34:8001
X-Upstream-L1: developer-sjc-indigo-border-nginx
X-Upstream-L2: developer-sjc-cyan-1-nginx
X-Upstream-L1-next-hop: 217.140.101.22:8001
X-Upstream-L1: developer-sjc-cyan-border-nginx
Hello world!
{{success}}

View file

@ -62,11 +62,11 @@ int main() {
#include "lwipv4_init.h"
namespace {
const char *HTTPS_SERVER_NAME = "mbed.org";
const char *HTTPS_SERVER_NAME = "developer.mbed.org";
const int HTTPS_SERVER_PORT = 443;
const int RECV_BUFFER_SIZE = 600;
const char HTTPS_PATH[] = "/assets/uploads/hello.txt";
const char HTTPS_PATH[] = "/media/uploads/mbed_official/hello.txt";
const size_t HTTPS_PATH_LEN = sizeof(HTTPS_PATH) - 1;
/* Test related data */