Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
a8236c8c
O
openssl
项目概览
btwise
/
openssl
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
a8236c8c
编写于
2月 15, 1999
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix various memory leaks in SSL, apps and DSA
上级
1750ebcb
变更
11
隐藏空白更改
内联
并排
Showing
11 changed file
with
45 addition
and
16 deletion
+45
-16
CHANGES
CHANGES
+6
-0
apps/s_cb.c
apps/s_cb.c
+7
-3
apps/s_client.c
apps/s_client.c
+6
-2
apps/sc.c
apps/sc.c
+5
-1
crypto/dsa/dsa_vrf.c
crypto/dsa/dsa_vrf.c
+0
-1
ssl/s2_clnt.c
ssl/s2_clnt.c
+4
-2
ssl/s2_srvr.c
ssl/s2_srvr.c
+3
-2
ssl/s3_both.c
ssl/s3_both.c
+1
-0
ssl/s3_clnt.c
ssl/s3_clnt.c
+6
-3
ssl/s3_srvr.c
ssl/s3_srvr.c
+1
-0
ssl/ssl_rsa.c
ssl/ssl_rsa.c
+6
-2
未找到文件。
CHANGES
浏览文件 @
a8236c8c
...
...
@@ -5,9 +5,15 @@
Changes between 0.9.1c and 0.9.2
*) Run extensive memory leak checks on SSL apps. Fixed *lots* of memory
leaks in ssl/ relating to new X509_get_pubkey() behaviour. Also fixes
in apps/ and an unrellated leak in crypto/dsa/dsa_vrf.c
[Steve Henson]
*) Support for RAW extensions where an arbitrary extension can be
created by including its DER encoding. See apps/openssl.cnf for
an example.
[Steve Henson]
*) Make sure latest Perl versions don't interpret some generated C array
code as Perl array code in the crypto/err/err_genc.pl script.
...
...
apps/s_cb.c
浏览文件 @
a8236c8c
...
...
@@ -156,9 +156,13 @@ char *key_file;
ssl=SSL_new(ctx);
x509=SSL_get_certificate(ssl);
if (x509 != NULL)
EVP_PKEY_copy_parameters(X509_get_pubkey(x509),
SSL_get_privatekey(ssl));
if (x509 != NULL) {
EVP_PKEY *pktmp;
pktmp = X509_get_pubkey(x509);
EVP_PKEY_copy_parameters(pktmp,
SSL_get_privatekey(ssl));
EVP_PKEY_free(pktmp);
}
SSL_free(ssl);
*/
...
...
apps/s_client.c
浏览文件 @
a8236c8c
...
...
@@ -743,9 +743,13 @@ int full;
BIO_printf
(
bio
,
"%s, Cipher is %s
\n
"
,
SSL_CIPHER_get_version
(
c
),
SSL_CIPHER_get_name
(
c
));
if
(
peer
!=
NULL
)
if
(
peer
!=
NULL
)
{
EVP_PKEY
*
pktmp
;
pktmp
=
X509_get_pubkey
(
peer
);
BIO_printf
(
bio
,
"Server public key is %d bit
\n
"
,
EVP_PKEY_bits
(
X509_get_pubkey
(
peer
)));
EVP_PKEY_bits
(
pktmp
));
EVP_PKEY_free
(
pktmp
);
}
SSL_SESSION_print
(
bio
,
SSL_get_session
(
s
));
BIO_printf
(
bio
,
"---
\n
"
);
if
(
peer
!=
NULL
)
...
...
apps/sc.c
浏览文件 @
a8236c8c
...
...
@@ -770,8 +770,12 @@ int full;
SSL_CIPHER_get_version
(
c
),
SSL_CIPHER_get_name
(
c
));
if
(
peer
!=
NULL
)
{
EVP_PKEY
*
pktmp
;
BIO_printf
(
bio
,
"Server public key is %d bit
\n
"
,
EVP_PKEY_bits
(
X509_get_pubkey
(
peer
)));
EVP_PKEY_bits
(
pktmp
));
EVP_PKEY_free
(
pktmp
);
}
SSL_SESSION_print
(
bio
,
SSL_get_session
(
s
));
BIO_printf
(
bio
,
"---
\n
"
);
if
(
peer
!=
NULL
)
...
...
crypto/dsa/dsa_vrf.c
浏览文件 @
a8236c8c
...
...
@@ -91,7 +91,6 @@ DSA *dsa;
int
ret
=
-
1
;
if
((
ctx
=
BN_CTX_new
())
==
NULL
)
goto
err
;
if
((
mont
=
BN_MONT_CTX_new
())
==
NULL
)
goto
err
;
BN_init
(
&
u1
);
BN_init
(
&
u2
);
...
...
ssl/s2_clnt.c
浏览文件 @
a8236c8c
...
...
@@ -953,8 +953,9 @@ unsigned char *data;
goto
err
;
ret
=
1
;
err:
if
(
sk
!=
NULL
)
sk_free
(
sk
);
if
(
x509
!=
NULL
)
X509_free
(
x509
);
sk_free
(
sk
);
X509_free
(
x509
);
EVP_PKEY_free
(
pkey
);
return
(
ret
);
}
...
...
@@ -985,6 +986,7 @@ int padding;
if
(
i
<
0
)
SSLerr
(
SSL_F_SSL_RSA_PUBLIC_ENCRYPT
,
ERR_R_RSA_LIB
);
end:
EVP_PKEY_free
(
pkey
);
return
(
i
);
}
ssl/s2_srvr.c
浏览文件 @
a8236c8c
...
...
@@ -910,6 +910,7 @@ SSL *s;
pkey
=
X509_get_pubkey
(
x509
);
if
(
pkey
==
NULL
)
goto
end
;
i
=
EVP_VerifyFinal
(
&
ctx
,
p
,
s
->
s2
->
tmp
.
rlen
,
pkey
);
EVP_PKEY_free
(
pkey
);
memset
(
&
ctx
,
0
,
sizeof
(
ctx
));
if
(
i
)
...
...
@@ -933,8 +934,8 @@ msg_end:
ssl2_return_error
(
s
,
SSL2_PE_BAD_CERTIFICATE
);
}
end:
if
(
sk
!=
NULL
)
sk_free
(
sk
);
if
(
x509
!=
NULL
)
X509_free
(
x509
);
sk_free
(
sk
);
X509_free
(
x509
);
return
(
ret
);
}
...
...
ssl/s3_both.c
浏览文件 @
a8236c8c
...
...
@@ -404,6 +404,7 @@ EVP_PKEY *pkey;
ret
=
-
1
;
err:
if
(
!
pkey
)
EVP_PKEY_free
(
pk
);
return
(
ret
);
}
...
...
ssl/s3_clnt.c
浏览文件 @
a8236c8c
...
...
@@ -814,8 +814,9 @@ f_err:
ssl3_send_alert
(
s
,
SSL3_AL_FATAL
,
al
);
}
err:
if
(
x
!=
NULL
)
X509_free
(
x
);
if
(
sk
!=
NULL
)
sk_pop_free
(
sk
,
X509_free
);
EVP_PKEY_free
(
pkey
);
X509_free
(
x
);
sk_pop_free
(
sk
,
X509_free
);
return
(
ret
);
}
...
...
@@ -1103,11 +1104,12 @@ SSL *s;
goto
f_err
;
}
}
EVP_PKEY_free
(
pkey
);
return
(
1
);
f_err:
ssl3_send_alert
(
s
,
SSL3_AL_FATAL
,
al
);
err:
EVP_PKEY_free
(
pkey
);
return
(
-
1
);
}
...
...
@@ -1622,6 +1624,7 @@ SSL *s;
idx
=
c
->
cert_type
;
pkey
=
X509_get_pubkey
(
c
->
pkeys
[
idx
].
x509
);
i
=
X509_certificate_type
(
c
->
pkeys
[
idx
].
x509
,
pkey
);
EVP_PKEY_free
(
pkey
);
/* Check that we have a certificate if we require one */
...
...
ssl/s3_srvr.c
浏览文件 @
a8236c8c
...
...
@@ -1510,6 +1510,7 @@ f_err:
ssl3_send_alert
(
s
,
SSL3_AL_FATAL
,
al
);
}
end:
EVP_PKEY_free
(
pkey
);
return
(
ret
);
}
...
...
ssl/ssl_rsa.c
浏览文件 @
a8236c8c
...
...
@@ -229,8 +229,10 @@ EVP_PKEY *pkey;
if
(
c
->
pkeys
[
i
].
x509
!=
NULL
)
{
EVP_PKEY_copy_parameters
(
X509_get_pubkey
(
c
->
pkeys
[
i
].
x509
),
pkey
);
EVP_PKEY
*
pktmp
;
pktmp
=
X509_get_pubkey
(
c
->
pkeys
[
i
].
x509
);
EVP_PKEY_copy_parameters
(
pktmp
,
pkey
);
EVP_PKEY_free
(
pktmp
);
ERR_clear_error
();
#ifndef NO_RSA
...
...
@@ -503,6 +505,7 @@ X509 *x;
if
(
i
<
0
)
{
SSLerr
(
SSL_F_SSL_SET_CERT
,
SSL_R_UNKNOWN_CERTIFICATE_TYPE
);
EVP_PKEY_free
(
pkey
);
return
(
0
);
}
...
...
@@ -549,6 +552,7 @@ X509 *x;
else
ok
=
1
;
EVP_PKEY_free
(
pkey
);
if
(
bad
)
{
EVP_PKEY_free
(
c
->
pkeys
[
i
].
privatekey
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录