Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

components/openssl: Add more debugging information at platform level

Browse source
This commit is contained in:
Dong Heng 2017-01-26 10:12:58 +08:00
parent 1d0c909daf
commit 93395a3370
1 changed files with 36 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

77
components/openssl/platform/ssl_pm.c
View file

@ -238,10 +238,12 @@ static int ssl_pm_reload_crt(SSL *ssl)
ret = 0; ret = 0;
} }
if (ret) if (ret) {
return -1; SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_conf_own_cert() return -0x%x", -ret);
ret = -1;
}
return 0; return ret;
} }
/* /*
@ -252,8 +254,7 @@ static int mbedtls_handshake( mbedtls_ssl_context *ssl )
{ {
int ret = 0; int ret = 0;
while (ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER) while (ssl->state != MBEDTLS_SSL_HANDSHAKE_OVER) {
{
ret = mbedtls_ssl_handshake_step(ssl); ret = mbedtls_ssl_handshake_step(ssl);
SSL_DEBUG(SSL_PLATFORM_DEBUG_LEVEL, "ssl ret %d state %d", ret, ssl->state); SSL_DEBUG(SSL_PLATFORM_DEBUG_LEVEL, "ssl ret %d state %d", ret, ssl->state);
@ -267,32 +268,31 @@ static int mbedtls_handshake( mbedtls_ssl_context *ssl )
int ssl_pm_handshake(SSL *ssl) int ssl_pm_handshake(SSL *ssl)
{ {
int ret, mbed_ret; int ret;
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm; struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
mbed_ret = ssl_pm_reload_crt(ssl); ret = ssl_pm_reload_crt(ssl);
if (mbed_ret) if (ret)
return 0; return 0;
ssl_speed_up_enter(); ssl_speed_up_enter();
while((mbed_ret = mbedtls_handshake(&ssl_pm->ssl)) != 0) { while((ret = mbedtls_handshake(&ssl_pm->ssl)) != 0) {
if (mbed_ret != MBEDTLS_ERR_SSL_WANT_READ && mbed_ret != MBEDTLS_ERR_SSL_WANT_WRITE) { if (ret != MBEDTLS_ERR_SSL_WANT_READ && ret != MBEDTLS_ERR_SSL_WANT_WRITE) {
break; break;
} }
} }
ssl_speed_up_exit(); ssl_speed_up_exit();
if (!mbed_ret) { if (ret) {
SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_handshake() return -0x%x", -ret);
ret = 0;
} else {
struct x509_pm *x509_pm = (struct x509_pm *)ssl->session->peer->x509_pm; struct x509_pm *x509_pm = (struct x509_pm *)ssl->session->peer->x509_pm;
ret = 1;
x509_pm->ex_crt = (mbedtls_x509_crt *)mbedtls_ssl_get_peer_cert(&ssl_pm->ssl); x509_pm->ex_crt = (mbedtls_x509_crt *)mbedtls_ssl_get_peer_cert(&ssl_pm->ssl);
} else { ret = 1;
ret = 0;
SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_handshake() return -0x%x", -mbed_ret);
} }
return ret; return ret;
@ -300,19 +300,18 @@ int ssl_pm_handshake(SSL *ssl)
int ssl_pm_shutdown(SSL *ssl) int ssl_pm_shutdown(SSL *ssl)
{ {
int ret, mbed_ret; int ret;
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm; struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
mbed_ret = mbedtls_ssl_close_notify(&ssl_pm->ssl); ret = mbedtls_ssl_close_notify(&ssl_pm->ssl);
if (!mbed_ret) { if (ret) {
SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_close_notify() return -0x%x", -ret);
ret = -1;
} else {
struct x509_pm *x509_pm = (struct x509_pm *)ssl->session->peer->x509_pm; struct x509_pm *x509_pm = (struct x509_pm *)ssl->session->peer->x509_pm;
ret = 0;
x509_pm->ex_crt = NULL; x509_pm->ex_crt = NULL;
} }
else
ret = -1;
return ret; return ret;
} }
@ -325,32 +324,28 @@ int ssl_pm_clear(SSL *ssl)
int ssl_pm_read(SSL *ssl, void *buffer, int len) int ssl_pm_read(SSL *ssl, void *buffer, int len)
{ {
int ret, mbed_ret; int ret;
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm; struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
mbed_ret = mbedtls_ssl_read(&ssl_pm->ssl, buffer, len); ret = mbedtls_ssl_read(&ssl_pm->ssl, buffer, len);
if (mbed_ret < 0) if (ret < 0) {
SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_read() return -0x%x", -ret);
ret = -1; ret = -1;
else if (mbed_ret == 0) }
ret = 0;
else
ret = mbed_ret;
return ret; return ret;
} }
int ssl_pm_send(SSL *ssl, const void *buffer, int len) int ssl_pm_send(SSL *ssl, const void *buffer, int len)
{ {
int ret, mbed_ret; int ret;
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm; struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
mbed_ret = mbedtls_ssl_write(&ssl_pm->ssl, buffer, len); ret = mbedtls_ssl_write(&ssl_pm->ssl, buffer, len);
if (mbed_ret < 0) if (ret < 0) {
SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_write() return -0x%x", -ret);
ret = -1; ret = -1;
else if (mbed_ret == 0) }
ret = 0;
else
ret = mbed_ret;
return ret; return ret;
} }
@ -656,11 +651,11 @@ long ssl_pm_get_verify_result(const SSL *ssl)
struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm; struct ssl_pm *ssl_pm = (struct ssl_pm *)ssl->ssl_pm;
ret = mbedtls_ssl_get_verify_result(&ssl_pm->ssl); ret = mbedtls_ssl_get_verify_result(&ssl_pm->ssl);
if (ret) {
if (!ret) SSL_DEBUG(SSL_PLATFORM_ERROR_LEVEL, "mbedtls_ssl_get_verify_result() return -0x%x", -ret);
verify_result = X509_V_OK;
else
verify_result = X509_V_ERR_UNSPECIFIED; verify_result = X509_V_ERR_UNSPECIFIED;
} else
verify_result = X509_V_OK;
return verify_result; return verify_result;
} }