ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Astyle fixes

pull/8659/head
Seppo Takalo 2018-11-19 15:31:31 +02:00
parent 5d170f2b3e
commit bdc355f873
8 changed files with 29 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
UNITTESTS/features/netsocket/DTLSSocketWrapper/test_DTLSSocketWrapper.cpp
View File

@ -36,7 +36,7 @@ public:
unsigned int dataSize = 10; unsigned int dataSize = 10;
char dataBuf[10]; char dataBuf[10];
protected: protected:
UDPSocket* transport; UDPSocket *transport;
DTLSSocketWrapper *wrapper; DTLSSocketWrapper *wrapper;
NetworkStackstub stack; NetworkStackstub stack;
@ -60,7 +60,7 @@ protected:
delete wrapper; delete wrapper;
} }
char* cert = "-----BEGIN CERTIFICATE-----\ char *cert = "-----BEGIN CERTIFICATE-----\
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\ MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\ MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\ DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\
@ -304,10 +304,10 @@ TEST_F(TestDTLSSocketWrapper, recv_from_null)
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert) TEST_F(TestDTLSSocketWrapper, set_root_ca_cert)
{ {
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
} }
TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_nolen) TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_nolen)
@ -327,10 +327,10 @@ TEST_F(TestDTLSSocketWrapper, set_root_ca_cert_invalid)
TEST_F(TestDTLSSocketWrapper, set_client_cert_key) TEST_F(TestDTLSSocketWrapper, set_client_cert_key)
{ {
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
} }
TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid) TEST_F(TestDTLSSocketWrapper, set_client_cert_key_invalid)

12
UNITTESTS/features/netsocket/TLSSocketWrapper/test_TLSSocketWrapper.cpp
View File

@ -36,7 +36,7 @@ public:
unsigned int dataSize = 10; unsigned int dataSize = 10;
char dataBuf[10]; char dataBuf[10];
protected: protected:
TCPSocket* transport; TCPSocket *transport;
TLSSocketWrapper *wrapper; TLSSocketWrapper *wrapper;
NetworkStackstub stack; NetworkStackstub stack;
@ -58,7 +58,7 @@ protected:
delete wrapper; delete wrapper;
} }
char* cert = "-----BEGIN CERTIFICATE-----\ char *cert = "-----BEGIN CERTIFICATE-----\
MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\ MIIEkjCCA3qgAwIBAgIQCgFBQgAAAVOFc2oLheynCDANBgkqhkiG9w0BAQsFADA/\
MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\ MSQwIgYDVQQKExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMT\
DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\ DkRTVCBSb290IENBIFgzMB4XDTE2MDMxNzE2NDA0NloXDTIxMDMxNzE2NDA0Nlow\
@ -319,10 +319,10 @@ TEST_F(TestTLSSocketWrapper, recv_from_null)
TEST_F(TestTLSSocketWrapper, set_root_ca_cert) TEST_F(TestTLSSocketWrapper, set_root_ca_cert)
{ {
EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_EQ(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_root_ca_cert(cert, strlen(cert)), NSAPI_ERROR_OK);
EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_NE(wrapper->get_ca_chain(), static_cast<mbedtls_x509_crt *>(NULL));
} }
TEST_F(TestTLSSocketWrapper, set_root_ca_cert_nolen) TEST_F(TestTLSSocketWrapper, set_root_ca_cert_nolen)
@ -341,10 +341,10 @@ TEST_F(TestTLSSocketWrapper, set_root_ca_cert_invalid)
TEST_F(TestTLSSocketWrapper, set_client_cert_key) TEST_F(TestTLSSocketWrapper, set_client_cert_key)
{ {
EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_EQ(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK); EXPECT_EQ(transport->open((NetworkStack *)&stack), NSAPI_ERROR_OK);
EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK); EXPECT_EQ(wrapper->set_client_cert_key(cert, cert), NSAPI_ERROR_OK);
EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt*>(NULL)); EXPECT_NE(wrapper->get_own_cert(), static_cast<mbedtls_x509_crt *>(NULL));
} }
TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid) TEST_F(TestTLSSocketWrapper, set_client_cert_key_invalid)

3
UNITTESTS/stubs/NetworkStack_stub.h
View File

@ -114,8 +114,7 @@ protected:
virtual nsapi_size_or_error_t socket_recvfrom(nsapi_socket_t handle, SocketAddress *address, virtual nsapi_size_or_error_t socket_recvfrom(nsapi_socket_t handle, SocketAddress *address,
void *buffer, nsapi_size_t size) void *buffer, nsapi_size_t size)
{ {
if (return_socketAddress != SocketAddress()) if (return_socketAddress != SocketAddress()) {
{
*address = return_socketAddress; *address = return_socketAddress;
} }
if (!return_values.empty()) { if (!return_values.empty()) {

5
features/netsocket/DTLSSocket.cpp
View File

@ -50,9 +50,8 @@ nsapi_error_t DTLSSocket::connect(const char *host, uint16_t port)
DTLSSocket::~DTLSSocket() DTLSSocket::~DTLSSocket()
{ {
/* Make sure that DTLSSocketWrapper::close() is called before the transport is // Make sure that DTLSSocketWrapper::close() is called before the transport is
* destroyed. // destroyed.
*/
close(); close();
} }

6
features/netsocket/DTLSSocket.h
View File

@ -62,12 +62,14 @@ public:
* @param stack Network stack as target for socket * @param stack Network stack as target for socket
* @return 0 on success, negative error code on failure * @return 0 on success, negative error code on failure
*/ */
virtual nsapi_error_t open(NetworkStack *stack) { virtual nsapi_error_t open(NetworkStack *stack)
{
return _udp_socket.open(stack); return _udp_socket.open(stack);
} }
template <typename S> template <typename S>
nsapi_error_t open(S *stack) { nsapi_error_t open(S *stack)
{
return open(nsapi_create_stack(stack)); return open(nsapi_create_stack(stack));
} }

4
features/netsocket/DTLSSocketWrapper.cpp
View File

@ -12,8 +12,8 @@ DTLSSocketWrapper::DTLSSocketWrapper(Socket *transport, const char *hostname, co
_timer_event_id(0), _timer_event_id(0),
_timer_expired(false) _timer_expired(false)
{ {
mbedtls_ssl_conf_transport( get_ssl_config(), MBEDTLS_SSL_TRANSPORT_DATAGRAM); mbedtls_ssl_conf_transport(get_ssl_config(), MBEDTLS_SSL_TRANSPORT_DATAGRAM);
mbedtls_ssl_set_timer_cb( get_ssl_context(), this, timing_set_delay, timing_get_delay); mbedtls_ssl_set_timer_cb(get_ssl_context(), this, timing_set_delay, timing_get_delay);
} }
void DTLSSocketWrapper::timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms) void DTLSSocketWrapper::timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms)

2
features/netsocket/DTLSSocketWrapper.h
View File

@ -15,7 +15,7 @@ private:
void timer_event(); void timer_event();
uint64_t _int_ms_tick; uint64_t _int_ms_tick;
int _timer_event_id; int _timer_event_id;
bool _timer_expired:1; bool _timer_expired : 1;
}; };
#endif #endif

14
features/netsocket/TLSSocketWrapper.cpp
View File

@ -160,7 +160,6 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call)
} }
#ifdef MBEDTLS_X509_CRT_PARSE_C #ifdef MBEDTLS_X509_CRT_PARSE_C
/* Start the handshake, the rest will be done in onReceive() */
tr_info("Starting TLS handshake with %s", _ssl.hostname); tr_info("Starting TLS handshake with %s", _ssl.hostname);
#else #else
tr_info("Starting TLS handshake"); tr_info("Starting TLS handshake");
@ -198,7 +197,7 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call)
ret = continue_handshake(); ret = continue_handshake();
if (first_call) { if (first_call) {
if (ret == NSAPI_ERROR_ALREADY ) { if (ret == NSAPI_ERROR_ALREADY) {
ret = NSAPI_ERROR_IN_PROGRESS; // If first call should return IN_PROGRESS ret = NSAPI_ERROR_IN_PROGRESS; // If first call should return IN_PROGRESS
} }
if (ret == NSAPI_ERROR_IS_CONNECTED) { if (ret == NSAPI_ERROR_IS_CONNECTED) {
@ -208,7 +207,8 @@ nsapi_error_t TLSSocketWrapper::start_handshake(bool first_call)
return ret; return ret;
} }
nsapi_error_t TLSSocketWrapper::continue_handshake() { nsapi_error_t TLSSocketWrapper::continue_handshake()
{
int ret; int ret;
if (_handshake_completed) { if (_handshake_completed) {
@ -623,13 +623,13 @@ nsapi_error_t TLSSocketWrapper::bind(const SocketAddress &address)
void TLSSocketWrapper::set_blocking(bool blocking) void TLSSocketWrapper::set_blocking(bool blocking)
{ {
set_timeout(blocking?-1:0); set_timeout(blocking ? -1 : 0);
} }
void TLSSocketWrapper::set_timeout(int timeout) void TLSSocketWrapper::set_timeout(int timeout)
{ {
_timeout = timeout; _timeout = timeout;
if (!is_handshake_started() && timeout!=-1 && _connect_transport) { if (!is_handshake_started() && timeout != -1 && _connect_transport) {
// If we have not yet connected the transport, we need to modify its blocking mode as well. // If we have not yet connected the transport, we need to modify its blocking mode as well.
// After connection is initiated, it is already set to non blocking mode // After connection is initiated, it is already set to non blocking mode
_transport->set_timeout(timeout); _transport->set_timeout(timeout);
@ -641,7 +641,7 @@ void TLSSocketWrapper::sigio(mbed::Callback<void()> func)
if (!_transport) { if (!_transport) {
return; return;
} }
_sigio = func; _sigio = func;
_transport->sigio(mbed::callback(this, &TLSSocketWrapper::event)); _transport->sigio(mbed::callback(this, &TLSSocketWrapper::event));
} }
@ -676,7 +676,7 @@ nsapi_error_t TLSSocketWrapper::listen(int)
void TLSSocketWrapper::event() void TLSSocketWrapper::event()
{ {
_event_flag.set(1); _event_flag.set(1);
if (_sigio) { if (_sigio) {
_sigio(); _sigio();
} }