Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
6c0a1e2f
T
Third Party Openssl
项目概览
OpenHarmony
/
Third Party Openssl
12 个月 前同步成功
通知
8
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,发现更多精彩内容 >>
提交
6c0a1e2f
编写于
7月 15, 2014
作者:
R
Rich Salz
浏览文件
操作
浏览文件
下载
差异文件
Merge branch 'master' of git.openssl.org:openssl
上级
9d6253cf
1c3e9a7c
变更
8
隐藏空白更改
内联
并排
Showing
8 changed file
with
54 addition
and
4 deletion
+54
-4
apps/s_server.c
apps/s_server.c
+1
-1
crypto/bn/bn_lib.c
crypto/bn/bn_lib.c
+9
-0
crypto/cms/cms_pwri.c
crypto/cms/cms_pwri.c
+2
-1
crypto/ui/ui_lib.c
crypto/ui/ui_lib.c
+1
-1
doc/apps/s_client.pod
doc/apps/s_client.pod
+12
-0
doc/apps/s_server.pod
doc/apps/s_server.pod
+10
-0
doc/ssl/SSL_CTX_new.pod
doc/ssl/SSL_CTX_new.pod
+1
-1
ssl/ssl_ciph.c
ssl/ssl_ciph.c
+18
-0
未找到文件。
apps/s_server.c
浏览文件 @
6c0a1e2f
...
...
@@ -740,7 +740,7 @@ static int MS_CALLBACK ssl_servername_cb(SSL *s, int *ad, void *arg)
if
(
servername
)
{
if
(
strcmp
(
servername
,
p
->
servername
))
if
(
strc
asec
mp
(
servername
,
p
->
servername
))
return
p
->
extension_error
;
if
(
ctx2
)
{
...
...
crypto/bn/bn_lib.c
浏览文件 @
6c0a1e2f
...
...
@@ -324,6 +324,15 @@ static BN_ULONG *bn_expand_internal(const BIGNUM *b, int words)
BNerr
(
BN_F_BN_EXPAND_INTERNAL
,
ERR_R_MALLOC_FAILURE
);
return
(
NULL
);
}
#ifdef PURIFY
/* Valgrind complains in BN_consttime_swap because we process the whole
* array even if it's not initialised yet. This doesn't matter in that
* function - what's important is constant time operation (we're not
* actually going to use the data)
*/
memset
(
a
,
0
,
sizeof
(
BN_ULONG
)
*
words
);
#endif
#if 1
B
=
b
->
d
;
/* Check if the previous number needs to be copied */
...
...
crypto/cms/cms_pwri.c
浏览文件 @
6c0a1e2f
...
...
@@ -93,9 +93,10 @@ CMS_RecipientInfo *CMS_add0_recipient_password(CMS_ContentInfo *cms,
X509_ALGOR
*
encalg
=
NULL
;
unsigned
char
iv
[
EVP_MAX_IV_LENGTH
];
int
ivlen
;
env
=
cms_get0_enveloped
(
cms
);
if
(
!
env
)
goto
err
;
return
NULL
;
if
(
wrap_nid
<=
0
)
wrap_nid
=
NID_id_alg_PWRI_KEK
;
...
...
crypto/ui/ui_lib.c
浏览文件 @
6c0a1e2f
...
...
@@ -916,9 +916,9 @@ int UI_set_result(UI *ui, UI_STRING *uis, const char *result)
break
;
}
}
}
default:
break
;
}
}
return
0
;
}
doc/apps/s_client.pod
浏览文件 @
6c0a1e2f
...
...
@@ -77,6 +77,7 @@ B<openssl> B<s_client>
[B<-rand file(s)>]
[B<-serverinfo types>]
[B<-status>]
[B<-nextprotoneg protocols>]
=head1 DESCRIPTION
...
...
@@ -333,6 +334,17 @@ file.
sends a certificate status request to the server (OCSP stapling). The server
response (if any) is printed out.
=item B<-nextprotoneg protocols>
enable Next Protocol Negotiation TLS extension and provide a list of
comma-separated protocol names that the client should advertise
support for. The list should contain most wanted protocols first.
Protocol names are printable ASCII strings, for example "http/1.1" or
"spdy/3".
Empty list of protocols is treated specially and will cause the client to
advertise support for the TLS extension but disconnect just after
reciving ServerHello with a list of server supported protocols.
=back
=head1 CONNECTED COMMANDS
...
...
doc/apps/s_server.pod
浏览文件 @
6c0a1e2f
...
...
@@ -88,6 +88,8 @@ B<openssl> B<s_server>
[B<-status_verbose>]
[B<-status_timeout nsec>]
[B<-status_url url>]
[B<-nextprotoneg protocols>]
=head1 DESCRIPTION
The B<s_server> command implements a generic SSL/TLS server which listens
...
...
@@ -387,6 +389,14 @@ sets a fallback responder URL to use if no responder URL is present in the
server certificate. Without this option an error is returned if the server
certificate does not contain a responder address.
=item B<-nextprotoneg protocols>
enable Next Protocol Negotiation TLS extension and provide a
comma-separated list of supported protocol names.
The list should contain most wanted protocols first.
Protocol names are printable ASCII strings, for example "http/1.1" or
"spdy/3".
=back
=head1 CONNECTED COMMANDS
...
...
doc/ssl/SSL_CTX_new.pod
浏览文件 @
6c0a1e2f
...
...
@@ -2,7 +2,7 @@
=head1 NAME
SSL_CTX_new, SSLv2_method, SSLv2_server_method, SSLv2_client_method, SSLv3_method, SSLv3_server_method, SSLv3_client_method, TLSv1_method
(void), TLSv1_server_method(void)
, TLSv1_client_method, TLSv1_1_method, TLSv1_1_server_method, TLSv1_1_client_method, SSLv23_method, SSLv23_server_method, SSLv23_client_method - create a new SSL_CTX object as framework for TLS/SSL enabled functions
SSL_CTX_new, SSLv2_method, SSLv2_server_method, SSLv2_client_method, SSLv3_method, SSLv3_server_method, SSLv3_client_method, TLSv1_method
, TLSv1_server_method
, TLSv1_client_method, TLSv1_1_method, TLSv1_1_server_method, TLSv1_1_client_method, SSLv23_method, SSLv23_server_method, SSLv23_client_method - create a new SSL_CTX object as framework for TLS/SSL enabled functions
=head1 SYNOPSIS
...
...
ssl/ssl_ciph.c
浏览文件 @
6c0a1e2f
...
...
@@ -1714,6 +1714,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case
SSL_kSRP
:
kx
=
"SRP"
;
break
;
case
SSL_kGOST
:
kx
=
"GOST"
;
break
;
default:
kx
=
"unknown"
;
}
...
...
@@ -1747,6 +1750,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case
SSL_aSRP
:
au
=
"SRP"
;
break
;
case
SSL_aGOST94
:
au
=
"GOST94"
;
break
;
case
SSL_aGOST01
:
au
=
"GOST01"
;
break
;
default:
au
=
"unknown"
;
break
;
...
...
@@ -1794,6 +1803,9 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case
SSL_SEED
:
enc
=
"SEED(128)"
;
break
;
case
SSL_eGOST2814789CNT
:
enc
=
"GOST89(256)"
;
break
;
default:
enc
=
"unknown"
;
break
;
...
...
@@ -1816,6 +1828,12 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case
SSL_AEAD
:
mac
=
"AEAD"
;
break
;
case
SSL_GOST89MAC
:
mac
=
"GOST89"
;
break
;
case
SSL_GOST94
:
mac
=
"GOST94"
;
break
;
default:
mac
=
"unknown"
;
break
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录