Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OpenHarmony
Third Party Openssl
提交
2fcff74c
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,发现更多精彩内容 >>
提交
2fcff74c
编写于
2月 02, 2016
作者:
R
Richard Levitte
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
make update
Reviewed-by:
N
Kurt Roeckx
<
kurt@openssl.org
>
上级
b00b2124
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
40 addition
and
5 deletion
+40
-5
crypto/bio/bio_err.c
crypto/bio/bio_err.c
+15
-0
include/openssl/bio.h
include/openssl/bio.h
+14
-0
util/libeay.num
util/libeay.num
+11
-5
未找到文件。
crypto/bio/bio_err.c
浏览文件 @
2fcff74c
...
@@ -73,14 +73,17 @@ static ERR_STRING_DATA BIO_str_functs[] = {
...
@@ -73,14 +73,17 @@ static ERR_STRING_DATA BIO_str_functs[] = {
{
ERR_FUNC
(
BIO_F_ACPT_STATE
),
"acpt_state"
},
{
ERR_FUNC
(
BIO_F_ACPT_STATE
),
"acpt_state"
},
{
ERR_FUNC
(
BIO_F_ADDR_STRINGS
),
"addr_strings"
},
{
ERR_FUNC
(
BIO_F_ADDR_STRINGS
),
"addr_strings"
},
{
ERR_FUNC
(
BIO_F_BIO_ACCEPT
),
"BIO_accept"
},
{
ERR_FUNC
(
BIO_F_BIO_ACCEPT
),
"BIO_accept"
},
{
ERR_FUNC
(
BIO_F_BIO_ACCEPT_EX
),
"BIO_accept_ex"
},
{
ERR_FUNC
(
BIO_F_BIO_BER_GET_HEADER
),
"BIO_BER_GET_HEADER"
},
{
ERR_FUNC
(
BIO_F_BIO_BER_GET_HEADER
),
"BIO_BER_GET_HEADER"
},
{
ERR_FUNC
(
BIO_F_BIO_CALLBACK_CTRL
),
"BIO_callback_ctrl"
},
{
ERR_FUNC
(
BIO_F_BIO_CALLBACK_CTRL
),
"BIO_callback_ctrl"
},
{
ERR_FUNC
(
BIO_F_BIO_CONNECT
),
"BIO_connect"
},
{
ERR_FUNC
(
BIO_F_BIO_CTRL
),
"BIO_ctrl"
},
{
ERR_FUNC
(
BIO_F_BIO_CTRL
),
"BIO_ctrl"
},
{
ERR_FUNC
(
BIO_F_BIO_GETHOSTBYNAME
),
"BIO_gethostbyname"
},
{
ERR_FUNC
(
BIO_F_BIO_GETHOSTBYNAME
),
"BIO_gethostbyname"
},
{
ERR_FUNC
(
BIO_F_BIO_GETS
),
"BIO_gets"
},
{
ERR_FUNC
(
BIO_F_BIO_GETS
),
"BIO_gets"
},
{
ERR_FUNC
(
BIO_F_BIO_GET_ACCEPT_SOCKET
),
"BIO_get_accept_socket"
},
{
ERR_FUNC
(
BIO_F_BIO_GET_ACCEPT_SOCKET
),
"BIO_get_accept_socket"
},
{
ERR_FUNC
(
BIO_F_BIO_GET_HOST_IP
),
"BIO_get_host_ip"
},
{
ERR_FUNC
(
BIO_F_BIO_GET_HOST_IP
),
"BIO_get_host_ip"
},
{
ERR_FUNC
(
BIO_F_BIO_GET_PORT
),
"BIO_get_port"
},
{
ERR_FUNC
(
BIO_F_BIO_GET_PORT
),
"BIO_get_port"
},
{
ERR_FUNC
(
BIO_F_BIO_LISTEN
),
"BIO_listen"
},
{
ERR_FUNC
(
BIO_F_BIO_LOOKUP
),
"BIO_lookup"
},
{
ERR_FUNC
(
BIO_F_BIO_LOOKUP
),
"BIO_lookup"
},
{
ERR_FUNC
(
BIO_F_BIO_MAKE_PAIR
),
"bio_make_pair"
},
{
ERR_FUNC
(
BIO_F_BIO_MAKE_PAIR
),
"bio_make_pair"
},
{
ERR_FUNC
(
BIO_F_BIO_NEW
),
"BIO_new"
},
{
ERR_FUNC
(
BIO_F_BIO_NEW
),
"BIO_new"
},
...
@@ -93,6 +96,8 @@ static ERR_STRING_DATA BIO_str_functs[] = {
...
@@ -93,6 +96,8 @@ static ERR_STRING_DATA BIO_str_functs[] = {
{
ERR_FUNC
(
BIO_F_BIO_PARSE_HOSTSERV
),
"BIO_parse_hostserv"
},
{
ERR_FUNC
(
BIO_F_BIO_PARSE_HOSTSERV
),
"BIO_parse_hostserv"
},
{
ERR_FUNC
(
BIO_F_BIO_PUTS
),
"BIO_puts"
},
{
ERR_FUNC
(
BIO_F_BIO_PUTS
),
"BIO_puts"
},
{
ERR_FUNC
(
BIO_F_BIO_READ
),
"BIO_read"
},
{
ERR_FUNC
(
BIO_F_BIO_READ
),
"BIO_read"
},
{
ERR_FUNC
(
BIO_F_BIO_SOCKET
),
"BIO_socket"
},
{
ERR_FUNC
(
BIO_F_BIO_SOCK_INFO
),
"BIO_sock_info"
},
{
ERR_FUNC
(
BIO_F_BIO_SOCK_INIT
),
"BIO_sock_init"
},
{
ERR_FUNC
(
BIO_F_BIO_SOCK_INIT
),
"BIO_sock_init"
},
{
ERR_FUNC
(
BIO_F_BIO_WRITE
),
"BIO_write"
},
{
ERR_FUNC
(
BIO_F_BIO_WRITE
),
"BIO_write"
},
{
ERR_FUNC
(
BIO_F_BUFFER_CTRL
),
"buffer_ctrl"
},
{
ERR_FUNC
(
BIO_F_BUFFER_CTRL
),
"buffer_ctrl"
},
...
@@ -125,10 +130,16 @@ static ERR_STRING_DATA BIO_str_reasons[] = {
...
@@ -125,10 +130,16 @@ static ERR_STRING_DATA BIO_str_reasons[] = {
"error setting nbio on accept socket"
},
"error setting nbio on accept socket"
},
{
ERR_REASON
(
BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET
),
{
ERR_REASON
(
BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET
),
"gethostbyname addr is not af inet"
},
"gethostbyname addr is not af inet"
},
{
ERR_REASON
(
BIO_R_GETSOCKNAME_ERROR
),
"getsockname error"
},
{
ERR_REASON
(
BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS
),
"getsockname truncated address"
},
{
ERR_REASON
(
BIO_R_GETTING_SOCKTYPE
),
"getting socktype"
},
{
ERR_REASON
(
BIO_R_INVALID_ARGUMENT
),
"invalid argument"
},
{
ERR_REASON
(
BIO_R_INVALID_ARGUMENT
),
"invalid argument"
},
{
ERR_REASON
(
BIO_R_INVALID_IP_ADDRESS
),
"invalid ip address"
},
{
ERR_REASON
(
BIO_R_INVALID_IP_ADDRESS
),
"invalid ip address"
},
{
ERR_REASON
(
BIO_R_INVALID_SOCKET
),
"invalid socket"
},
{
ERR_REASON
(
BIO_R_IN_USE
),
"in use"
},
{
ERR_REASON
(
BIO_R_IN_USE
),
"in use"
},
{
ERR_REASON
(
BIO_R_KEEPALIVE
),
"keepalive"
},
{
ERR_REASON
(
BIO_R_KEEPALIVE
),
"keepalive"
},
{
ERR_REASON
(
BIO_R_LISTEN_V6_ONLY
),
"listen v6 only"
},
{
ERR_REASON
(
BIO_R_MALFORMED_HOST_OR_SERVICE
),
"malformed host or service"
},
{
ERR_REASON
(
BIO_R_MALFORMED_HOST_OR_SERVICE
),
"malformed host or service"
},
{
ERR_REASON
(
BIO_R_NBIO_CONNECT_ERROR
),
"nbio connect error"
},
{
ERR_REASON
(
BIO_R_NBIO_CONNECT_ERROR
),
"nbio connect error"
},
{
ERR_REASON
(
BIO_R_NO_ACCEPT_PORT_SPECIFIED
),
"no accept port specified"
},
{
ERR_REASON
(
BIO_R_NO_ACCEPT_PORT_SPECIFIED
),
"no accept port specified"
},
...
@@ -140,8 +151,12 @@ static ERR_STRING_DATA BIO_str_reasons[] = {
...
@@ -140,8 +151,12 @@ static ERR_STRING_DATA BIO_str_reasons[] = {
{
ERR_REASON
(
BIO_R_TAG_MISMATCH
),
"tag mismatch"
},
{
ERR_REASON
(
BIO_R_TAG_MISMATCH
),
"tag mismatch"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_BIND_SOCKET
),
"unable to bind socket"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_BIND_SOCKET
),
"unable to bind socket"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_CREATE_SOCKET
),
"unable to create socket"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_CREATE_SOCKET
),
"unable to create socket"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_KEEPALIVE
),
"unable to keepalive"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_LISTEN_SOCKET
),
"unable to listen socket"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_LISTEN_SOCKET
),
"unable to listen socket"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_NODELAY
),
"unable to nodelay"
},
{
ERR_REASON
(
BIO_R_UNABLE_TO_REUSEADDR
),
"unable to reuseaddr"
},
{
ERR_REASON
(
BIO_R_UNINITIALIZED
),
"uninitialized"
},
{
ERR_REASON
(
BIO_R_UNINITIALIZED
),
"uninitialized"
},
{
ERR_REASON
(
BIO_R_UNKNOWN_INFO_TYPE
),
"unknown info type"
},
{
ERR_REASON
(
BIO_R_UNSUPPORTED_METHOD
),
"unsupported method"
},
{
ERR_REASON
(
BIO_R_UNSUPPORTED_METHOD
),
"unsupported method"
},
{
ERR_REASON
(
BIO_R_UNSUPPORTED_PROTOCOL_FAMILY
),
{
ERR_REASON
(
BIO_R_UNSUPPORTED_PROTOCOL_FAMILY
),
"unsupported protocol family"
},
"unsupported protocol family"
},
...
...
include/openssl/bio.h
浏览文件 @
2fcff74c
...
@@ -828,14 +828,17 @@ void ERR_load_BIO_strings(void);
...
@@ -828,14 +828,17 @@ void ERR_load_BIO_strings(void);
# define BIO_F_ACPT_STATE 100
# define BIO_F_ACPT_STATE 100
# define BIO_F_ADDR_STRINGS 134
# define BIO_F_ADDR_STRINGS 134
# define BIO_F_BIO_ACCEPT 101
# define BIO_F_BIO_ACCEPT 101
# define BIO_F_BIO_ACCEPT_EX 137
# define BIO_F_BIO_BER_GET_HEADER 102
# define BIO_F_BIO_BER_GET_HEADER 102
# define BIO_F_BIO_CALLBACK_CTRL 131
# define BIO_F_BIO_CALLBACK_CTRL 131
# define BIO_F_BIO_CONNECT 138
# define BIO_F_BIO_CTRL 103
# define BIO_F_BIO_CTRL 103
# define BIO_F_BIO_GETHOSTBYNAME 120
# define BIO_F_BIO_GETHOSTBYNAME 120
# define BIO_F_BIO_GETS 104
# define BIO_F_BIO_GETS 104
# define BIO_F_BIO_GET_ACCEPT_SOCKET 105
# define BIO_F_BIO_GET_ACCEPT_SOCKET 105
# define BIO_F_BIO_GET_HOST_IP 106
# define BIO_F_BIO_GET_HOST_IP 106
# define BIO_F_BIO_GET_PORT 107
# define BIO_F_BIO_GET_PORT 107
# define BIO_F_BIO_LISTEN 139
# define BIO_F_BIO_LOOKUP 135
# define BIO_F_BIO_LOOKUP 135
# define BIO_F_BIO_MAKE_PAIR 121
# define BIO_F_BIO_MAKE_PAIR 121
# define BIO_F_BIO_NEW 108
# define BIO_F_BIO_NEW 108
...
@@ -848,6 +851,8 @@ void ERR_load_BIO_strings(void);
...
@@ -848,6 +851,8 @@ void ERR_load_BIO_strings(void);
# define BIO_F_BIO_PARSE_HOSTSERV 136
# define BIO_F_BIO_PARSE_HOSTSERV 136
# define BIO_F_BIO_PUTS 110
# define BIO_F_BIO_PUTS 110
# define BIO_F_BIO_READ 111
# define BIO_F_BIO_READ 111
# define BIO_F_BIO_SOCKET 140
# define BIO_F_BIO_SOCK_INFO 141
# define BIO_F_BIO_SOCK_INIT 112
# define BIO_F_BIO_SOCK_INIT 112
# define BIO_F_BIO_WRITE 113
# define BIO_F_BIO_WRITE 113
# define BIO_F_BUFFER_CTRL 114
# define BIO_F_BUFFER_CTRL 114
...
@@ -875,10 +880,15 @@ void ERR_load_BIO_strings(void);
...
@@ -875,10 +880,15 @@ void ERR_load_BIO_strings(void);
# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET 105
# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPTED_SOCKET 105
# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET 106
# define BIO_R_ERROR_SETTING_NBIO_ON_ACCEPT_SOCKET 106
# define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET 107
# define BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET 107
# define BIO_R_GETSOCKNAME_ERROR 132
# define BIO_R_GETSOCKNAME_TRUNCATED_ADDRESS 133
# define BIO_R_GETTING_SOCKTYPE 134
# define BIO_R_INVALID_ARGUMENT 125
# define BIO_R_INVALID_ARGUMENT 125
# define BIO_R_INVALID_IP_ADDRESS 108
# define BIO_R_INVALID_IP_ADDRESS 108
# define BIO_R_INVALID_SOCKET 135
# define BIO_R_IN_USE 123
# define BIO_R_IN_USE 123
# define BIO_R_KEEPALIVE 109
# define BIO_R_KEEPALIVE 109
# define BIO_R_LISTEN_V6_ONLY 136
# define BIO_R_MALFORMED_HOST_OR_SERVICE 130
# define BIO_R_MALFORMED_HOST_OR_SERVICE 130
# define BIO_R_NBIO_CONNECT_ERROR 110
# define BIO_R_NBIO_CONNECT_ERROR 110
# define BIO_R_NO_ACCEPT_PORT_SPECIFIED 111
# define BIO_R_NO_ACCEPT_PORT_SPECIFIED 111
...
@@ -890,8 +900,12 @@ void ERR_load_BIO_strings(void);
...
@@ -890,8 +900,12 @@ void ERR_load_BIO_strings(void);
# define BIO_R_TAG_MISMATCH 116
# define BIO_R_TAG_MISMATCH 116
# define BIO_R_UNABLE_TO_BIND_SOCKET 117
# define BIO_R_UNABLE_TO_BIND_SOCKET 117
# define BIO_R_UNABLE_TO_CREATE_SOCKET 118
# define BIO_R_UNABLE_TO_CREATE_SOCKET 118
# define BIO_R_UNABLE_TO_KEEPALIVE 137
# define BIO_R_UNABLE_TO_LISTEN_SOCKET 119
# define BIO_R_UNABLE_TO_LISTEN_SOCKET 119
# define BIO_R_UNABLE_TO_NODELAY 138
# define BIO_R_UNABLE_TO_REUSEADDR 139
# define BIO_R_UNINITIALIZED 120
# define BIO_R_UNINITIALIZED 120
# define BIO_R_UNKNOWN_INFO_TYPE 140
# define BIO_R_UNSUPPORTED_METHOD 121
# define BIO_R_UNSUPPORTED_METHOD 121
# define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY 131
# define BIO_R_UNSUPPORTED_PROTOCOL_FAMILY 131
# define BIO_R_WRITE_TO_READ_ONLY_BIO 126
# define BIO_R_WRITE_TO_READ_ONLY_BIO 126
...
...
util/libeay.num
浏览文件 @
2fcff74c
...
@@ -46,7 +46,7 @@ BF_options 45 1_1_0 EXIST::FUNCTION:BF
...
@@ -46,7 +46,7 @@ BF_options 45 1_1_0 EXIST::FUNCTION:BF
BF_set_key 46 1_1_0 EXIST::FUNCTION:BF
BF_set_key 46 1_1_0 EXIST::FUNCTION:BF
BIO_CONNECT_free 47 1_1_0 NOEXIST::FUNCTION:
BIO_CONNECT_free 47 1_1_0 NOEXIST::FUNCTION:
BIO_CONNECT_new 48 1_1_0 NOEXIST::FUNCTION:
BIO_CONNECT_new 48 1_1_0 NOEXIST::FUNCTION:
BIO_accept 51 1_1_0 EXIST::FUNCTION:
BIO_accept 51 1_1_0 EXIST::FUNCTION:
DEPRECATEDIN_1_1_0
BIO_ctrl 52 1_1_0 EXIST::FUNCTION:
BIO_ctrl 52 1_1_0 EXIST::FUNCTION:
BIO_int_ctrl 53 1_1_0 EXIST::FUNCTION:
BIO_int_ctrl 53 1_1_0 EXIST::FUNCTION:
BIO_debug_callback 54 1_1_0 EXIST::FUNCTION:
BIO_debug_callback 54 1_1_0 EXIST::FUNCTION:
...
@@ -63,13 +63,13 @@ BIO_fd_should_retry 64 1_1_0 EXIST::FUNCTION:
...
@@ -63,13 +63,13 @@ BIO_fd_should_retry 64 1_1_0 EXIST::FUNCTION:
BIO_find_type 65 1_1_0 EXIST::FUNCTION:
BIO_find_type 65 1_1_0 EXIST::FUNCTION:
BIO_free 66 1_1_0 EXIST::FUNCTION:
BIO_free 66 1_1_0 EXIST::FUNCTION:
BIO_free_all 67 1_1_0 EXIST::FUNCTION:
BIO_free_all 67 1_1_0 EXIST::FUNCTION:
BIO_get_accept_socket 69 1_1_0 EXIST::FUNCTION:
BIO_get_accept_socket 69 1_1_0 EXIST::FUNCTION:
DEPRECATEDIN_1_1_0
BIO_get_filter_bio 70 1_1_0 NOEXIST::FUNCTION:
BIO_get_filter_bio 70 1_1_0 NOEXIST::FUNCTION:
BIO_get_host_ip 71 1_1_0 EXIST::FUNCTION:
BIO_get_host_ip 71 1_1_0 EXIST::FUNCTION:
DEPRECATEDIN_1_1_0
BIO_get_port 72 1_1_0 EXIST::FUNCTION:
BIO_get_port 72 1_1_0 EXIST::FUNCTION:
DEPRECATEDIN_1_1_0
BIO_get_retry_BIO 73 1_1_0 EXIST::FUNCTION:
BIO_get_retry_BIO 73 1_1_0 EXIST::FUNCTION:
BIO_get_retry_reason 74 1_1_0 EXIST::FUNCTION:
BIO_get_retry_reason 74 1_1_0 EXIST::FUNCTION:
BIO_gethostbyname 75 1_1_0 EXIST::FUNCTION:
BIO_gethostbyname 75 1_1_0 EXIST::FUNCTION:
DEPRECATEDIN_1_1_0
BIO_gets 76 1_1_0 EXIST::FUNCTION:
BIO_gets 76 1_1_0 EXIST::FUNCTION:
BIO_new 78 1_1_0 EXIST::FUNCTION:
BIO_new 78 1_1_0 EXIST::FUNCTION:
BIO_new_accept 79 1_1_0 EXIST::FUNCTION:
BIO_new_accept 79 1_1_0 EXIST::FUNCTION:
...
@@ -4789,3 +4789,9 @@ BIO_ADDR_new 5183 1_1_0 EXIST::FUNCTION:
...
@@ -4789,3 +4789,9 @@ BIO_ADDR_new 5183 1_1_0 EXIST::FUNCTION:
BIO_ADDR_rawmake 5184 1_1_0 EXIST::FUNCTION:
BIO_ADDR_rawmake 5184 1_1_0 EXIST::FUNCTION:
BIO_ADDRINFO_free 5185 1_1_0 EXIST::FUNCTION:
BIO_ADDRINFO_free 5185 1_1_0 EXIST::FUNCTION:
BIO_parse_hostserv 5186 1_1_0 EXIST::FUNCTION:
BIO_parse_hostserv 5186 1_1_0 EXIST::FUNCTION:
BIO_accept_ex 5187 1_1_0 EXIST::FUNCTION:
BIO_connect 5188 1_1_0 EXIST::FUNCTION:
BIO_closesocket 5189 1_1_0 EXIST::FUNCTION:
BIO_sock_info 5190 1_1_0 EXIST::FUNCTION:
BIO_socket 5191 1_1_0 EXIST::FUNCTION:
BIO_listen 5192 1_1_0 EXIST::FUNCTION:
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录