Skip to content

T
Third Party Openssl

OpenHarmony / Third Party Openssl
1 年多 前同步成功

通知 10
Star 18
Fork 1
T
Third Party Openssl
提交 28797374 编写于 作者: B Bodo Möller
浏览文件
操作

Fix memory leak.

上级 f1558bb4
隐藏空白更改
内联 并排
Showing with 24 addition and 14 deletion
ssl/s3_enc.c
浏览文件 @ 28797374
...@@ -147,6 +147,7 @@ int ssl3_change_cipher_state(SSL *s, int which) ...@@ -147,6 +147,7 @@ int ssl3_change_cipher_state(SSL *s, int which)
const EVP_MD *m; const EVP_MD *m;
EVP_MD_CTX md; EVP_MD_CTX md;
int exp,n,i,j,k,cl; int exp,n,i,j,k,cl;
int reuse_dd = 0;
exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher); exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
c=s->s3->tmp.new_sym_enc; c=s->s3->tmp.new_sym_enc;
...@@ -159,9 +160,9 @@ int ssl3_change_cipher_state(SSL *s, int which) ...@@ -159,9 +160,9 @@ int ssl3_change_cipher_state(SSL *s, int which)
if (which & SSL3_CC_READ) if (which & SSL3_CC_READ)
{ {
if ((s->enc_read_ctx == NULL) && if (s->enc_read_ctx != NULL)
((s->enc_read_ctx=(EVP_CIPHER_CTX *) reuse_dd = 1;
OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) else if ((s->enc_read_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)
goto err; goto err;
dd= s->enc_read_ctx; dd= s->enc_read_ctx;
s->read_hash=m; s->read_hash=m;
...@@ -190,9 +191,9 @@ int ssl3_change_cipher_state(SSL *s, int which) ...@@ -190,9 +191,9 @@ int ssl3_change_cipher_state(SSL *s, int which)
} }
else else
{ {
if ((s->enc_write_ctx == NULL) && if (s->enc_write_ctx != NULL)
((s->enc_write_ctx=(EVP_CIPHER_CTX *) reuse_dd = 1;
OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) else if ((s->enc_write_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)
goto err; goto err;
dd= s->enc_write_ctx; dd= s->enc_write_ctx;
s->write_hash=m; s->write_hash=m;
...@@ -215,6 +216,8 @@ int ssl3_change_cipher_state(SSL *s, int which) ...@@ -215,6 +216,8 @@ int ssl3_change_cipher_state(SSL *s, int which)
mac_secret= &(s->s3->write_mac_secret[0]); mac_secret= &(s->s3->write_mac_secret[0]);
} }
if (reuse_dd)
EVP_CIPHER_CTX_cleanup(dd);
EVP_CIPHER_CTX_init(dd); EVP_CIPHER_CTX_init(dd);
p=s->s3->tmp.key_block; p=s->s3->tmp.key_block;
......
ssl/t1_enc.c
浏览文件 @ 28797374
...@@ -180,9 +180,10 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -180,9 +180,10 @@ int tls1_change_cipher_state(SSL *s, int which)
const EVP_CIPHER *c; const EVP_CIPHER *c;
const SSL_COMP *comp; const SSL_COMP *comp;
const EVP_MD *m; const EVP_MD *m;
int _exp,n,i,j,k,exp_label_len,cl; int is_export,n,i,j,k,exp_label_len,cl;
int reuse_dd = 0;
_exp=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher); is_export=SSL_C_IS_EXPORT(s->s3->tmp.new_cipher);
c=s->s3->tmp.new_sym_enc; c=s->s3->tmp.new_sym_enc;
m=s->s3->tmp.new_hash; m=s->s3->tmp.new_hash;
comp=s->s3->tmp.new_compression; comp=s->s3->tmp.new_compression;
...@@ -205,9 +206,9 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -205,9 +206,9 @@ int tls1_change_cipher_state(SSL *s, int which)
if (which & SSL3_CC_READ) if (which & SSL3_CC_READ)
{ {
if ((s->enc_read_ctx == NULL) && if (s->enc_read_ctx != NULL)
((s->enc_read_ctx=(EVP_CIPHER_CTX *) reuse_dd = 1;
OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) else if ((s->enc_read_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)
goto err; goto err;
dd= s->enc_read_ctx; dd= s->enc_read_ctx;
s->read_hash=m; s->read_hash=m;
...@@ -235,6 +236,10 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -235,6 +236,10 @@ int tls1_change_cipher_state(SSL *s, int which)
} }
else else
{ {
if (s->enc_write_ctx != NULL)
reuse_dd = 1;
else if ((s->enc_write_ctx=OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)
goto err;
if ((s->enc_write_ctx == NULL) && if ((s->enc_write_ctx == NULL) &&
((s->enc_write_ctx=(EVP_CIPHER_CTX *) ((s->enc_write_ctx=(EVP_CIPHER_CTX *)
OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL)) OPENSSL_malloc(sizeof(EVP_CIPHER_CTX))) == NULL))
...@@ -259,13 +264,15 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -259,13 +264,15 @@ int tls1_change_cipher_state(SSL *s, int which)
mac_secret= &(s->s3->write_mac_secret[0]); mac_secret= &(s->s3->write_mac_secret[0]);
} }
if (reuse_dd)
EVP_CIPHER_CTX_cleanup(dd);
EVP_CIPHER_CTX_init(dd); EVP_CIPHER_CTX_init(dd);
p=s->s3->tmp.key_block; p=s->s3->tmp.key_block;
i=EVP_MD_size(m); i=EVP_MD_size(m);
cl=EVP_CIPHER_key_length(c); cl=EVP_CIPHER_key_length(c);
j=_exp ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ? j=is_export ? (cl < SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher) ?
cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl; cl : SSL_C_EXPORT_KEYLENGTH(s->s3->tmp.new_cipher)) : cl;
/* Was j=(exp)?5:EVP_CIPHER_key_length(c); */ /* Was j=(exp)?5:EVP_CIPHER_key_length(c); */
k=EVP_CIPHER_iv_length(c); k=EVP_CIPHER_iv_length(c);
er1= &(s->s3->client_random[0]); er1= &(s->s3->client_random[0]);
...@@ -302,7 +309,7 @@ int tls1_change_cipher_state(SSL *s, int which) ...@@ -302,7 +309,7 @@ int tls1_change_cipher_state(SSL *s, int which)
printf("which = %04X\nmac key=",which); printf("which = %04X\nmac key=",which);
{ int z; for (z=0; z<i; z++) printf("%02X%c",ms[z],((z+1)%16)?' ':'\n'); } { int z; for (z=0; z<i; z++) printf("%02X%c",ms[z],((z+1)%16)?' ':'\n'); }
#endif #endif
if (_exp) if (is_export)
{ {
/* In here I set both the read and write key/iv to the /* In here I set both the read and write key/iv to the
* same value since only the correct one will be used :-). * same value since only the correct one will be used :-).
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或