Mass update of the Apache 2.0 license statement.

git-svn-id: svn://svn.code.sf.net/p/chibios/svn/trunk@11361 35acf78f-673a-0410-8e92-d51de3d6d3f4

21 files changed, 419 insertions, 419 deletions

diff --git a/os/various/cpp_wrappers/ch.cpp b/os/various/cpp_wrappers/ch.cpp
index e7ffe77e5..988906b7b 100644
--- a/os/various/cpp_wrappers/ch.cpp
+++ b/os/various/cpp_wrappers/ch.cpp
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/cpp_wrappers/ch.hpp b/os/various/cpp_wrappers/ch.hpp
index d658086df..407b702ec 100644
--- a/os/various/cpp_wrappers/ch.hpp
+++ b/os/various/cpp_wrappers/ch.hpp
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/evtimer.c b/os/various/evtimer.c
index 8eb2e6f5e..e9dcb93db 100644
--- a/os/various/evtimer.c
+++ b/os/various/evtimer.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/evtimer.h b/os/various/evtimer.h
index 923d7bfe4..f0591a8fc 100644
--- a/os/various/evtimer.h
+++ b/os/various/evtimer.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/fatfs_bindings/fatfs_syscall.c b/os/various/fatfs_bindings/fatfs_syscall.c
index b7ff0306e..bfa169418 100644
--- a/os/various/fatfs_bindings/fatfs_syscall.c
+++ b/os/various/fatfs_bindings/fatfs_syscall.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/arch/cc.h b/os/various/lwip_bindings/arch/cc.h
index 50c677a03..5258a8443 100644
--- a/os/various/lwip_bindings/arch/cc.h
+++ b/os/various/lwip_bindings/arch/cc.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/arch/perf.h b/os/various/lwip_bindings/arch/perf.h
index d8f280dd3..3a78c5e26 100644
--- a/os/various/lwip_bindings/arch/perf.h
+++ b/os/various/lwip_bindings/arch/perf.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/arch/sys_arch.c b/os/various/lwip_bindings/arch/sys_arch.c
index 8e0f56ea5..95e32d92b 100644
--- a/os/various/lwip_bindings/arch/sys_arch.c
+++ b/os/various/lwip_bindings/arch/sys_arch.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/arch/sys_arch.h b/os/various/lwip_bindings/arch/sys_arch.h
index a86f40b97..bbb35317b 100644
--- a/os/various/lwip_bindings/arch/sys_arch.h
+++ b/os/various/lwip_bindings/arch/sys_arch.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/lwipthread.c b/os/various/lwip_bindings/lwipthread.c
index 5a7b3d732..3b6166293 100644
--- a/os/various/lwip_bindings/lwipthread.c
+++ b/os/various/lwip_bindings/lwipthread.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/lwipthread.h b/os/various/lwip_bindings/lwipthread.h
index ae72ccb74..8018195f2 100644
--- a/os/various/lwip_bindings/lwipthread.h
+++ b/os/various/lwip_bindings/lwipthread.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/lwip_bindings/static_lwipopts.h b/os/various/lwip_bindings/static_lwipopts.h
index a59d4b41a..956e7176f 100644
--- a/os/various/lwip_bindings/static_lwipopts.h
+++ b/os/various/lwip_bindings/static_lwipopts.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/shell/shell.c b/os/various/shell/shell.c
index 3016dc6e8..1b6662136 100644
--- a/os/various/shell/shell.c
+++ b/os/various/shell/shell.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/shell/shell.h b/os/various/shell/shell.h
index 241cbb278..97518b4e0 100644
--- a/os/various/shell/shell.h
+++ b/os/various/shell/shell.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/shell/shell_cmd.c b/os/various/shell/shell_cmd.c
index 63a433e0c..37f80020e 100644
--- a/os/various/shell/shell_cmd.c
+++ b/os/various/shell/shell_cmd.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/shell/shell_cmd.h b/os/various/shell/shell_cmd.h
index 2fd454d7d..f913822e3 100644
--- a/os/various/shell/shell_cmd.h
+++ b/os/various/shell/shell_cmd.h
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/syscalls.c b/os/various/syscalls.c
index d4f6429cc..72e28a830 100644
--- a/os/various/syscalls.c
+++ b/os/various/syscalls.c
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/various.dox b/os/various/various.dox
index 86bfba524..0c8540e89 100644
--- a/os/various/various.dox
+++ b/os/various/various.dox
@@ -1,5 +1,5 @@
 /*

-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

 

     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

diff --git a/os/various/wolfssl_bindings/hwrng.c b/os/various/wolfssl_bindings/hwrng.c
index f437b49ef..ca11e4836 100644
--- a/os/various/wolfssl_bindings/hwrng.c
+++ b/os/various/wolfssl_bindings/hwrng.c
@@ -1,80 +1,80 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-/*
- * **** This file incorporates work covered by the following copyright and ****
- * **** permission notice:                                                 ****
- *
- * Copyright (C) 2006-2017 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- *
- */
-#include <ch.h>
-#include <stdint.h>
-#include "wolfssl_chibios.h"
-#include "user_settings.h"
-
-unsigned int chibios_rand_generate(void)
-{
-  static unsigned int last_value=0;
-  static unsigned int new_value=0;
-  unsigned int error_bits = 0;
-  error_bits = RNG_SR_SEIS | RNG_SR_CEIS;
-  while (new_value==last_value) {
-    /* Check for error flags and if data is ready. */
-    if ( ((RNG->SR & error_bits) == 0) && ( (RNG->SR & RNG_SR_DRDY) == 1 ) )
-      new_value=RNG->DR;
-  }
-  last_value=new_value;
-  return new_value;
-}
-
-int custom_rand_generate_block(unsigned char* output, unsigned int sz)
-{
-    uint32_t i = 0;
-
-    while (i < sz)
-    {
-        /* If not aligned or there is odd/remainder */
-        if( (i + sizeof(CUSTOM_RAND_TYPE)) > sz ||
-            ((uint32_t)&output[i] % sizeof(CUSTOM_RAND_TYPE)) != 0
-        ) {
-            /* Single byte at a time */
-            output[i++] = (unsigned char)chibios_rand_generate();
-        }
-        else {
-            /* Use native 8, 16, 32 or 64 copy instruction */
-            *((CUSTOM_RAND_TYPE*)&output[i]) = chibios_rand_generate();
-            i += sizeof(CUSTOM_RAND_TYPE);
-        }
-    }
-    return 0;
-}
-
+/*

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+/*

+ * **** This file incorporates work covered by the following copyright and ****

+ * **** permission notice:                                                 ****

+ *

+ * Copyright (C) 2006-2017 wolfSSL Inc.

+ *

+ * This file is part of wolfSSL.

+ *

+ * wolfSSL is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * wolfSSL 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 General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA

+ *

+ */

+#include <ch.h>

+#include <stdint.h>

+#include "wolfssl_chibios.h"

+#include "user_settings.h"

+

+unsigned int chibios_rand_generate(void)

+{

+  static unsigned int last_value=0;

+  static unsigned int new_value=0;

+  unsigned int error_bits = 0;

+  error_bits = RNG_SR_SEIS | RNG_SR_CEIS;

+  while (new_value==last_value) {

+    /* Check for error flags and if data is ready. */

+    if ( ((RNG->SR & error_bits) == 0) && ( (RNG->SR & RNG_SR_DRDY) == 1 ) )

+      new_value=RNG->DR;

+  }

+  last_value=new_value;

+  return new_value;

+}

+

+int custom_rand_generate_block(unsigned char* output, unsigned int sz)

+{

+    uint32_t i = 0;

+

+    while (i < sz)

+    {

+        /* If not aligned or there is odd/remainder */

+        if( (i + sizeof(CUSTOM_RAND_TYPE)) > sz ||

+            ((uint32_t)&output[i] % sizeof(CUSTOM_RAND_TYPE)) != 0

+        ) {

+            /* Single byte at a time */

+            output[i++] = (unsigned char)chibios_rand_generate();

+        }

+        else {

+            /* Use native 8, 16, 32 or 64 copy instruction */

+            *((CUSTOM_RAND_TYPE*)&output[i]) = chibios_rand_generate();

+            i += sizeof(CUSTOM_RAND_TYPE);

+        }

+    }

+    return 0;

+}

+

diff --git a/os/various/wolfssl_bindings/wolfssl_chibios.c b/os/various/wolfssl_bindings/wolfssl_chibios.c
index f73ddf095..4b6cff314 100644
--- a/os/various/wolfssl_bindings/wolfssl_chibios.c
+++ b/os/various/wolfssl_bindings/wolfssl_chibios.c
@@ -1,252 +1,252 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-/*
- * **** This file incorporates work covered by the following copyright and ****
- * **** permission notice:                                                 ****
- *
- * Copyright (C) 2006-2017 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- *
- */
-
-#include "ch.h"
-#include "wolfssl_chibios.h"
-#include "lwip/opt.h"
-#include "lwip/arch.h"
-#include "lwip/api.h"
-#include "lwip/mem.h"
-#include "lwip/sockets.h"
-#include "lwip/tcp.h"
-#include <string.h>
-static int wolfssl_is_initialized = 0;
-
-sslconn *sslconn_accept(sslconn *sk)
-{
-  sslconn *new;
-  struct netconn *newconn = NULL;
-  err_t err;
-  err = netconn_accept(sk->conn, &newconn);
-  if (err != ERR_OK) {
-      return NULL;
-  }
-  new = chHeapAlloc(NULL, sizeof(sslconn));
-  if (!new)
-      return NULL;
-  new->conn = newconn;
-  new->ctx = sk->ctx;
-  new->ssl = wolfSSL_new(new->ctx);
-  wolfSSL_SetIOReadCtx(new->ssl, new);
-  wolfSSL_SetIOWriteCtx(new->ssl, new);
-
-  if (wolfSSL_accept(new->ssl) == SSL_SUCCESS) {
-    wolfSSL_set_using_nonblock(new->ssl, 1);
-    newconn->pcb.tcp->mss = 1480;
-    return new;
-  } else {
-    wolfSSL_free(new->ssl);
-    chHeapFree(new);
-    return NULL;
-  }
-}
-
-sslconn *sslconn_new(enum netconn_type t, WOLFSSL_METHOD* method)
-{
-    sslconn *sk;
-    if (!wolfssl_is_initialized) {
-        wolfSSL_Init();
-        wolfssl_is_initialized++;
-    }
-
-    sk = chHeapAlloc(NULL, sizeof(sslconn));
-    if (!sk)
-        return NULL;
-    memset(sk, 0, sizeof(sslconn));
-    sk->ctx = wolfSSL_CTX_new(method);
-    if (!sk->ctx)
-        goto error;
-    sk->conn = netconn_new(t);
-    if (!sk->conn)
-        goto error;
-    wolfSSL_SetIORecv(sk->ctx, wolfssl_recv_cb);
-    wolfSSL_SetIOSend(sk->ctx, wolfssl_send_cb);
-    return sk;
-
-error:
-    if (sk->ctx)
-        wolfSSL_CTX_free(sk->ctx);
-    chHeapFree(sk);
-    return NULL;
-}
-
-void sslconn_close(sslconn *sk)
-{
-    netconn_delete(sk->conn);
-    wolfSSL_free(sk->ssl);
-    chHeapFree(sk);
-}
-
-
-/* IO Callbacks */
-int wolfssl_send_cb(WOLFSSL* ssl, char *buf, int sz, void *ctx)
-{
-  sslconn *sk = (sslconn *)ctx;
-  int err;
-  (void)ssl;
-  err = netconn_write(sk->conn, buf, sz, NETCONN_COPY);
-  if (err == ERR_OK)
-    return sz;
-  else
-    return -2;
-}
-
-
-#define MAX_SSL_BUF 1460
-static uint8_t ssl_recv_buffer[MAX_SSL_BUF];
-static int ssl_rb_len = 0;
-static int ssl_rb_off = 0;
-
-int wolfssl_recv_cb(WOLFSSL *ssl, char *buf, int sz, void *ctx)
-{
-    sslconn *sk = (sslconn *)ctx;
-    struct netbuf *inbuf = NULL;
-    uint8_t *net_buf;
-    uint16_t buflen;
-    (void)ssl;
-    err_t err;
-
-    if (ssl_rb_len > 0) {
-        if (sz > ssl_rb_len - ssl_rb_off)
-            sz = ssl_rb_len - ssl_rb_off;
-        memcpy(buf, ssl_recv_buffer + ssl_rb_off, sz);
-        ssl_rb_off += sz;
-        if (ssl_rb_off >= ssl_rb_len) {
-            ssl_rb_len = 0;
-            ssl_rb_off = 0;
-        }
-        return sz;
-    }
-
-
-    err = netconn_recv(sk->conn, &inbuf);
-    if (err == ERR_OK) {
-        netbuf_data(inbuf, (void **)&net_buf, &buflen);
-        ssl_rb_len = buflen;
-        if (ssl_rb_len > MAX_SSL_BUF)
-            ssl_rb_len = MAX_SSL_BUF;
-        memcpy(ssl_recv_buffer, net_buf, ssl_rb_len);
-        ssl_rb_off = 0;
-        if (sz > ssl_rb_len)
-            sz = ssl_rb_len;
-        memcpy(buf, ssl_recv_buffer, sz);
-        ssl_rb_off += sz;
-        if (ssl_rb_off >= ssl_rb_len) {
-            ssl_rb_len = 0;
-            ssl_rb_off = 0;
-        }
-        netbuf_delete(inbuf);
-        return sz;
-    }
-    else
-        return 0;
-    //return WOLFSSL_CBIO_ERR_WANT_READ;
-}
-
-#ifndef ST2S
-#   define ST2S(n) (((n) + CH_CFG_ST_FREQUENCY - 1UL) / CH_CFG_ST_FREQUENCY)
-#endif
-
-#ifndef ST2MS
-#define ST2MS(n) (((n) * 1000UL + CH_CFG_ST_FREQUENCY - 1UL) / CH_CFG_ST_FREQUENCY)
-#endif
-
-
-word32 LowResTimer(void)
-{
-    systime_t t = chVTGetSystemTimeX();
-    return ST2S(t);
-}
-
-uint32_t TimeNowInMilliseconds(void)
-{
-    systime_t t = chVTGetSystemTimeX();
-    return ST2MS(t);
-}
-
-void *chHeapRealloc (void *addr, uint32_t size)
-{
-    union heap_header *hp;
-    uint32_t prev_size, new_size;
-
-    void *ptr;
-
-    if(addr == NULL) {
-        return chHeapAlloc(NULL, size);
-    }
-
-    /* previous allocated segment is preceded by an heap_header */
-    hp = addr - sizeof(union heap_header);
-    prev_size = hp->used.size; /* size is always multiple of 8 */
-
-    /* check new size memory alignment */
-    if(size % 8 == 0) {
-        new_size = size;
-    }
-    else {
-        new_size = ((int) (size / 8)) * 8 + 8;
-    }
-
-    if(prev_size >= new_size) {
-        return addr;
-    }
-
-    ptr = chHeapAlloc(NULL, size);
-    if(ptr == NULL) {
-        return NULL;
-    }
-
-    memcpy(ptr, addr, prev_size);
-
-    chHeapFree(addr);
-
-    return ptr;
-}
-
-void *chibios_alloc(void *heap, int size)
-{
-    return chHeapAlloc(heap, size);
-}
-
-void chibios_free(void *ptr)
-{
-    if (ptr)
-        chHeapFree(ptr);
-}
-
+/*

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+/*

+ * **** This file incorporates work covered by the following copyright and ****

+ * **** permission notice:                                                 ****

+ *

+ * Copyright (C) 2006-2017 wolfSSL Inc.

+ *

+ * This file is part of wolfSSL.

+ *

+ * wolfSSL is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * wolfSSL 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 General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA

+ *

+ */

+

+#include "ch.h"

+#include "wolfssl_chibios.h"

+#include "lwip/opt.h"

+#include "lwip/arch.h"

+#include "lwip/api.h"

+#include "lwip/mem.h"

+#include "lwip/sockets.h"

+#include "lwip/tcp.h"

+#include <string.h>

+static int wolfssl_is_initialized = 0;

+

+sslconn *sslconn_accept(sslconn *sk)

+{

+  sslconn *new;

+  struct netconn *newconn = NULL;

+  err_t err;

+  err = netconn_accept(sk->conn, &newconn);

+  if (err != ERR_OK) {

+      return NULL;

+  }

+  new = chHeapAlloc(NULL, sizeof(sslconn));

+  if (!new)

+      return NULL;

+  new->conn = newconn;

+  new->ctx = sk->ctx;

+  new->ssl = wolfSSL_new(new->ctx);

+  wolfSSL_SetIOReadCtx(new->ssl, new);

+  wolfSSL_SetIOWriteCtx(new->ssl, new);

+

+  if (wolfSSL_accept(new->ssl) == SSL_SUCCESS) {

+    wolfSSL_set_using_nonblock(new->ssl, 1);

+    newconn->pcb.tcp->mss = 1480;

+    return new;

+  } else {

+    wolfSSL_free(new->ssl);

+    chHeapFree(new);

+    return NULL;

+  }

+}

+

+sslconn *sslconn_new(enum netconn_type t, WOLFSSL_METHOD* method)

+{

+    sslconn *sk;

+    if (!wolfssl_is_initialized) {

+        wolfSSL_Init();

+        wolfssl_is_initialized++;

+    }

+

+    sk = chHeapAlloc(NULL, sizeof(sslconn));

+    if (!sk)

+        return NULL;

+    memset(sk, 0, sizeof(sslconn));

+    sk->ctx = wolfSSL_CTX_new(method);

+    if (!sk->ctx)

+        goto error;

+    sk->conn = netconn_new(t);

+    if (!sk->conn)

+        goto error;

+    wolfSSL_SetIORecv(sk->ctx, wolfssl_recv_cb);

+    wolfSSL_SetIOSend(sk->ctx, wolfssl_send_cb);

+    return sk;

+

+error:

+    if (sk->ctx)

+        wolfSSL_CTX_free(sk->ctx);

+    chHeapFree(sk);

+    return NULL;

+}

+

+void sslconn_close(sslconn *sk)

+{

+    netconn_delete(sk->conn);

+    wolfSSL_free(sk->ssl);

+    chHeapFree(sk);

+}

+

+

+/* IO Callbacks */

+int wolfssl_send_cb(WOLFSSL* ssl, char *buf, int sz, void *ctx)

+{

+  sslconn *sk = (sslconn *)ctx;

+  int err;

+  (void)ssl;

+  err = netconn_write(sk->conn, buf, sz, NETCONN_COPY);

+  if (err == ERR_OK)

+    return sz;

+  else

+    return -2;

+}

+

+

+#define MAX_SSL_BUF 1460

+static uint8_t ssl_recv_buffer[MAX_SSL_BUF];

+static int ssl_rb_len = 0;

+static int ssl_rb_off = 0;

+

+int wolfssl_recv_cb(WOLFSSL *ssl, char *buf, int sz, void *ctx)

+{

+    sslconn *sk = (sslconn *)ctx;

+    struct netbuf *inbuf = NULL;

+    uint8_t *net_buf;

+    uint16_t buflen;

+    (void)ssl;

+    err_t err;

+

+    if (ssl_rb_len > 0) {

+        if (sz > ssl_rb_len - ssl_rb_off)

+            sz = ssl_rb_len - ssl_rb_off;

+        memcpy(buf, ssl_recv_buffer + ssl_rb_off, sz);

+        ssl_rb_off += sz;

+        if (ssl_rb_off >= ssl_rb_len) {

+            ssl_rb_len = 0;

+            ssl_rb_off = 0;

+        }

+        return sz;

+    }

+

+

+    err = netconn_recv(sk->conn, &inbuf);

+    if (err == ERR_OK) {

+        netbuf_data(inbuf, (void **)&net_buf, &buflen);

+        ssl_rb_len = buflen;

+        if (ssl_rb_len > MAX_SSL_BUF)

+            ssl_rb_len = MAX_SSL_BUF;

+        memcpy(ssl_recv_buffer, net_buf, ssl_rb_len);

+        ssl_rb_off = 0;

+        if (sz > ssl_rb_len)

+            sz = ssl_rb_len;

+        memcpy(buf, ssl_recv_buffer, sz);

+        ssl_rb_off += sz;

+        if (ssl_rb_off >= ssl_rb_len) {

+            ssl_rb_len = 0;

+            ssl_rb_off = 0;

+        }

+        netbuf_delete(inbuf);

+        return sz;

+    }

+    else

+        return 0;

+    //return WOLFSSL_CBIO_ERR_WANT_READ;

+}

+

+#ifndef ST2S

+#   define ST2S(n) (((n) + CH_CFG_ST_FREQUENCY - 1UL) / CH_CFG_ST_FREQUENCY)

+#endif

+

+#ifndef ST2MS

+#define ST2MS(n) (((n) * 1000UL + CH_CFG_ST_FREQUENCY - 1UL) / CH_CFG_ST_FREQUENCY)

+#endif

+

+

+word32 LowResTimer(void)

+{

+    systime_t t = chVTGetSystemTimeX();

+    return ST2S(t);

+}

+

+uint32_t TimeNowInMilliseconds(void)

+{

+    systime_t t = chVTGetSystemTimeX();

+    return ST2MS(t);

+}

+

+void *chHeapRealloc (void *addr, uint32_t size)

+{

+    union heap_header *hp;

+    uint32_t prev_size, new_size;

+

+    void *ptr;

+

+    if(addr == NULL) {

+        return chHeapAlloc(NULL, size);

+    }

+

+    /* previous allocated segment is preceded by an heap_header */

+    hp = addr - sizeof(union heap_header);

+    prev_size = hp->used.size; /* size is always multiple of 8 */

+

+    /* check new size memory alignment */

+    if(size % 8 == 0) {

+        new_size = size;

+    }

+    else {

+        new_size = ((int) (size / 8)) * 8 + 8;

+    }

+

+    if(prev_size >= new_size) {

+        return addr;

+    }

+

+    ptr = chHeapAlloc(NULL, size);

+    if(ptr == NULL) {

+        return NULL;

+    }

+

+    memcpy(ptr, addr, prev_size);

+

+    chHeapFree(addr);

+

+    return ptr;

+}

+

+void *chibios_alloc(void *heap, int size)

+{

+    return chHeapAlloc(heap, size);

+}

+

+void chibios_free(void *ptr)

+{

+    if (ptr)

+        chHeapFree(ptr);

+}

+

diff --git a/os/various/wolfssl_bindings/wolfssl_chibios.h b/os/various/wolfssl_bindings/wolfssl_chibios.h
index 18f7781be..e29a40941 100644
--- a/os/various/wolfssl_bindings/wolfssl_chibios.h
+++ b/os/various/wolfssl_bindings/wolfssl_chibios.h
@@ -1,69 +1,69 @@
-/*
-    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-/*
- * **** This file incorporates work covered by the following copyright and ****
- * **** permission notice:                                                 ****
- *
- * Copyright (C) 2006-2017 wolfSSL Inc.
- *
- * This file is part of wolfSSL.
- *
- * wolfSSL is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * wolfSSL 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA
- *
- */
-#ifndef WOLFSSL_SK_H
-#define WOLFSSL_SK_H
-#include "wolfssl/ssl.h"
-#include "wolfssl/wolfcrypt/types.h"
-#include "lwip/opt.h"
-#include "lwip/arch.h"
-#include "lwip/api.h"
-#include "user_settings.h"
-#define XMALLOC(s,h,t) chibios_alloc(h,s)
-#define XFREE(p,h,t)   chibios_free(p)
-
-struct sslconn {
-    WOLFSSL_CTX *ctx;
-    WOLFSSL *ssl;
-    struct netconn *conn;
-};
-
-typedef struct sslconn sslconn;
-
-sslconn *sslconn_accept(struct sslconn *sk);
-sslconn *sslconn_new(enum netconn_type t, WOLFSSL_METHOD *method);
-void sslconn_close(sslconn *sk);
-
-int wolfssl_send_cb(WOLFSSL* ssl, char *buf, int sz, void *ctx);
-int wolfssl_recv_cb(WOLFSSL *ssl, char *buf, int sz, void *ctx);
-
-void *chibios_alloc(void *heap, int size);
-void chibios_free(void *ptr);
-word32 LowResTimer(void);
-
-#endif
+/*

+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio

+

+    Licensed under the Apache License, Version 2.0 (the "License");

+    you may not use this file except in compliance with the License.

+    You may obtain a copy of the License at

+

+        http://www.apache.org/licenses/LICENSE-2.0

+

+    Unless required by applicable law or agreed to in writing, software

+    distributed under the License is distributed on an "AS IS" BASIS,

+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

+    See the License for the specific language governing permissions and

+    limitations under the License.

+*/

+/*

+ * **** This file incorporates work covered by the following copyright and ****

+ * **** permission notice:                                                 ****

+ *

+ * Copyright (C) 2006-2017 wolfSSL Inc.

+ *

+ * This file is part of wolfSSL.

+ *

+ * wolfSSL is free software; you can redistribute it and/or modify

+ * it under the terms of the GNU General Public License as published by

+ * the Free Software Foundation; either version 2 of the License, or

+ * (at your option) any later version.

+ *

+ * wolfSSL 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 General Public License for more details.

+ *

+ * You should have received a copy of the GNU General Public License

+ * along with this program; if not, write to the Free Software

+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1335, USA

+ *

+ */

+#ifndef WOLFSSL_SK_H

+#define WOLFSSL_SK_H

+#include "wolfssl/ssl.h"

+#include "wolfssl/wolfcrypt/types.h"

+#include "lwip/opt.h"

+#include "lwip/arch.h"

+#include "lwip/api.h"

+#include "user_settings.h"

+#define XMALLOC(s,h,t) chibios_alloc(h,s)

+#define XFREE(p,h,t)   chibios_free(p)

+

+struct sslconn {

+    WOLFSSL_CTX *ctx;

+    WOLFSSL *ssl;

+    struct netconn *conn;

+};

+

+typedef struct sslconn sslconn;

+

+sslconn *sslconn_accept(struct sslconn *sk);

+sslconn *sslconn_new(enum netconn_type t, WOLFSSL_METHOD *method);

+void sslconn_close(sslconn *sk);

+

+int wolfssl_send_cb(WOLFSSL* ssl, char *buf, int sz, void *ctx);

+int wolfssl_recv_cb(WOLFSSL *ssl, char *buf, int sz, void *ctx);

+

+void *chibios_alloc(void *heap, int size);

+void chibios_free(void *ptr);

+word32 LowResTimer(void);

+

+#endif