alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

components/openssl: fix SSL get peer cert struct point type error

Browse Source 
1. fix SSL get peer cert struct point type error
	2. some function use "zalloc" instead of "malloc"
This commit is contained in:
dongheng 2016-09-23 11:03:13 +08:00
parent 07c8bbca6c
commit f5d9bfc7ae
4 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/openssl/library/ssl_pkey.c
View File

@ -31,7 +31,7 @@ EVP_PKEY* EVP_PKEY_new(void)
int ret; int ret;
EVP_PKEY *pkey; EVP_PKEY *pkey;
pkey = ssl_malloc(sizeof(EVP_PKEY)); pkey = ssl_zalloc(sizeof(EVP_PKEY));
if (!pkey) if (!pkey)
SSL_RET(failed1, "ssl_malloc\n"); SSL_RET(failed1, "ssl_malloc\n");

2
components/openssl/library/ssl_x509.c
View File

@ -30,7 +30,7 @@ X509* X509_new(void)
int ret; int ret;
X509 *x; X509 *x;
x = ssl_malloc(sizeof(X509)); x = ssl_zalloc(sizeof(X509));
if (!x) if (!x)
SSL_RET(failed1, "ssl_malloc\n"); SSL_RET(failed1, "ssl_malloc\n");

18
components/openssl/platform/ssl_pm.c
View File

@ -79,13 +79,13 @@ int ssl_pm_new(SSL *ssl)
struct x509_pm *x509_pm; struct x509_pm *x509_pm;
struct pkey_pm *pkey_pm; struct pkey_pm *pkey_pm;
ssl->session.peer = ssl_malloc(sizeof(X509)); ssl->session.peer = ssl_zalloc(sizeof(X509));
if (!ssl->session.peer) if (!ssl->session.peer)
SSL_ERR(ret, failed1, "ssl_malloc\n"); SSL_ERR(ret, failed1, "ssl_zalloc\n");
ssl_pm = ssl_malloc(sizeof(struct ssl_pm)); ssl_pm = ssl_zalloc(sizeof(struct ssl_pm));
if (!ssl_pm) if (!ssl_pm)
SSL_ERR(ret, failed2, "ssl_malloc\n"); SSL_ERR(ret, failed2, "ssl_zalloc\n");
mbedtls_net_init(&ssl_pm->fd); mbedtls_net_init(&ssl_pm->fd);
mbedtls_net_init(&ssl_pm->cl_fd); mbedtls_net_init(&ssl_pm->cl_fd);
@ -193,7 +193,7 @@ int ssl_pm_handshake(SSL *ssl)
if (!mbed_ret) { if (!mbed_ret) {
ret = 1; ret = 1;
ssl->session.peer = (X509 *)mbedtls_ssl_get_peer_cert(&ssl_pm->ssl); ssl->session.peer->x509_pm = (struct x509_pm *)mbedtls_ssl_get_peer_cert(&ssl_pm->ssl);
} else { } else {
ret = 0; ret = 0;
SSL_DEBUG(1, "mbedtls_ssl_handshake [-0x%x]\n", -mbed_ret); SSL_DEBUG(1, "mbedtls_ssl_handshake [-0x%x]\n", -mbed_ret);
@ -337,7 +337,7 @@ int x509_pm_new(X509 *x)
{ {
struct x509_pm *x509_pm; struct x509_pm *x509_pm;
x509_pm = ssl_malloc(sizeof(struct x509_pm)); x509_pm = ssl_zalloc(sizeof(struct x509_pm));
if (!x509_pm) if (!x509_pm)
return -1; return -1;
@ -364,7 +364,7 @@ int x509_pm_load(X509 *x, const unsigned char *buffer, int len)
load_buf = ssl_malloc(len + 1); load_buf = ssl_malloc(len + 1);
if (!load_buf) if (!load_buf)
SSL_RET(failed1, ""); SSL_RET(failed1);
ssl_memcpy(load_buf, buffer, len); ssl_memcpy(load_buf, buffer, len);
load_buf[len] = '\0'; load_buf[len] = '\0';
@ -398,7 +398,7 @@ int pkey_pm_new(EVP_PKEY *pkey)
{ {
struct pkey_pm *pkey_pm; struct pkey_pm *pkey_pm;
pkey_pm = ssl_malloc(sizeof(struct pkey_pm)); pkey_pm = ssl_zalloc(sizeof(struct pkey_pm));
if (!pkey_pm) if (!pkey_pm)
return -1; return -1;
@ -425,7 +425,7 @@ int pkey_pm_load(EVP_PKEY *pkey, const unsigned char *buffer, int len)
load_buf = ssl_malloc(len + 1); load_buf = ssl_malloc(len + 1);
if (!load_buf) if (!load_buf)
SSL_RET(failed1, ""); SSL_RET(failed1);
ssl_memcpy(load_buf, buffer, len); ssl_memcpy(load_buf, buffer, len);
load_buf[len] = '\0'; load_buf[len] = '\0';

2
components/openssl/platform/ssl_port.c
View File

@ -31,7 +31,7 @@ void* ssl_zalloc(size_t size)
void *ssl_malloc(size_t size) void *ssl_malloc(size_t size)
{ {
return ssl_zalloc(size); return malloc(size);
} }
void ssl_free(void *p) void ssl_free(void *p)