Realtek-rtl8195am-Network Socket Updates

.travis.yml

@@ -1,3 +1,19 @@
+# Copyright (c) 2013-2018 Arm Limited. All rights reserved.
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+# 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
+#
+# 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.
+
 language: python
 python: 2.7
 
@@ -118,7 +134,7 @@ matrix:
     - env:
         - NAME=astyle
       install:
-      - curl -L0 http://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
+      - curl -L0 https://mbed-os.s3-eu-west-1.amazonaws.com/builds/deps/astyle_3.1_linux.tar.gz --output astyle.tar.gz;
         mkdir -p BUILD && tar xf astyle.tar.gz -C BUILD;
         pushd BUILD/astyle/build/gcc;
         make;

TESTS/netsocket/tcp/main.cpp

@@ -163,7 +163,7 @@ Case cases[] = {
     Case("TCPSOCKET_BIND_ADDRESS", TCPSOCKET_BIND_ADDRESS),
     Case("TCPSOCKET_BIND_WRONG_TYPE", TCPSOCKET_BIND_WRONG_TYPE),
     Case("TCPSOCKET_BIND_UNOPENED", TCPSOCKET_BIND_UNOPENED),
-    Case("TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID", TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID)
+    Case("TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID", TCPSOCKET_SETSOCKOPT_KEEPALIVE_VALID),
     Case("TCPSOCKET_RECV_100K", TCPSOCKET_RECV_100K),
     Case("TCPSOCKET_RECV_100K_NONBLOCK", TCPSOCKET_RECV_100K_NONBLOCK),
     Case("TCPSOCKET_RECV_TIMEOUT", TCPSOCKET_RECV_TIMEOUT),

cmsis/TARGET_CORTEX_M/mbed_fault_handler.c

@@ -18,6 +18,7 @@
 #define __STDC_FORMAT_MACROS
 #endif
 #include <inttypes.h>
+#include <string.h>
 
 #include "device.h"
 #include "mbed_error.h"

features/FEATURE_BLE/source/BLE.cpp

@@ -29,7 +29,7 @@
 
 #if !defined(YOTTA_CFG_MBED_OS)
 #include <mbed_error.h>
-#include <toolchain.h>
+#include <mbed_toolchain.h>
 #endif
 
 #if defined(__GNUC__) && !defined(__CC_ARM)

features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.c

@@ -21,11 +21,11 @@
 #include "mbedtls/sha1.h"
 #if defined(MBEDTLS_SHA1_ALT)
 #include <string.h>
+#include "mbedtls/platform.h"
 
 void mbedtls_sha1_init( mbedtls_sha1_context *ctx )
 {
     memset( ctx, 0, sizeof( mbedtls_sha1_context ) );
-
 }
 
 void mbedtls_sha1_free( mbedtls_sha1_context *ctx )
@@ -64,10 +64,10 @@ int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
 int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
                              unsigned char output[20] )
 {
-    CRYSError_t CrysErr = CRYS_OK;
+    CRYSError_t crys_err = CRYS_OK;
     CRYS_HASH_Result_t crys_result = {0};
-    CrysErr = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
-    if( CrysErr == CRYS_OK )
+    crys_err = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
+    if( crys_err == CRYS_OK )
     {
         memcpy( output, crys_result, 20 );
         return ( 0 );
@@ -79,8 +79,6 @@ int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
 int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
                                    const unsigned char data[64] )
 {
-    if( CRYS_HASH_Update( &ctx->crys_hash_ctx, (uint8_t*)data, 64 ) != CRYS_OK )
-        return ( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
-    return ( 0 );
+    return( MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED );
 }
 #endif //MBEDTLS_SHA1_ALT

features/cryptocell/FEATURE_CRYPTOCELL310/sha1_alt.h

@@ -22,10 +22,6 @@
 #define __SHA1_ALT__
 #if defined(MBEDTLS_SHA1_ALT)
 #include "crys_hash.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 
 /**
  * \brief          SHA-1 context structure
@@ -35,114 +31,6 @@ typedef struct
     CRYS_HASHUserContext_t crys_hash_ctx;
 } mbedtls_sha1_context;
 
-/**
- * \brief          This function initializes a SHA-1 context.
- *
- * \param ctx      The SHA-1 context to initialize.
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-void mbedtls_sha1_init( mbedtls_sha1_context *ctx );
-
-/**
- * \brief          This function clears a SHA-1 context.
- *
- * \param ctx      The SHA-1 context to clear.
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-void mbedtls_sha1_free( mbedtls_sha1_context *ctx );
-
-/**
- * \brief          This function clones the state of a SHA-1 context.
- *
- * \param dst      The destination context.
- * \param src      The context to clone.
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-void mbedtls_sha1_clone( mbedtls_sha1_context *dst,
-                         const mbedtls_sha1_context *src );
-
-/**
- * \brief          This function starts a SHA-1 checksum calculation.
- *
- * \param ctx      The context to initialize.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_sha1_starts_ret( mbedtls_sha1_context *ctx );
-
-/**
- * \brief          This function feeds an input buffer into an ongoing SHA-1
- *                 checksum calculation.
- *
- * \param ctx      The SHA-1 context.
- * \param input    The buffer holding the input data.
- * \param ilen     The length of the input data.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_sha1_update_ret( mbedtls_sha1_context *ctx,
-                             const unsigned char *input,
-                             size_t ilen );
-
-/**
- * \brief          This function finishes the SHA-1 operation, and writes
- *                 the result to the output buffer.
- *
- * \param ctx      The SHA-1 context.
- * \param output   The SHA-1 checksum result.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_sha1_finish_ret( mbedtls_sha1_context *ctx,
-                             unsigned char output[20] );
-
-/**
- * \brief          SHA-1 process data block (internal use only)
- *
- * \param ctx      SHA-1 context
- * \param data     The data block being processed.
- *
- * \return         \c 0 if successful
- *
- * \warning        SHA-1 is considered a weak message digest and its use
- *                 constitutes a security risk. We recommend considering
- *                 stronger message digests instead.
- *
- */
-int mbedtls_internal_sha1_process( mbedtls_sha1_context *ctx,
-                                   const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif //MBEDTLS_SHA1_ALT
 #endif //__SHA1_ALT__
 

features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.c

@@ -21,11 +21,11 @@
 #include "mbedtls/sha256.h"
 #if defined(MBEDTLS_SHA256_ALT)
 #include <string.h>
+#include "mbedtls/platform.h"
 
 void mbedtls_sha256_init( mbedtls_sha256_context *ctx )
 {
     memset( ctx, 0, sizeof( mbedtls_sha256_context ) );
-
 }
 
 void mbedtls_sha256_free( mbedtls_sha256_context *ctx )
@@ -54,9 +54,7 @@ int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 )
 int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
                                      const unsigned char data[64] )
 {
-    if( CRYS_HASH_Update( &ctx->crys_hash_ctx, (uint8_t*)data, 64 ) != CRYS_OK )
-        return ( MBEDTLS_ERR_PLATFORM_HW_ACCEL_FAILED );
-    return ( 0 );
+    return( MBEDTLS_ERR_PLATFORM_FEATURE_UNSUPPORTED );
 }
 
 int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
@@ -71,10 +69,10 @@ int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
 int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
                                unsigned char output[32] )
 {
-    CRYSError_t CrysErr = CRYS_OK;
+    CRYSError_t crys_err = CRYS_OK;
     CRYS_HASH_Result_t crys_result = {0};
-    CrysErr = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
-    if( CrysErr == CRYS_OK )
+    crys_err = CRYS_HASH_Finish( &ctx->crys_hash_ctx, crys_result );
+    if( crys_err == CRYS_OK )
     {
         memcpy( output, crys_result, 32 );
         return ( 0 );

features/cryptocell/FEATURE_CRYPTOCELL310/sha256_alt.h

@@ -24,10 +24,6 @@
 #if defined(MBEDTLS_SHA256_ALT)
 
 #include "crys_hash.h"
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 
 /**
  * \brief          SHA-256 context structure
@@ -37,85 +33,5 @@ typedef struct
     CRYS_HASHUserContext_t crys_hash_ctx;
 } mbedtls_sha256_context;
 
-
-/**
- * \brief          This function initializes a SHA-256 context.
- *
- * \param ctx      The SHA-256 context to initialize.
- */
-void mbedtls_sha256_init( mbedtls_sha256_context *ctx );
-
-/**
- * \brief          This function clears a SHA-256 context.
- *
- * \param ctx      The SHA-256 context to clear.
- */
-void mbedtls_sha256_free( mbedtls_sha256_context *ctx );
-
-/**
- * \brief          This function clones the state of a SHA-256 context.
- *
- * \param dst      The destination context.
- * \param src      The context to clone.
- */
-void mbedtls_sha256_clone( mbedtls_sha256_context *dst,
-                           const mbedtls_sha256_context *src );
-
-/**
- * \brief          This function starts a SHA-224 or SHA-256 checksum
- *                 calculation.
- *
- * \param ctx      The context to initialize.
- * \param is224    Determines which function to use.
- *                 <ul><li>0: Use SHA-256.</li>
- *                 <li>1: Use SHA-224.</li></ul>
- *
- * \return         \c 0 on success.
- */
-int mbedtls_sha256_starts_ret( mbedtls_sha256_context *ctx, int is224 );
-
-/**
- * \brief          This function feeds an input buffer into an ongoing
- *                 SHA-256 checksum calculation.
- *
- * \param ctx      SHA-256 context
- * \param input    buffer holding the data
- * \param ilen     length of the input data
- *
- * \return         \c 0 on success.
- */
-int mbedtls_sha256_update_ret( mbedtls_sha256_context *ctx,
-                               const unsigned char *input,
-                               size_t ilen );
-
-/**
- * \brief          This function finishes the SHA-256 operation, and writes
- *                 the result to the output buffer.
- *
- * \param ctx      The SHA-256 context.
- * \param output   The SHA-224 or SHA-256 checksum result.
- *
- * \return         \c 0 on success.
- */
-int mbedtls_sha256_finish_ret( mbedtls_sha256_context *ctx,
-                               unsigned char output[32] );
-
-/**
- * \brief          This function processes a single data block within
- *                 the ongoing SHA-256 computation. This function is for
- *                 internal use only.
- *
- * \param ctx      The SHA-256 context.
- * \param data     The buffer holding one block of data.
- *
- * \return         \c 0 on success.
- */
-int mbedtls_internal_sha256_process( mbedtls_sha256_context *ctx,
-                                     const unsigned char data[64] );
-
-#ifdef __cplusplus
-}
-#endif
-
 #endif // MBEDTLS_SHA256_ALT__
 #endif //__SHA256_ALT__

features/lwipstack/mbed_lib.json

@@ -115,7 +115,8 @@
     },
     "target_overrides": {
         "REALTEK_RTL8195AM": {
-            "tcpip-thread-stacksize": 1600
+            "tcpip-thread-stacksize": 1600,
+            "mem-size": 12800
         },
         "UBLOX_EVK_ODIN_W2": {
             "pbuf-pool-size" :  10

features/nanostack/mbed-mesh-api/source/NanostackEthernetInterface.cpp

@@ -97,6 +97,5 @@ nsapi_error_t NanostackEthernetInterface::do_initialize()
 
 nsapi_error_t Nanostack::EthernetInterface::bringdown()
 {
-    enet_tasklet_disconnect();
-    return 0;
+    return enet_tasklet_disconnect(true);
 }

features/nanostack/mbed-mesh-api/source/ethernet_tasklet.c

@@ -24,6 +24,7 @@
 #include "ns_event_loop.h"
 #include "mesh_interface_types.h"
 #include "eventOS_event.h"
+#include "enet_tasklet.h"
 
 // For tracing we need to define flag, have include and define group
 #include "ns_trace.h"