Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
8a2062fe
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
1 年多 前同步成功
通知
10
Star
18
Fork
1
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
T
Third Party Openssl
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
8a2062fe
编写于
16年前
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Update from stable branch.
上级
2f63ad5b
master
OpenHarmony-2.2-Beta2
OpenHarmony-2.3-Beta
OpenHarmony-3.0-LTS
OpenHarmony-3.1-API8-SDK-Public
OpenHarmony-3.1-API9-SDK-Canary
OpenHarmony-3.1-Beta
OpenHarmony-3.1-Release
OpenHarmony-3.2-Beta1
OpenHarmony-3.2-Beta2
OpenHarmony-3.2-Beta3
OpenHarmony-3.2-Beta4
OpenHarmony-3.2-Beta5
OpenHarmony-3.2-Release
OpenHarmony-4.0-Beta1
OpenHarmony-4.0-Beta2
OpenHarmony-v2.2-Beta
OpenHarmony_1.0.1_release
OpenHarmony_filemanager_develop_20220505
OpenHarmony_filemanager_develop_20220614
add_issus_pr_template_for_master
add_issus_pr_template_for_release
feature_IDL_20220811
master_dy
monthly_20220614
monthly_20220816
monthly_20221018
monthly_20230815
revert-merge-109-master
weekly_20220105
weekly_20220111
weekly_20220118
weekly_20220125
weekly_20220201
weekly_20220208
weekly_20220215
weekly_20220222
weekly_20220301
weekly_20220406
weekly_20220412
weekly_20220419
weekly_20220426
weekly_20220503
weekly_20220510
weekly_20220524
weekly_20220531
weekly_20220607
weekly_20220614
weekly_20220621
weekly_20220628
weekly_20220705
weekly_20220712
weekly_20220719
weekly_20220726
weekly_20220802
weekly_20220809
weekly_20220816
weekly_20220823
weekly_20220830
weekly_20220906
weekly_20220913
weekly_20220920
weekly_20220927
weekly_20221004
weekly_20221011
weekly_20221018
weekly_20221025
weekly_20221101
weekly_20221108
weekly_20221115
weekly_20221122
weekly_20221129
weekly_20221206
weekly_20221213
weekly_20221220
weekly_20221227
weekly_20230103
weekly_20230110
weekly_20230117
weekly_20230124
weekly_20230131
weekly_20230207
weekly_20230214
weekly_20230221
weekly_20230228
weekly_20230307
weekly_20230314
weekly_20230321
weekly_20230328
weekly_20230404
weekly_20230411
weekly_20230418
weekly_20230425
weekly_20230502
weekly_20230509
weekly_20230516
weekly_20230523
weekly_20230530
weekly_20230606
weekly_20230613
weekly_20230619
weekly_20230626
weekly_20230627
weekly_20230704
weekly_20230712
weekly_20230725
weekly_20230801
weekly_20230808
weekly_20230815
weekly_20230822
weekly_20230829
OpenHarmony_v1.1.1-LTS
OpenHarmony_release_v1.1.0
OpenHarmony-v4.0-Beta2
OpenHarmony-v4.0-Beta1
OpenHarmony-v3.2.2-Release
OpenHarmony-v3.2.1-Release
OpenHarmony-v3.2-Release
OpenHarmony-v3.2-Beta5
OpenHarmony-v3.2-Beta4
OpenHarmony-v3.2-Beta3
OpenHarmony-v3.2-Beta2
OpenHarmony-v3.2-Beta1
OpenHarmony-v3.1.7-Release
OpenHarmony-v3.1.6-Release
OpenHarmony-v3.1.5-Release
OpenHarmony-v3.1.4-Release
OpenHarmony-v3.1.3-Release
OpenHarmony-v3.1.2-Release
OpenHarmony-v3.1.1-Release
OpenHarmony-v3.1-Release
OpenHarmony-v3.1-Beta
OpenHarmony-v3.0.8-LTS
OpenHarmony-v3.0.7-LTS
OpenHarmony-v3.0.6-LTS
OpenHarmony-v3.0.5-LTS
OpenHarmony-v3.0.3-LTS
OpenHarmony-v3.0.2-LTS
OpenHarmony-v3.0.1-LTS
OpenHarmony-v3.0-LTS
OpenHarmony-v3.0-Beta1
OpenHarmony-v2.2-Beta2
OpenHarmony-v1.1.5-LTS
OpenHarmony-v1.1.4-LTS
OpenHarmony-v1.1.3-LTS
OpenHarmony-v1.1.2-LTS
OpenHarmony-v1.1.1-LTS
OpenHarmony-2.0-Canary
OpenHarmony-1.0
无相关合并请求
变更
6
隐藏空白更改
内联
并排
Showing
6 changed file
with
87 addition
and
29 deletion
+87
-29
CHANGES
CHANGES
+6
-0
ssl/s3_lib.c
ssl/s3_lib.c
+7
-0
ssl/s3_srvr.c
ssl/s3_srvr.c
+30
-10
ssl/ssl.h
ssl/ssl.h
+8
-0
ssl/t1_lib.c
ssl/t1_lib.c
+33
-19
ssl/tls1.h
ssl/tls1.h
+3
-0
未找到文件。
CHANGES
浏览文件 @
8a2062fe
...
...
@@ -680,6 +680,12 @@
[NTT]
Changes between 0.9.8g and 0.9.8h [xx XXX xxxx]
*) Add TLS session ticket callback. This allows an application to set
TLS ticket cipher and HMAC keys rather than relying on hardcoded fixed
values. This is useful for key rollover for example where several key
sets may exist with different names.
[Steve Henson]
*) Reverse ENGINE-internal logic for caching default ENGINE handles.
This was broken until now in 0.9.8 releases, such that the only way
...
...
This diff is collapsed.
Click to expand it.
ssl/s3_lib.c
浏览文件 @
8a2062fe
...
...
@@ -2770,6 +2770,13 @@ long ssl3_ctx_callback_ctrl(SSL_CTX *ctx, int cmd, void (*fp)(void))
ctx
->
tlsext_status_cb
=
(
int
(
*
)(
SSL
*
,
void
*
))
fp
;
break
;
case
SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB
:
ctx
->
tlsext_ticket_key_cb
=
(
int
(
*
)(
SSL
*
,
unsigned
char
*
,
unsigned
char
*
,
EVP_CIPHER_CTX
*
,
HMAC_CTX
*
,
int
))
fp
;
break
;
#endif
default:
return
(
0
);
...
...
This diff is collapsed.
Click to expand it.
ssl/s3_srvr.c
浏览文件 @
8a2062fe
...
...
@@ -2853,6 +2853,8 @@ int ssl3_send_newsession_ticket(SSL *s)
unsigned
int
hlen
;
EVP_CIPHER_CTX
ctx
;
HMAC_CTX
hctx
;
unsigned
char
iv
[
EVP_MAX_IV_LENGTH
];
unsigned
char
key_name
[
16
];
/* get session encoding length */
slen
=
i2d_SSL_SESSION
(
s
->
session
,
NULL
);
...
...
@@ -2883,29 +2885,47 @@ int ssl3_send_newsession_ticket(SSL *s)
*
(
p
++
)
=
SSL3_MT_NEWSESSION_TICKET
;
/* Skip message length for now */
p
+=
3
;
EVP_CIPHER_CTX_init
(
&
ctx
);
HMAC_CTX_init
(
&
hctx
);
/* Initialize HMAC and cipher contexts. If callback present
* it does all the work otherwise use generated values
* from parent ctx.
*/
if
(
s
->
ctx
->
tlsext_ticket_key_cb
)
{
if
(
s
->
ctx
->
tlsext_ticket_key_cb
(
s
,
key_name
,
iv
,
&
ctx
,
&
hctx
,
1
)
<
0
)
{
OPENSSL_free
(
senc
);
return
-
1
;
}
}
else
{
RAND_pseudo_bytes
(
iv
,
16
);
EVP_EncryptInit_ex
(
&
ctx
,
EVP_aes_128_cbc
(),
NULL
,
s
->
ctx
->
tlsext_tick_aes_key
,
iv
);
HMAC_Init_ex
(
&
hctx
,
s
->
ctx
->
tlsext_tick_hmac_key
,
16
,
tlsext_tick_md
(),
NULL
);
memcpy
(
key_name
,
s
->
ctx
->
tlsext_tick_key_name
,
16
);
}
l2n
(
s
->
session
->
tlsext_tick_lifetime_hint
,
p
);
/* Skip ticket length for now */
p
+=
2
;
/* Output key name */
macstart
=
p
;
memcpy
(
p
,
s
->
ctx
->
tlsext_tick_
key_name
,
16
);
memcpy
(
p
,
key_name
,
16
);
p
+=
16
;
/*
Generate and
output IV */
RAND_pseudo_bytes
(
p
,
16
);
EVP_CIPHER_CTX_init
(
&
ctx
);
/* output IV */
memcpy
(
p
,
iv
,
EVP_CIPHER_CTX_iv_length
(
&
ctx
)
);
p
+=
EVP_CIPHER_CTX_iv_length
(
&
ctx
);
/* Encrypt session data */
EVP_EncryptInit_ex
(
&
ctx
,
EVP_aes_128_cbc
(),
NULL
,
s
->
ctx
->
tlsext_tick_aes_key
,
p
);
p
+=
16
;
EVP_EncryptUpdate
(
&
ctx
,
p
,
&
len
,
senc
,
slen
);
p
+=
len
;
EVP_EncryptFinal
(
&
ctx
,
p
,
&
len
);
p
+=
len
;
EVP_CIPHER_CTX_cleanup
(
&
ctx
);
HMAC_CTX_init
(
&
hctx
);
HMAC_Init_ex
(
&
hctx
,
s
->
ctx
->
tlsext_tick_hmac_key
,
16
,
tlsext_tick_md
(),
NULL
);
HMAC_Update
(
&
hctx
,
macstart
,
p
-
macstart
);
HMAC_Final
(
&
hctx
,
p
,
&
hlen
);
HMAC_CTX_cleanup
(
&
hctx
);
...
...
This diff is collapsed.
Click to expand it.
ssl/ssl.h
浏览文件 @
8a2062fe
...
...
@@ -160,6 +160,7 @@
#include <openssl/buffer.h>
#endif
#include <openssl/pem.h>
#include <openssl/hmac.h>
#include <openssl/kssl.h>
#include <openssl/safestack.h>
...
...
@@ -807,6 +808,11 @@ struct ssl_ctx_st
unsigned
char
tlsext_tick_key_name
[
16
];
unsigned
char
tlsext_tick_hmac_key
[
16
];
unsigned
char
tlsext_tick_aes_key
[
16
];
/* Callback to support customisation of ticket key setting */
int
(
*
tlsext_ticket_key_cb
)(
SSL
*
ssl
,
unsigned
char
*
name
,
unsigned
char
*
iv
,
EVP_CIPHER_CTX
*
ectx
,
HMAC_CTX
*
hctx
,
int
enc
);
/* certificate status request info */
/* Callback for status request */
...
...
@@ -1351,6 +1357,8 @@ DECLARE_PEM_rw(SSL_SESSION, SSL_SESSION)
#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_IDS 69
#define SSL_CTRL_GET_TLSEXT_STATUS_REQ_OCSP_RESP 70
#define SSL_CTRL_SET_TLSEXT_STATUS_REQ_OCSP_RESP 71
#define SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB 72
#endif
#define SSL_session_reused(ssl) \
...
...
This diff is collapsed.
Click to expand it.
ssl/t1_lib.c
浏览文件 @
8a2062fe
...
...
@@ -1442,39 +1442,53 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
SSL_SESSION
*
sess
;
unsigned
char
*
sdec
;
const
unsigned
char
*
p
;
int
slen
,
mlen
;
int
slen
,
mlen
,
renew_ticket
=
0
;
unsigned
char
tick_hmac
[
EVP_MAX_MD_SIZE
];
HMAC_CTX
hctx
;
EVP_CIPHER_CTX
ctx
;
/* Need at least keyname + iv + some encrypted data */
if
(
eticklen
<
48
)
goto
tickerr
;
/* Initialize session ticket encryption and HMAC contexts */
HMAC_CTX_init
(
&
hctx
);
EVP_CIPHER_CTX_init
(
&
ctx
);
if
(
s
->
ctx
->
tlsext_ticket_key_cb
)
{
unsigned
char
*
nctick
=
(
unsigned
char
*
)
etick
;
int
rv
=
s
->
ctx
->
tlsext_ticket_key_cb
(
s
,
nctick
,
nctick
+
16
,
&
ctx
,
&
hctx
,
0
);
if
(
rv
<
0
)
return
-
1
;
if
(
rv
==
0
)
goto
tickerr
;
if
(
rv
==
2
)
renew_ticket
=
1
;
}
else
{
/* Check key name matches */
if
(
memcmp
(
etick
,
s
->
ctx
->
tlsext_tick_key_name
,
16
))
goto
tickerr
;
HMAC_Init_ex
(
&
hctx
,
s
->
ctx
->
tlsext_tick_hmac_key
,
16
,
tlsext_tick_md
(),
NULL
);
EVP_DecryptInit_ex
(
&
ctx
,
EVP_aes_128_cbc
(),
NULL
,
s
->
ctx
->
tlsext_tick_aes_key
,
etick
+
16
);
}
/* Attempt to process session ticket, first conduct sanity and
* integrity checks on ticket.
*/
mlen
=
EVP_MD_size
(
tlsext_tick_md
()
);
mlen
=
HMAC_size
(
&
hctx
);
eticklen
-=
mlen
;
/* Need at least keyname + iv + some encrypted data */
if
(
eticklen
<
48
)
goto
tickerr
;
/* Check key name matches */
if
(
memcmp
(
etick
,
s
->
ctx
->
tlsext_tick_key_name
,
16
))
goto
tickerr
;
/* Check HMAC of encrypted ticket */
HMAC_CTX_init
(
&
hctx
);
HMAC_Init_ex
(
&
hctx
,
s
->
ctx
->
tlsext_tick_hmac_key
,
16
,
tlsext_tick_md
(),
NULL
);
HMAC_Update
(
&
hctx
,
etick
,
eticklen
);
HMAC_Final
(
&
hctx
,
tick_hmac
,
NULL
);
HMAC_CTX_cleanup
(
&
hctx
);
if
(
memcmp
(
tick_hmac
,
etick
+
eticklen
,
mlen
))
goto
tickerr
;
/* Set p to start of IV */
p
=
etick
+
16
;
EVP_CIPHER_CTX_init
(
&
ctx
);
/* Attempt to decrypt session data */
EVP_DecryptInit_ex
(
&
ctx
,
EVP_aes_128_cbc
(),
NULL
,
s
->
ctx
->
tlsext_tick_aes_key
,
p
);
/* Move p after IV to start of encrypted ticket, update length */
p
+=
16
;
eticklen
-=
32
;
p
=
etick
+
16
+
EVP_CIPHER_CTX_iv_length
(
&
ctx
)
;
eticklen
-=
16
+
EVP_CIPHER_CTX_iv_length
(
&
ctx
)
;
sdec
=
OPENSSL_malloc
(
eticklen
);
if
(
!
sdec
)
{
...
...
@@ -1501,7 +1515,7 @@ static int tls_decrypt_ticket(SSL *s, const unsigned char *etick, int eticklen,
memcpy
(
sess
->
session_id
,
sess_id
,
sesslen
);
sess
->
session_id_length
=
sesslen
;
*
psess
=
sess
;
s
->
tlsext_ticket_expected
=
0
;
s
->
tlsext_ticket_expected
=
renew_ticket
;
return
1
;
}
/* If session decrypt failure indicate a cache miss and set state to
...
...
This diff is collapsed.
Click to expand it.
ssl/tls1.h
浏览文件 @
8a2062fe
...
...
@@ -279,6 +279,9 @@ SSL_CTX_callback_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB, (void (*)(voi
#define SSL_CTX_set_tlsext_opaque_prf_input_callback_arg(ctx, arg) \
SSL_CTX_ctrl(ctx,SSL_CTRL_SET_TLSEXT_OPAQUE_PRF_INPUT_CB_ARG, 0, arg)
#define SSL_CTX_set_tlsext_ticket_key_cb(ssl, cb) \
SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
#endif
/* PSK ciphersuites from 4279 */
...
...
This diff is collapsed.
Click to expand it.
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录
反馈
建议
客服
返回
顶部