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

components/openssl: add empty fucntion to get peer certification and fix ref overflow

Browse source
This commit is contained in:
dongheng 2016-09-22 17:20:07 +08:00
parent f796b4e58e
commit 18787fd4fc
4 changed files with 22 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/openssl/include/internal/ssl_types.h
View file

@ -144,6 +144,8 @@ struct ssl_session_st {
long timeout; long timeout;
long time; long time;
X509 *peer;
}; };
struct X509_VERIFY_PARAM_st { struct X509_VERIFY_PARAM_st {

4
components/openssl/library/ssl_pkey.c
View file

@ -177,7 +177,7 @@ int SSL_CTX_use_PrivateKey_ASN1(int type, SSL_CTX *ctx,
if (!ret) if (!ret)
SSL_RET(failed2, "SSL_CTX_use_PrivateKey\n"); SSL_RET(failed2, "SSL_CTX_use_PrivateKey\n");
ctx->cert->pkey->ref++; ctx->cert->pkey->ref = 1;
return 1; return 1;
@ -216,7 +216,7 @@ int SSL_use_PrivateKey_ASN1(int type, SSL *ssl,
if (!ret) if (!ret)
SSL_RET(failed2, "SSL_CTX_use_PrivateKey\n"); SSL_RET(failed2, "SSL_CTX_use_PrivateKey\n");
ssl->cert->pkey->ref++; ssl->cert->pkey->ref = 1;
return 1; return 1;

19
components/openssl/library/ssl_x509.c
View file

@ -218,7 +218,6 @@ int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
{ {
int ret; int ret;
X509 *cert; X509 *cert;
const unsigned char *pbuf;
cert = d2i_X509(&ctx->cert->x509, d, len); cert = d2i_X509(&ctx->cert->x509, d, len);
if (!cert) if (!cert)
@ -228,7 +227,7 @@ int SSL_CTX_use_certificate_ASN1(SSL_CTX *ctx, int len,
if (!ret) if (!ret)
SSL_RET(failed2, "SSL_CTX_use_certificate\n"); SSL_RET(failed2, "SSL_CTX_use_certificate\n");
ctx->cert->x509->ref++; ctx->cert->x509->ref = 1;
return 1; return 1;
@ -266,7 +265,7 @@ int SSL_use_certificate_ASN1(SSL *ssl, int len,
if (!ret) if (!ret)
SSL_RET(failed2, "SSL_use_certificate\n"); SSL_RET(failed2, "SSL_use_certificate\n");
ssl->cert->x509->ref++; ssl->cert->x509->ref = 1;
return 1; return 1;
@ -307,3 +306,17 @@ int SSL_use_certificate_file(SSL *ssl, const char *file, int type)
{ {
return 0; return 0;
} }
/*
* SSL_get_peer_certificate - get peer certification
*
* @param ssl - SSL point
*
* @return certification
*/
X509 *SSL_get_peer_certificate(const SSL *ssl)
{
SSL_ASSERT(ssl);
return ssl->session.peer;
}

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

@ -74,7 +74,6 @@ int ssl_pm_new(SSL *ssl)
int mode; int mode;
int version; int version;
SSL_CTX *ctx = ssl->ctx;
const SSL_METHOD *method = ssl->method; const SSL_METHOD *method = ssl->method;
struct x509_pm *x509_pm; struct x509_pm *x509_pm;
@ -185,9 +184,9 @@ int ssl_pm_handshake(SSL *ssl)
} }
ssl_speed_up_exit(); ssl_speed_up_exit();
if (!mbed_ret) if (!mbed_ret) {
ret = 1; ret = 1;
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);
} }