Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
openssl
提交
525de5d3
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,发现更多精彩内容 >>
提交
525de5d3
编写于
8月 12, 2007
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OPENSSL_NO_TLS1 WIN32 build support. Fix so normal build works again.
上级
367eb1f1
变更
5
隐藏空白更改
内联
并排
Showing
5 changed file
with
115 addition
and
112 deletion
+115
-112
ssl/t1_lib.c
ssl/t1_lib.c
+97
-97
util/mk1mf.pl
util/mk1mf.pl
+2
-0
util/mkdef.pl
util/mkdef.pl
+1
-0
util/pl/VC-32.pl
util/pl/VC-32.pl
+2
-2
util/ssleay.num
util/ssleay.num
+13
-13
未找到文件。
ssl/t1_lib.c
浏览文件 @
525de5d3
...
...
@@ -162,6 +162,103 @@ void tls1_clear(SSL *s)
s
->
version
=
TLS1_VERSION
;
}
#ifndef OPENSSL_NO_EC
static
int
nid_list
[]
=
{
NID_sect163k1
,
/* sect163k1 (1) */
NID_sect163r1
,
/* sect163r1 (2) */
NID_sect163r2
,
/* sect163r2 (3) */
NID_sect193r1
,
/* sect193r1 (4) */
NID_sect193r2
,
/* sect193r2 (5) */
NID_sect233k1
,
/* sect233k1 (6) */
NID_sect233r1
,
/* sect233r1 (7) */
NID_sect239k1
,
/* sect239k1 (8) */
NID_sect283k1
,
/* sect283k1 (9) */
NID_sect283r1
,
/* sect283r1 (10) */
NID_sect409k1
,
/* sect409k1 (11) */
NID_sect409r1
,
/* sect409r1 (12) */
NID_sect571k1
,
/* sect571k1 (13) */
NID_sect571r1
,
/* sect571r1 (14) */
NID_secp160k1
,
/* secp160k1 (15) */
NID_secp160r1
,
/* secp160r1 (16) */
NID_secp160r2
,
/* secp160r2 (17) */
NID_secp192k1
,
/* secp192k1 (18) */
NID_X9_62_prime192v1
,
/* secp192r1 (19) */
NID_secp224k1
,
/* secp224k1 (20) */
NID_secp224r1
,
/* secp224r1 (21) */
NID_secp256k1
,
/* secp256k1 (22) */
NID_X9_62_prime256v1
,
/* secp256r1 (23) */
NID_secp384r1
,
/* secp384r1 (24) */
NID_secp521r1
/* secp521r1 (25) */
};
int
tls1_ec_curve_id2nid
(
int
curve_id
)
{
/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
if
((
curve_id
<
1
)
||
(
curve_id
>
sizeof
(
nid_list
)
/
sizeof
(
nid_list
[
0
])))
return
0
;
return
nid_list
[
curve_id
-
1
];
}
int
tls1_ec_nid2curve_id
(
int
nid
)
{
/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
switch
(
nid
)
{
case
NID_sect163k1
:
/* sect163k1 (1) */
return
1
;
case
NID_sect163r1
:
/* sect163r1 (2) */
return
2
;
case
NID_sect163r2
:
/* sect163r2 (3) */
return
3
;
case
NID_sect193r1
:
/* sect193r1 (4) */
return
4
;
case
NID_sect193r2
:
/* sect193r2 (5) */
return
5
;
case
NID_sect233k1
:
/* sect233k1 (6) */
return
6
;
case
NID_sect233r1
:
/* sect233r1 (7) */
return
7
;
case
NID_sect239k1
:
/* sect239k1 (8) */
return
8
;
case
NID_sect283k1
:
/* sect283k1 (9) */
return
9
;
case
NID_sect283r1
:
/* sect283r1 (10) */
return
10
;
case
NID_sect409k1
:
/* sect409k1 (11) */
return
11
;
case
NID_sect409r1
:
/* sect409r1 (12) */
return
12
;
case
NID_sect571k1
:
/* sect571k1 (13) */
return
13
;
case
NID_sect571r1
:
/* sect571r1 (14) */
return
14
;
case
NID_secp160k1
:
/* secp160k1 (15) */
return
15
;
case
NID_secp160r1
:
/* secp160r1 (16) */
return
16
;
case
NID_secp160r2
:
/* secp160r2 (17) */
return
17
;
case
NID_secp192k1
:
/* secp192k1 (18) */
return
18
;
case
NID_X9_62_prime192v1
:
/* secp192r1 (19) */
return
19
;
case
NID_secp224k1
:
/* secp224k1 (20) */
return
20
;
case
NID_secp224r1
:
/* secp224r1 (21) */
return
21
;
case
NID_secp256k1
:
/* secp256k1 (22) */
return
22
;
case
NID_X9_62_prime256v1
:
/* secp256r1 (23) */
return
23
;
case
NID_secp384r1
:
/* secp384r1 (24) */
return
24
;
case
NID_secp521r1
:
/* secp521r1 (25) */
return
25
;
default:
return
0
;
}
}
#endif
/* OPENSSL_NO_EC */
#ifndef OPENSSL_NO_TLSEXT
unsigned
char
*
ssl_add_clienthello_tlsext
(
SSL
*
s
,
unsigned
char
*
p
,
unsigned
char
*
limit
)
...
...
@@ -951,100 +1048,3 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
}
#endif
#ifndef OPENSSL_NO_EC
static
int
nid_list
[]
=
{
NID_sect163k1
,
/* sect163k1 (1) */
NID_sect163r1
,
/* sect163r1 (2) */
NID_sect163r2
,
/* sect163r2 (3) */
NID_sect193r1
,
/* sect193r1 (4) */
NID_sect193r2
,
/* sect193r2 (5) */
NID_sect233k1
,
/* sect233k1 (6) */
NID_sect233r1
,
/* sect233r1 (7) */
NID_sect239k1
,
/* sect239k1 (8) */
NID_sect283k1
,
/* sect283k1 (9) */
NID_sect283r1
,
/* sect283r1 (10) */
NID_sect409k1
,
/* sect409k1 (11) */
NID_sect409r1
,
/* sect409r1 (12) */
NID_sect571k1
,
/* sect571k1 (13) */
NID_sect571r1
,
/* sect571r1 (14) */
NID_secp160k1
,
/* secp160k1 (15) */
NID_secp160r1
,
/* secp160r1 (16) */
NID_secp160r2
,
/* secp160r2 (17) */
NID_secp192k1
,
/* secp192k1 (18) */
NID_X9_62_prime192v1
,
/* secp192r1 (19) */
NID_secp224k1
,
/* secp224k1 (20) */
NID_secp224r1
,
/* secp224r1 (21) */
NID_secp256k1
,
/* secp256k1 (22) */
NID_X9_62_prime256v1
,
/* secp256r1 (23) */
NID_secp384r1
,
/* secp384r1 (24) */
NID_secp521r1
/* secp521r1 (25) */
};
int
tls1_ec_curve_id2nid
(
int
curve_id
)
{
/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
if
((
curve_id
<
1
)
||
(
curve_id
>
sizeof
(
nid_list
)
/
sizeof
(
nid_list
[
0
])))
return
0
;
return
nid_list
[
curve_id
-
1
];
}
int
tls1_ec_nid2curve_id
(
int
nid
)
{
/* ECC curves from draft-ietf-tls-ecc-12.txt (Oct. 17, 2005) */
switch
(
nid
)
{
case
NID_sect163k1
:
/* sect163k1 (1) */
return
1
;
case
NID_sect163r1
:
/* sect163r1 (2) */
return
2
;
case
NID_sect163r2
:
/* sect163r2 (3) */
return
3
;
case
NID_sect193r1
:
/* sect193r1 (4) */
return
4
;
case
NID_sect193r2
:
/* sect193r2 (5) */
return
5
;
case
NID_sect233k1
:
/* sect233k1 (6) */
return
6
;
case
NID_sect233r1
:
/* sect233r1 (7) */
return
7
;
case
NID_sect239k1
:
/* sect239k1 (8) */
return
8
;
case
NID_sect283k1
:
/* sect283k1 (9) */
return
9
;
case
NID_sect283r1
:
/* sect283r1 (10) */
return
10
;
case
NID_sect409k1
:
/* sect409k1 (11) */
return
11
;
case
NID_sect409r1
:
/* sect409r1 (12) */
return
12
;
case
NID_sect571k1
:
/* sect571k1 (13) */
return
13
;
case
NID_sect571r1
:
/* sect571r1 (14) */
return
14
;
case
NID_secp160k1
:
/* secp160k1 (15) */
return
15
;
case
NID_secp160r1
:
/* secp160r1 (16) */
return
16
;
case
NID_secp160r2
:
/* secp160r2 (17) */
return
17
;
case
NID_secp192k1
:
/* secp192k1 (18) */
return
18
;
case
NID_X9_62_prime192v1
:
/* secp192r1 (19) */
return
19
;
case
NID_secp224k1
:
/* secp224k1 (20) */
return
20
;
case
NID_secp224r1
:
/* secp224r1 (21) */
return
21
;
case
NID_secp256k1
:
/* secp256k1 (22) */
return
22
;
case
NID_X9_62_prime256v1
:
/* secp256r1 (23) */
return
23
;
case
NID_secp384r1
:
/* secp384r1 (24) */
return
24
;
case
NID_secp521r1
:
/* secp521r1 (25) */
return
25
;
default:
return
0
;
}
}
#endif
/* OPENSSL_NO_EC */
util/mk1mf.pl
浏览文件 @
525de5d3
...
...
@@ -221,6 +221,7 @@ $cflags.=" -DOPENSSL_NO_WHIRLPOOL" if $no_whirlpool;
$cflags
.=
"
-DOPENSSL_NO_SOCK
"
if
$no_sock
;
$cflags
.=
"
-DOPENSSL_NO_SSL2
"
if
$no_ssl2
;
$cflags
.=
"
-DOPENSSL_NO_SSL3
"
if
$no_ssl3
;
$cflags
.=
"
-DOPENSSL_NO_TLSEXT
"
if
$no_tlsext
;
$cflags
.=
"
-DOPENSSL_NO_ERR
"
if
$no_err
;
$cflags
.=
"
-DOPENSSL_NO_KRB5
"
if
$no_krb5
;
$cflags
.=
"
-DOPENSSL_NO_EC
"
if
$no_ec
;
...
...
@@ -1020,6 +1021,7 @@ sub read_options
"
gaswin
"
=>
\
$gaswin
,
"
no-ssl2
"
=>
\
$no_ssl2
,
"
no-ssl3
"
=>
\
$no_ssl3
,
"
no-tlsext
"
=>
\
$no_tlsext
,
"
no-err
"
=>
\
$no_err
,
"
no-sock
"
=>
\
$no_sock
,
"
no-krb5
"
=>
\
$no_krb5
,
...
...
util/mkdef.pl
浏览文件 @
525de5d3
...
...
@@ -198,6 +198,7 @@ foreach (@ARGV, split(/ /, $options))
elsif
(
/^no-hw$/
)
{
$no_hw
=
1
;
}
elsif
(
/^no-gmp$/
)
{
$no_gmp
=
1
;
}
elsif
(
/^no-rfc3779$/
)
{
$no_rfc3779
=
1
;
}
elsif
(
/^no-tlsext$/
)
{
$no_tlsext
=
1
;
}
}
...
...
util/pl/VC-32.pl
浏览文件 @
525de5d3
...
...
@@ -285,7 +285,7 @@ sub do_lib_rule
}
$ex
.=
"
$zlib_lib
"
if
$zlib_opt
==
1
&&
$target
=~
/O_CRYPTO/
;
$ret
.=
"
\t\$
(LINK)
\$
(MLFLAGS)
$efile$target
$name
@<<
\n
\$
(SHLIB_EX_OBJ)
$objs
$ex
\n
<<
\n
";
$ret
.=
"
\t
IF EXIST
\$
@.manifest mt -manifest
\$
@.manifest -outputresource:
\$
@;2
\n\n
";
$ret
.=
"
\t
IF EXIST
\$
@.manifest mt -
nologo -
manifest
\$
@.manifest -outputresource:
\$
@;2
\n\n
";
}
$ret
.=
"
\n
";
return
(
$ret
);
...
...
@@ -301,7 +301,7 @@ sub do_link_rule
$ret
.=
"
$target
:
$files
$dep_libs
\n
";
$ret
.=
"
\t\$
(LINK)
\$
(LFLAGS)
$efile$target
@<<
\n
";
$ret
.=
"
\$
(APP_EX_OBJ)
$files
$libs
\n
<<
\n
";
$ret
.=
"
\t
IF EXIST
\$
@.manifest mt -manifest
\$
@.manifest -outputresource:
\$
@;1
\n\n
";
$ret
.=
"
\t
IF EXIST
\$
@.manifest mt -
nologo -
manifest
\$
@.manifest -outputresource:
\$
@;1
\n\n
";
return
(
$ret
);
}
...
...
util/ssleay.num
浏览文件 @
525de5d3
...
...
@@ -239,17 +239,17 @@ SSL_CTX_sess_get_new_cb 287 EXIST::FUNCTION:
SSL_CTX_get_client_cert_cb 288 EXIST::FUNCTION:
SSL_CTX_sess_get_remove_cb 289 EXIST::FUNCTION:
SSL_set_SSL_CTX 290 EXIST::FUNCTION:
SSL_
CTX_use_psk_identity_hint 291 EXIST::FUNCTION:PSK
SSL_
CTX_set_psk_client_callback 292 EXIST::FUNCTION:PSK
SSL_
get_psk_identity_hint
293 EXIST::FUNCTION:PSK
SSL_
set_psk_server_callback
294 EXIST::FUNCTION:PSK
SSL_use_psk_identity_hint 295 EXIST::FUNCTION:PSK
SSL_
set_psk_client_callback
296 EXIST::FUNCTION:PSK
SSL_
get_servername 297 EXIST::FUNCTION:TLSEXT
SSL_
get_servername_type 298 EXIST::FUNCTION:TLSEXT
SSL_
CTX_set_psk_server_callback
299 EXIST::FUNCTION:PSK
SSL_get_psk_identity 300 EXIST::FUNCTION:PSK
PEM_
write_bio_SSL_SESSION
301 EXIST::FUNCTION:
PEM_read_SSL_SESSION 302 EXIST:!WIN16:FUNCTION:
PEM_read_bio_SSL_SESSION 303 EXIST::FUNCTION:
SSL_
get_servername 291 EXIST::FUNCTION:TLSEXT
SSL_
get_servername_type 292 EXIST::FUNCTION:TLSEXT
SSL_
CTX_use_psk_identity_hint
293 EXIST::FUNCTION:PSK
SSL_
CTX_set_psk_client_callback
294 EXIST::FUNCTION:PSK
PEM_write_bio_SSL_SESSION 295 EXIST::FUNCTION:
SSL_
get_psk_identity_hint
296 EXIST::FUNCTION:PSK
SSL_
set_psk_server_callback 297 EXIST::FUNCTION:PSK
SSL_
use_psk_identity_hint 298 EXIST::FUNCTION:PSK
SSL_
set_psk_client_callback
299 EXIST::FUNCTION:PSK
PEM_read_SSL_SESSION 300 EXIST:!WIN16:FUNCTION:
PEM_
read_bio_SSL_SESSION
301 EXIST::FUNCTION:
SSL_CTX_set_psk_server_callback 302 EXIST::FUNCTION:PSK
SSL_get_psk_identity 303 EXIST::FUNCTION:PSK
PEM_write_SSL_SESSION 304 EXIST:!WIN16:FUNCTION:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录