Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
5516fcc0
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
大约 1 年 前同步成功
通知
9
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看板
体验新版 GitCode,发现更多精彩内容 >>
提交
5516fcc0
编写于
6月 29, 2015
作者:
D
Dr. Stephen Henson
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Add RFC4785 ciphersuites
Reviewed-by:
N
Matt Caswell
<
matt@openssl.org
>
上级
ea6114c6
变更
2
显示空白变更内容
内联
并排
Showing
2 changed file
with
59 addition
and
0 deletion
+59
-0
include/openssl/tls1.h
include/openssl/tls1.h
+12
-0
ssl/s3_lib.c
ssl/s3_lib.c
+47
-0
未找到文件。
include/openssl/tls1.h
浏览文件 @
5516fcc0
...
@@ -442,6 +442,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
...
@@ -442,6 +442,12 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
# define TLS1_CK_RSA_PSK_WITH_NULL_SHA256 0x030000B8
# define TLS1_CK_RSA_PSK_WITH_NULL_SHA256 0x030000B8
# define TLS1_CK_RSA_PSK_WITH_NULL_SHA384 0x030000B9
# define TLS1_CK_RSA_PSK_WITH_NULL_SHA384 0x030000B9
/* NULL PSK ciphersuites from RFC4785 */
# define TLS1_CK_PSK_WITH_NULL_SHA 0x0300002C
# define TLS1_CK_DHE_PSK_WITH_NULL_SHA 0x0300002D
# define TLS1_CK_RSA_PSK_WITH_NULL_SHA 0x0300002E
/* AES ciphersuites from RFC3268 */
/* AES ciphersuites from RFC3268 */
# define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F
# define TLS1_CK_RSA_WITH_AES_128_SHA 0x0300002F
...
@@ -603,6 +609,8 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
...
@@ -603,6 +609,8 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256 0x0300C037
# define TLS1_CK_ECDHE_PSK_WITH_AES_128_CBC_SHA256 0x0300C037
# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384 0x0300C038
# define TLS1_CK_ECDHE_PSK_WITH_AES_256_CBC_SHA384 0x0300C038
/* NULL PSK ciphersuites from RFC4785 */
# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA 0x0300C039
# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA 0x0300C039
# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256 0x0300C03A
# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA256 0x0300C03A
# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384 0x0300C03B
# define TLS1_CK_ECDHE_PSK_WITH_NULL_SHA384 0x0300C03B
...
@@ -631,6 +639,10 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
...
@@ -631,6 +639,10 @@ SSL_CTX_callback_ctrl(ssl,SSL_CTRL_SET_TLSEXT_TICKET_KEY_CB,(void (*)(void))cb)
# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA"
# define TLS1_TXT_DHE_DSS_EXPORT1024_WITH_RC4_56_SHA "EXP1024-DHE-DSS-RC4-SHA"
# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA"
# define TLS1_TXT_DHE_DSS_WITH_RC4_128_SHA "DHE-DSS-RC4-SHA"
# define TLS1_TXT_PSK_WITH_NULL_SHA "PSK-NULL-SHA"
# define TLS1_TXT_DHE_PSK_WITH_NULL_SHA "DHE-PSK-NULL-SHA"
# define TLS1_TXT_RSA_PSK_WITH_NULL_SHA "RSA-PSK-NULL-SHA"
/* AES ciphersuites from RFC3268 */
/* AES ciphersuites from RFC3268 */
# define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA"
# define TLS1_TXT_RSA_WITH_AES_128_SHA "AES128-SHA"
# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA"
# define TLS1_TXT_DH_DSS_WITH_AES_128_SHA "DH-DSS-AES128-SHA"
...
...
ssl/s3_lib.c
浏览文件 @
5516fcc0
...
@@ -600,6 +600,53 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
...
@@ -600,6 +600,53 @@ OPENSSL_GLOBAL const SSL_CIPHER ssl3_ciphers[] = {
112
,
112
,
168
,
168
,
},
},
#ifndef OPENSSL_NO_PSK
/* Cipher 2C */
{
1
,
TLS1_TXT_PSK_WITH_NULL_SHA
,
TLS1_CK_PSK_WITH_NULL_SHA
,
SSL_kPSK
,
SSL_aPSK
,
SSL_eNULL
,
SSL_SHA1
,
SSL_TLSV1
,
SSL_NOT_EXP
|
SSL_STRONG_NONE
|
SSL_FIPS
,
SSL_HANDSHAKE_MAC_DEFAULT
|
TLS1_PRF
,
0
,
0
,
},
/* Cipher 2D */
{
1
,
TLS1_TXT_DHE_PSK_WITH_NULL_SHA
,
TLS1_CK_DHE_PSK_WITH_NULL_SHA
,
SSL_kDHEPSK
,
SSL_aPSK
,
SSL_eNULL
,
SSL_SHA1
,
SSL_TLSV1
,
SSL_NOT_EXP
|
SSL_STRONG_NONE
|
SSL_FIPS
,
SSL_HANDSHAKE_MAC_DEFAULT
|
TLS1_PRF
,
0
,
0
,
},
/* Cipher 2E */
{
1
,
TLS1_TXT_RSA_PSK_WITH_NULL_SHA
,
TLS1_CK_RSA_PSK_WITH_NULL_SHA
,
SSL_kRSAPSK
,
SSL_aRSA
,
SSL_eNULL
,
SSL_SHA1
,
SSL_TLSV1
,
SSL_NOT_EXP
|
SSL_STRONG_NONE
|
SSL_FIPS
,
SSL_HANDSHAKE_MAC_DEFAULT
|
TLS1_PRF
,
0
,
0
,
},
#endif
/* New AES ciphersuites */
/* New AES ciphersuites */
/* Cipher 2F */
/* Cipher 2F */
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录