From d67f09990712f90e736cbc03f2674a151338a502 Mon Sep 17 00:00:00 2001 From: liuxueli Date: Fri, 29 Jul 2022 11:15:08 +0800 Subject: TSG-11471: 增加判断i2d_PublicKey函数返回值，避免出现异常时导致重启，参照: https://www.openssl.org/docs/man3.0/man3/i2d_PublicKey.html MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/SSL_Certificate.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/SSL_Certificate.c b/src/SSL_Certificate.c index 380fa5e..1d25e21 100644 --- a/src/SSL_Certificate.c +++ b/src/SSL_Certificate.c @@ -1140,12 +1140,24 @@ UCHAR fn_pGetSSLInfo(char *pcCert, int iLen, ssl_stream *a_ssl_stream, struct /*SSL Subject keyInfo*/ pkey = X509_get_pubkey(x509_handle); if(pkey!=NULL) - { - a_ssl_stream->stSSLCert->SSLSubKeyLen = i2d_PublicKey(pkey, NULL);; - a_ssl_stream->stSSLCert->SSLSubKey = (unsigned char *)dictator_malloc(thread_seq, a_ssl_stream->stSSLCert->SSLSubKeyLen); - i2d_PublicKey(pkey, &(a_ssl_stream->stSSLCert->SSLSubKey)); //!!! point will be changed - a_ssl_stream->stSSLCert->SSLSubKey = a_ssl_stream->stSSLCert->SSLSubKey-a_ssl_stream->stSSLCert->SSLSubKeyLen; - + { + //https://www.openssl.org/docs/man3.0/man3/i2d_PublicKey.html + a_ssl_stream->stSSLCert->SSLSubKeyLen = i2d_PublicKey(pkey, NULL); + if(a_ssl_stream->stSSLCert->SSLSubKeyLen>0) + { + a_ssl_stream->stSSLCert->SSLSubKey = (unsigned char *)dictator_malloc(thread_seq, a_ssl_stream->stSSLCert->SSLSubKeyLen); + int ret=i2d_PublicKey(pkey, &(a_ssl_stream->stSSLCert->SSLSubKey)); //!!! point will be changed + if(ret>0) + { + a_ssl_stream->stSSLCert->SSLSubKey = a_ssl_stream->stSSLCert->SSLSubKey-a_ssl_stream->stSSLCert->SSLSubKeyLen; + } + else + { + dictator_free(thread_seq, (void *)a_ssl_stream->stSSLCert->SSLSubKey); + a_ssl_stream->stSSLCert->SSLSubKey=NULL; + a_ssl_stream->stSSLCert->SSLSubKeyLen=0; + } + } EVP_PKEY_free(pkey); } -- cgit v1.2.3