|
@@ -118,7 +118,6 @@ Error PacketPeerMbedDTLS::connect_to_peer(Ref<PacketPeerUDP> p_base, bool p_vali
|
|
ERR_FAIL_COND_V(!p_base.is_valid() || !p_base->is_socket_connected(), ERR_INVALID_PARAMETER);
|
|
ERR_FAIL_COND_V(!p_base.is_valid() || !p_base->is_socket_connected(), ERR_INVALID_PARAMETER);
|
|
|
|
|
|
base = p_base;
|
|
base = p_base;
|
|
- int ret = 0;
|
|
|
|
int authmode = p_validate_certs ? MBEDTLS_SSL_VERIFY_REQUIRED : MBEDTLS_SSL_VERIFY_NONE;
|
|
int authmode = p_validate_certs ? MBEDTLS_SSL_VERIFY_REQUIRED : MBEDTLS_SSL_VERIFY_NONE;
|
|
|
|
|
|
Error err = tls_ctx->init_client(MBEDTLS_SSL_TRANSPORT_DATAGRAM, authmode, p_ca_certs);
|
|
Error err = tls_ctx->init_client(MBEDTLS_SSL_TRANSPORT_DATAGRAM, authmode, p_ca_certs);
|
|
@@ -130,7 +129,7 @@ Error PacketPeerMbedDTLS::connect_to_peer(Ref<PacketPeerUDP> p_base, bool p_vali
|
|
|
|
|
|
status = STATUS_HANDSHAKING;
|
|
status = STATUS_HANDSHAKING;
|
|
|
|
|
|
- if ((ret = _do_handshake()) != OK) {
|
|
|
|
|
|
+ if (_do_handshake() != OK) {
|
|
status = STATUS_ERROR_HOSTNAME_MISMATCH;
|
|
status = STATUS_ERROR_HOSTNAME_MISMATCH;
|
|
return FAILED;
|
|
return FAILED;
|
|
}
|
|
}
|
|
@@ -158,7 +157,7 @@ Error PacketPeerMbedDTLS::accept_peer(Ref<PacketPeerUDP> p_base, Ref<CryptoKey>
|
|
|
|
|
|
status = STATUS_HANDSHAKING;
|
|
status = STATUS_HANDSHAKING;
|
|
|
|
|
|
- if ((ret = _do_handshake()) != OK) {
|
|
|
|
|
|
+ if (_do_handshake() != OK) {
|
|
status = STATUS_ERROR;
|
|
status = STATUS_ERROR;
|
|
return FAILED;
|
|
return FAILED;
|
|
}
|
|
}
|
|
@@ -175,7 +174,7 @@ Error PacketPeerMbedDTLS::put_packet(const uint8_t *p_buffer, int p_bytes) {
|
|
|
|
|
|
int ret = mbedtls_ssl_write(tls_ctx->get_context(), p_buffer, p_bytes);
|
|
int ret = mbedtls_ssl_write(tls_ctx->get_context(), p_buffer, p_bytes);
|
|
if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
|
|
if (ret == MBEDTLS_ERR_SSL_WANT_READ || ret == MBEDTLS_ERR_SSL_WANT_WRITE) {
|
|
- ret = 0; // non blocking io
|
|
|
|
|
|
+ // Non blocking io.
|
|
} else if (ret <= 0) {
|
|
} else if (ret <= 0) {
|
|
TLSContextMbedTLS::print_mbedtls_error(ret);
|
|
TLSContextMbedTLS::print_mbedtls_error(ret);
|
|
_cleanup();
|
|
_cleanup();
|